+ 构建信息 + |
+
+
+
+ |
+
+ 构建信息 + |
+
+
+
+ |
+
| 设备ID | +时间戳 | +采集量 | +标签 | +|||
|---|---|---|---|---|---|---|
| Device ID | +Time Stamp | +current | +voltage | +phase | +location | +groupId | +
| d1001 | +1538548685000 | +10.3 | +219 | +0.31 | +Beijing.Chaoyang | +2 | +
| d1002 | +1538548684000 | +10.2 | +220 | +0.23 | +Beijing.Chaoyang | +3 | +
| d1003 | +1538548686500 | +11.5 | +221 | +0.35 | +Beijing.Haidian | +3 | +
| d1004 | +1538548685500 | +13.4 | +223 | +0.29 | +Beijing.Haidian | +2 | +
| d1001 | +1538548695000 | +12.6 | +218 | +0.33 | +Beijing.Chaoyang | +2 | +
| d1004 | +1538548696600 | +11.8 | +221 | +0.28 | +Beijing.Haidian | +2 | +
| d1002 | +1538548696650 | +10.3 | +218 | +0.25 | +Beijing.Chaoyang | +3 | +
| d1001 | +1538548696800 | +12.3 | +221 | +0.31 | +Beijing.Chaoyang | +2 | +
true if this driver understands the given URL;
+ * false otherwise
+ * @throws SQLException if a database access error occurs or the url is {@code null}
*/
- protected static String[] parseHostPortPair(String hostPortPair) throws SQLException {
- String[] splitValues = new String[2];
-
- int portIndex = hostPortPair.indexOf(":");
-
- String hostname = null;
-
- if (portIndex != -1) {
- if ((portIndex + 1) < hostPortPair.length()) {
- String portAsString = hostPortPair.substring(portIndex + 1);
- hostname = hostPortPair.substring(0, portIndex);
-
- splitValues[HOST_NAME_INDEX] = hostname;
-
- splitValues[PORT_NUMBER_INDEX] = portAsString;
- } else {
- throw new SQLException(TSDBConstants.WrapErrMsg("port is not proper!"));
- }
- } else {
- splitValues[HOST_NAME_INDEX] = hostPortPair;
- splitValues[PORT_NUMBER_INDEX] = null;
- }
-
- return splitValues;
- }
-
public boolean acceptsURL(String url) throws SQLException {
- return (url != null && url.length() > 0 && url.trim().length() > 0) && url.startsWith(URL_PREFIX);
+ if (url == null)
+ throw new SQLException(TSDBConstants.WrapErrMsg("url is null"));
+ return (url != null && url.length() > 0 && url.trim().length() > 0) && (url.startsWith(URL_PREFIX) || url.startsWith(URL_PREFIX1));
}
public DriverPropertyInfo[] getPropertyInfo(String url, Properties info) throws SQLException {
@@ -252,15 +204,17 @@ public class TSDBDriver implements java.sql.Driver {
info = new Properties();
}
- if ((url != null) && (url.startsWith(URL_PREFIX) || url.startsWith(URL_PREFIX1))) {
+ if (acceptsURL(url)) {
info = parseURL(url, info);
}
DriverPropertyInfo hostProp = new DriverPropertyInfo(PROPERTY_KEY_HOST, info.getProperty(PROPERTY_KEY_HOST));
- hostProp.required = true;
+ hostProp.required = false;
+ hostProp.description = "Hostname";
DriverPropertyInfo portProp = new DriverPropertyInfo(PROPERTY_KEY_PORT, info.getProperty(PROPERTY_KEY_PORT, TSDBConstants.DEFAULT_PORT));
portProp.required = false;
+ portProp.description = "Port";
DriverPropertyInfo dbProp = new DriverPropertyInfo(PROPERTY_KEY_DBNAME, info.getProperty(PROPERTY_KEY_DBNAME));
dbProp.required = false;
@@ -268,9 +222,11 @@ public class TSDBDriver implements java.sql.Driver {
DriverPropertyInfo userProp = new DriverPropertyInfo(PROPERTY_KEY_USER, info.getProperty(PROPERTY_KEY_USER));
userProp.required = true;
+ userProp.description = "User";
DriverPropertyInfo passwordProp = new DriverPropertyInfo(PROPERTY_KEY_PASSWORD, info.getProperty(PROPERTY_KEY_PASSWORD));
passwordProp.required = true;
+ passwordProp.description = "Password";
DriverPropertyInfo[] propertyInfo = new DriverPropertyInfo[5];
propertyInfo[0] = hostProp;
@@ -283,20 +239,68 @@ public class TSDBDriver implements java.sql.Driver {
}
/**
- * example: jdbc:TSDB://127.0.0.1:0/db?user=root&password=your_password
+ * example: jdbc:TAOS://127.0.0.1:0/db?user=root&password=your_password
*/
- public Properties parseURL(String url, Properties defaults) throws java.sql.SQLException {
+ public Properties parseURL(String url, Properties defaults) {
Properties urlProps = (defaults != null) ? defaults : new Properties();
- if (url == null) {
+ if (url == null || url.length() <= 0 || url.trim().length() <= 0)
return null;
- }
-
- if (!url.startsWith(URL_PREFIX) && !url.startsWith(URL_PREFIX1)) {
+ if (!url.startsWith(URL_PREFIX) && !url.startsWith(URL_PREFIX1))
return null;
- }
+ // parse properties
String urlForMeta = url;
+ int beginningOfSlashes = url.indexOf("//");
+ int index = url.indexOf("?");
+ if (index != -1) {
+ String paramString = url.substring(index + 1, url.length());
+ url = url.substring(0, index);
+ StringTokenizer queryParams = new StringTokenizer(paramString, "&");
+ while (queryParams.hasMoreElements()) {
+ String parameterValuePair = queryParams.nextToken();
+ int indexOfEqual = parameterValuePair.indexOf("=");
+ String parameter = null;
+ String value = null;
+ if (indexOfEqual != -1) {
+ parameter = parameterValuePair.substring(0, indexOfEqual);
+ if (indexOfEqual + 1 < parameterValuePair.length()) {
+ value = parameterValuePair.substring(indexOfEqual + 1);
+ }
+ }
+ if ((value != null && value.length() > 0) && (parameter != null && parameter.length() > 0)) {
+ urlProps.setProperty(parameter, value);
+ }
+ }
+ }
+ // parse Product Name
+ String dbProductName = url.substring(0, beginningOfSlashes);
+ dbProductName = dbProductName.substring(dbProductName.indexOf(":") + 1);
+ dbProductName = dbProductName.substring(0, dbProductName.indexOf(":"));
+ // parse dbname
+ url = url.substring(beginningOfSlashes + 2);
+ int indexOfSlash = url.indexOf("/");
+ if (indexOfSlash != -1) {
+ if (indexOfSlash + 1 < url.length()) {
+ urlProps.setProperty(TSDBDriver.PROPERTY_KEY_DBNAME, url.substring(indexOfSlash + 1));
+ }
+ url = url.substring(0, indexOfSlash);
+ }
+ // parse port
+ int indexOfColon = url.indexOf(":");
+ if (indexOfColon != -1) {
+ if (indexOfColon + 1 < url.length()) {
+ urlProps.setProperty(TSDBDriver.PROPERTY_KEY_PORT, url.substring(indexOfColon + 1));
+ }
+ url = url.substring(0, indexOfColon);
+ }
+ if (url != null && url.length() > 0 && url.trim().length() > 0) {
+ urlProps.setProperty(TSDBDriver.PROPERTY_KEY_HOST, url);
+ }
+ this.dbMetaData = new TSDBDatabaseMetaData(dbProductName, urlForMeta, urlProps.getProperty(TSDBDriver.PROPERTY_KEY_USER));
+
+ /*
+ String urlForMeta = url;
String dbProductName = url.substring(url.indexOf(":") + 1);
dbProductName = dbProductName.substring(0, dbProductName.indexOf(":"));
int beginningOfSlashes = url.indexOf("//");
@@ -345,11 +349,11 @@ public class TSDBDriver implements java.sql.Driver {
user = urlProps.getProperty(PROPERTY_KEY_USER).toString();
this.dbMetaData = new TSDBDatabaseMetaData(dbProductName, urlForMeta, user);
-
+*/
return urlProps;
}
- public void setPropertyValue(Properties property, String[] keyValuePair) {
+ private void setPropertyValue(Properties property, String[] keyValuePair) {
switch (keyValuePair[0].toLowerCase()) {
case PROPERTY_KEY_USER:
property.setProperty(PROPERTY_KEY_USER, keyValuePair[1]);
@@ -372,13 +376,12 @@ public class TSDBDriver implements java.sql.Driver {
}
}
-
public int getMajorVersion() {
- return 1;
+ return 2;
}
public int getMinorVersion() {
- return 1;
+ return 0;
}
public boolean jdbcCompliant() {
@@ -389,33 +392,4 @@ public class TSDBDriver implements java.sql.Driver {
return null;
}
- /**
- * Returns the host property
- *
- * @param props the java.util.Properties instance to retrieve the hostname from.
- * @return the host
- */
- public String host(Properties props) {
- return props.getProperty(PROPERTY_KEY_HOST, "localhost");
- }
-
- /**
- * Returns the port number property
- *
- * @param props the properties to get the port number from
- * @return the port number
- */
- public int port(Properties props) {
- return Integer.parseInt(props.getProperty(PROPERTY_KEY_PORT, TSDBConstants.DEFAULT_PORT));
- }
-
- /**
- * Returns the database property from props
- *
- * @param props the Properties to look for the database property.
- * @return the database name.
- */
- public String database(Properties props) {
- return props.getProperty(PROPERTY_KEY_DBNAME);
- }
}
diff --git a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
index 0cd185de50d858aec78b60acc4055c1ae99a4cb5..edc160e323d2dc9c885b5404545a6d0689857a31 100755
--- a/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
+++ b/src/connector/jdbc/src/main/java/com/taosdata/jdbc/TSDBJNIConnector.java
@@ -111,8 +111,8 @@ public class TSDBJNIConnector {
* @throws SQLException
*/
public long executeQuery(String sql) throws SQLException {
- // close previous result set if the user forgets to invoke the
- // free method to close previous result set.
+ // close previous result set if the user forgets to invoke the
+ // free method to close previous result set.
if (!this.isResultsetClosed) {
freeResultSet(taosResultSetPointer);
}
@@ -122,23 +122,23 @@ public class TSDBJNIConnector {
pSql = this.executeQueryImp(sql.getBytes(TaosGlobalConfig.getCharset()), this.taos);
} catch (Exception e) {
e.printStackTrace();
- this.freeResultSet(pSql);
+ this.freeResultSetImp(this.taos, pSql);
throw new SQLException(TSDBConstants.WrapErrMsg("Unsupported encoding"));
}
-
+
int code = this.getErrCode(pSql);
if (code != 0) {
affectedRows = -1;
String msg = this.getErrMsg(pSql);
-
- this.freeResultSet(pSql);
+
+ this.freeResultSetImp(this.taos, pSql);
throw new SQLException(TSDBConstants.WrapErrMsg(msg), "", code);
}
// Try retrieving result set for the executed SQL using the current connection pointer.
taosResultSetPointer = this.getResultSetImp(this.taos, pSql);
isResultsetClosed = (taosResultSetPointer == TSDBConstants.JNI_NULL_POINTER);
-
+
return pSql;
}
@@ -171,11 +171,11 @@ public class TSDBJNIConnector {
}
private native long getResultSetImp(long connection, long pSql);
-
+
public boolean isUpdateQuery(long pSql) {
- return isUpdateQueryImp(this.taos, pSql) == 1? true:false;
+ return isUpdateQueryImp(this.taos, pSql) == 1 ? true : false;
}
-
+
private native long isUpdateQueryImp(long connection, long pSql);
/**
@@ -191,7 +191,7 @@ public class TSDBJNIConnector {
res = this.freeResultSetImp(this.taos, result);
taosResultSetPointer = TSDBConstants.JNI_NULL_POINTER;
}
-
+
isResultsetClosed = true;
return res;
}
@@ -274,7 +274,7 @@ public class TSDBJNIConnector {
* Consume a subscription
*/
long consume(long subscription) {
- return this.consumeImp(subscription);
+ return this.consumeImp(subscription);
}
private native long consumeImp(long subscription);
diff --git a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBDriverTest.java b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBDriverTest.java
index a0981063a5052f04b849b2187a78352a2c2560be..8adcdefb2974d5817793297091eee1c2f40a52b9 100644
--- a/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBDriverTest.java
+++ b/src/connector/jdbc/src/test/java/com/taosdata/jdbc/TSDBDriverTest.java
@@ -1,47 +1,210 @@
package com.taosdata.jdbc;
+import org.junit.BeforeClass;
import org.junit.Test;
-import java.sql.SQLException;
+import java.io.BufferedReader;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.sql.*;
import java.util.Properties;
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
public class TSDBDriverTest {
+ private static final String[] validURLs = {
+ "jdbc:TAOS://localhost:0",
+ "jdbc:TAOS://localhost",
+ "jdbc:TAOS://localhost:6030/test",
+ "jdbc:TAOS://localhost:6030",
+ "jdbc:TAOS://localhost:6030/",
+ "jdbc:TSDB://localhost:6030",
+ "jdbc:TSDB://localhost:6030/",
+ "jdbc:TAOS://127.0.0.1:0/db?user=root&password=taosdata",
+ "jdbc:TAOS://:",
+ "jdbc:TAOS://:/",
+ "jdbc:TAOS://:/test",
+ "jdbc:TAOS://localhost:0/?user=root&password=taosdata"
+ };
+ private static boolean islibLoaded = false;
+ private static boolean isTaosdActived;
+
+ private Connection conn;
+
+ @BeforeClass
+ public static void before() {
+ String osName = System.getProperty("os.name").toLowerCase();
+ if (!osName.equals("linux"))
+ return;
+ // try to load taos lib
+ try {
+ System.loadLibrary("taos");
+ islibLoaded = true;
+ } catch (UnsatisfiedLinkError error) {
+ System.out.println("load tdengine lib failed.");
+ error.printStackTrace();
+ }
+ // check taosd is activated
+ try {
+ String[] cmd = {"/bin/bash", "-c", "ps -ef | grep taosd | grep -v \"grep\""};
+ Process exec = Runtime.getRuntime().exec(cmd);
+ BufferedReader reader = new BufferedReader(new InputStreamReader(exec.getInputStream()));
+ int lineCnt = 0;
+ while (reader.readLine() != null) {
+ lineCnt++;
+ }
+ if (lineCnt > 0)
+ isTaosdActived = true;
+ } catch (IOException e) {
+ e.printStackTrace();
+ }
+
+ try {
+ Class.forName("com.taosdata.jdbc.TSDBDriver");
+ } catch (ClassNotFoundException e) {
+ e.printStackTrace();
+ }
+ }
+
+ @Test
+ public void testConnectWithJdbcURL() {
+ final String url = "jdbc:TAOS://localhost:6030/log?user=root&password=taosdata";
+ try {
+ if (islibLoaded && isTaosdActived) {
+ conn = DriverManager.getConnection(url);
+ assertNotNull("failure - connection should not be null", conn);
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ fail("failure - should not throw Exception");
+ }
+ }
+
+ @Test
+ public void testConnectWithProperties() {
+ final String jdbcUrl = "jdbc:TAOS://localhost:6030/log?user=root&password=taosdata";
+ Properties connProps = new Properties();
+ connProps.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+ connProps.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
+ connProps.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+ try {
+ if (islibLoaded && isTaosdActived) {
+ conn = DriverManager.getConnection(jdbcUrl, connProps);
+ assertNotNull("failure - connection should not be null", conn);
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ fail("failure - should not throw Exception");
+ }
+ }
+
@Test
- public void urlParserTest() throws SQLException {
+ public void testConnectWithConfigFile() {
+ String jdbcUrl = "jdbc:TAOS://:/log?user=root&password=taosdata";
+ Properties connProps = new Properties();
+ connProps.setProperty(TSDBDriver.PROPERTY_KEY_CHARSET, "UTF-8");
+ connProps.setProperty(TSDBDriver.PROPERTY_KEY_LOCALE, "en_US.UTF-8");
+ connProps.setProperty(TSDBDriver.PROPERTY_KEY_TIME_ZONE, "UTC-8");
+ try {
+ if (islibLoaded && isTaosdActived) {
+ conn = DriverManager.getConnection(jdbcUrl, connProps);
+ assertNotNull("failure - connection should not be null", conn);
+ }
+ } catch (SQLException e) {
+ e.printStackTrace();
+ fail("failure - should not throw Exception");
+ }
+ }
+
+ @Test(expected = SQLException.class)
+ public void testAcceptsURL() throws SQLException {
+ Driver driver = new TSDBDriver();
+ for (String url : validURLs) {
+ assertTrue("failure - acceptsURL(\" " + url + " \") should be true", driver.acceptsURL(url));
+ }
+ driver.acceptsURL(null);
+ fail("acceptsURL throws exception when parameter is null");
+ }
+
+ @Test
+ public void testParseURL() {
TSDBDriver driver = new TSDBDriver();
- String url = "jdbc:TSDB://127.0.0.1:0/db";
-
- Properties properties = new Properties();
- driver.parseURL(url, properties);
- assertEquals(properties.get("host"), "127.0.0.1");
- assertEquals(properties.get("port"), "0");
- assertEquals(properties.get("dbname"), "db");
- assertEquals(properties.get("user"), "root");
- assertEquals(properties.get("password"), "your_password");
-
- url = "jdbc:TSDB://127.0.0.1:0/log?charset=UTF-8";
- properties = new Properties();
- driver.parseURL(url, properties);
- assertEquals(properties.get("host"), "127.0.0.1");
- assertEquals(properties.get("port"), "0");
- assertEquals(properties.get("dbname"), "log");
- assertEquals(properties.get("charset"), "UTF-8");
-
- url = "jdbc:TSDB://127.0.0.1:0/";
- properties = new Properties();
- driver.parseURL(url, properties);
- assertEquals(properties.get("host"), "127.0.0.1");
- assertEquals(properties.get("port"), "0");
- assertEquals(properties.get("dbname"), null);
-
- url = "jdbc:TSDB://127.0.0.1:0/db";
- properties = new Properties();
- driver.parseURL(url, properties);
- assertEquals(properties.get("host"), "127.0.0.1");
- assertEquals(properties.get("port"), "0");
- assertEquals(properties.get("dbname"), "db");
+
+ String url = "jdbc:TAOS://127.0.0.1:0/db?user=root&password=taosdata&charset=UTF-8";
+ Properties config = new Properties();
+ Properties actual = driver.parseURL(url, config);
+ assertEquals("failure - host should be 127.0.0.1", "127.0.0.1", actual.get("host"));
+ assertEquals("failure - port should be 0", "0", actual.get("port"));
+ assertEquals("failure - dbname should be db", "db", actual.get("dbname"));
+ assertEquals("failure - user should be root", "root", actual.get("user"));
+ assertEquals("failure - password should be taosdata", "taosdata", actual.get("password"));
+ assertEquals("failure - charset should be UTF-8", "UTF-8", actual.get("charset"));
+
+ url = "jdbc:TAOS://127.0.0.1:0";
+ config = new Properties();
+ actual = driver.parseURL(url, config);
+ assertEquals("failure - host should be 127.0.0.1", "127.0.0.1", actual.getProperty("host"));
+ assertEquals("failure - port should be 0", "0", actual.get("port"));
+ assertNull("failure - dbname should be null", actual.get("dbname"));
+
+ url = "jdbc:TAOS://127.0.0.1:0/db";
+ config = new Properties();
+ actual = driver.parseURL(url, config);
+ assertEquals("failure - host should be 127.0.0.1", "127.0.0.1", actual.getProperty("host"));
+ assertEquals("failure - port should be 0", "0", actual.get("port"));
+ assertEquals("failure - dbname should be db", "db", actual.get("dbname"));
+
+ url = "jdbc:TAOS://:/?";
+ config = new Properties();
+ config.setProperty(TSDBDriver.PROPERTY_KEY_USER, "root");
+ config.setProperty(TSDBDriver.PROPERTY_KEY_PASSWORD, "taosdata");
+ actual = driver.parseURL(url, config);
+ assertEquals("failure - user should be root", "root", actual.getProperty("user"));
+ assertEquals("failure - password should be taosdata", "taosdata", actual.getProperty("password"));
+ assertNull("failure - host should be null", actual.getProperty("host"));
+ assertNull("failure - port should be null", actual.getProperty("port"));
+ assertNull("failure - dbname should be null", actual.getProperty("dbname"));
+ }
+
+ @Test
+ public void testGetPropertyInfo() throws SQLException {
+ Driver driver = new TSDBDriver();
+ final String url = "jdbc:TAOS://localhost:6030/log?user=root&password=taosdata";
+ Properties connProps = new Properties();
+ DriverPropertyInfo[] propertyInfo = driver.getPropertyInfo(url, connProps);
+ for (DriverPropertyInfo info : propertyInfo) {
+ if (info.name.equals(TSDBDriver.PROPERTY_KEY_HOST))
+ assertEquals("failure - host should be localhost", "localhost", info.value);
+ if (info.name.equals(TSDBDriver.PROPERTY_KEY_PORT))
+ assertEquals("failure - port should be 6030", "6030", info.value);
+ if (info.name.equals(TSDBDriver.PROPERTY_KEY_DBNAME))
+ assertEquals("failure - dbname should be test", "log", info.value);
+ if (info.name.equals(TSDBDriver.PROPERTY_KEY_USER))
+ assertEquals("failure - user should be root", "root", info.value);
+ if (info.name.equals(TSDBDriver.PROPERTY_KEY_PASSWORD))
+ assertEquals("failure - password should be root", "taosdata", info.value);
+ }
+ }
+
+ @Test
+ public void testGetMajorVersion() {
+ assertEquals("failure - getMajorVersion should be 2", 2, new TSDBDriver().getMajorVersion());
+ }
+
+ @Test
+ public void testGetMinorVersion() {
+ assertEquals("failure - getMinorVersion should be 0", 0, new TSDBDriver().getMinorVersion());
+ }
+
+ @Test
+ public void testJdbcCompliant() {
+ assertFalse("failure - jdbcCompliant should be false", new TSDBDriver().jdbcCompliant());
}
+
+ @Test
+ public void testGetParentLogger() throws SQLFeatureNotSupportedException {
+ assertNull("failure - getParentLogger should be be null", new TSDBDriver().getParentLogger());
+ }
+
}
\ No newline at end of file
diff --git a/src/cq/src/cqMain.c b/src/cq/src/cqMain.c
index 1a99a84b8ebfe8ed503213299646da39b5b1d27a..1be7552a892e25cf44317a99fe52ff57689ad338 100644
--- a/src/cq/src/cqMain.c
+++ b/src/cq/src/cqMain.c
@@ -39,16 +39,16 @@
#define cTrace(...) { if (cqDebugFlag & DEBUG_TRACE) { taosPrintLog("CQ ", cqDebugFlag, __VA_ARGS__); }}
typedef struct {
- int vgId;
+ int32_t vgId;
char user[TSDB_USER_LEN];
char pass[TSDB_PASSWORD_LEN];
char db[TSDB_DB_NAME_LEN];
FCqWrite cqWrite;
void *ahandle;
- int num; // number of continuous streams
+ int32_t num; // number of continuous streams
struct SCqObj *pHead;
void *dbConn;
- int master;
+ int32_t master;
void *tmrCtrl;
pthread_mutex_t mutex;
} SCqContext;
@@ -57,7 +57,7 @@ typedef struct SCqObj {
tmr_h tmrId;
uint64_t uid;
int32_t tid; // table ID
- int rowSize; // bytes of a row
+ int32_t rowSize; // bytes of a row
char * sqlStr; // SQL string
STSchema * pSchema; // pointer to schema array
void * pStream;
@@ -115,7 +115,7 @@ void cqClose(void *handle) {
SCqObj *pTemp = pObj;
pObj = pObj->next;
tdFreeSchema(pTemp->pSchema);
- taosTFree(pTemp->sqlStr);
+ tfree(pTemp->sqlStr);
free(pTemp);
}
@@ -175,7 +175,7 @@ void cqStop(void *handle) {
pthread_mutex_unlock(&pContext->mutex);
}
-void *cqCreate(void *handle, uint64_t uid, int tid, char *sqlStr, STSchema *pSchema) {
+void *cqCreate(void *handle, uint64_t uid, int32_t tid, char *sqlStr, STSchema *pSchema) {
SCqContext *pContext = handle;
SCqObj *pObj = calloc(sizeof(SCqObj), 1);
@@ -237,7 +237,7 @@ void cqDrop(void *handle) {
pthread_mutex_unlock(&pContext->mutex);
}
-static void doCreateStream(void *param, TAOS_RES *result, int code) {
+static void doCreateStream(void *param, TAOS_RES *result, int32_t code) {
SCqObj* pObj = (SCqObj*)param;
SCqContext* pContext = pObj->pContext;
SSqlObj* pSql = (SSqlObj*)result;
@@ -288,7 +288,7 @@ static void cqProcessStreamRes(void *param, TAOS_RES *tres, TAOS_ROW row) {
cDebug("vgId:%d, id:%d CQ:%s stream result is ready", pContext->vgId, pObj->tid, pObj->sqlStr);
- int size = sizeof(SWalHead) + sizeof(SSubmitMsg) + sizeof(SSubmitBlk) + TD_DATA_ROW_HEAD_SIZE + pObj->rowSize;
+ int32_t size = sizeof(SWalHead) + sizeof(SSubmitMsg) + sizeof(SSubmitBlk) + TD_DATA_ROW_HEAD_SIZE + pObj->rowSize;
char *buffer = calloc(size, 1);
SWalHead *pHead = (SWalHead *)buffer;
@@ -334,7 +334,7 @@ static void cqProcessStreamRes(void *param, TAOS_RES *tres, TAOS_ROW row) {
pHead->version = 0;
// write into vnode write queue
- pContext->cqWrite(pContext->ahandle, pHead, TAOS_QTYPE_CQ);
+ pContext->cqWrite(pContext->ahandle, pHead, TAOS_QTYPE_CQ, NULL);
free(buffer);
}
diff --git a/src/cq/test/cqtest.c b/src/cq/test/cqtest.c
index 1daee644a7effc5fa50fbc340ad7df8e2b5d70b0..e1114fc024054f7a4af32ca1497a63f7da942147 100644
--- a/src/cq/test/cqtest.c
+++ b/src/cq/test/cqtest.c
@@ -24,7 +24,7 @@
int64_t ver = 0;
void *pCq = NULL;
-int writeToQueue(void *pVnode, void *data, int type) {
+int writeToQueue(void *pVnode, void *data, int type, void *pMsg) {
return 0;
}
diff --git a/src/dnode/inc/dnodeCfg.h b/src/dnode/inc/dnodeCfg.h
new file mode 100644
index 0000000000000000000000000000000000000000..35d889646021a079abe18c01a26fa5891718aaa0
--- /dev/null
+++ b/src/dnode/inc/dnodeCfg.h
@@ -0,0 +1,33 @@
+/*
+ * Copyright (c) 2019 TAOS Data, Inc.