Skip to content

TDengine
TDengine

taosdata / TDengine
大约 2 年 前同步成功

通知 1192
Star 22018
Fork 4786
TDengine
TDengine
提交 c0b41ea0 编写于 作者: wmmhello's avatar wmmhello
浏览文件
操作

fix:error in TD-23218 & remove useless logic

上级 a5144f0b
隐藏空白更改
内联 并排
Showing with 287 addition and 285 deletion
source/dnode/vnode/inc/vnode.h
浏览文件 @ c0b41ea0
...@@ -227,7 +227,7 @@ typedef struct SSnapContext { ...@@ -227,7 +227,7 @@ typedef struct SSnapContext {
SArray *idList; SArray *idList;
int32_t index; int32_t index;
bool withMeta; bool withMeta;
bool queryMetaOrData; // true-get meta, false-get data bool queryMeta; // true-get meta, false-get data
} SSnapContext; } SSnapContext;
typedef struct STqReader { typedef struct STqReader {
......
source/dnode/vnode/src/meta/metaSnapshot.c
浏览文件 @ c0b41ea0
...@@ -268,7 +268,7 @@ int32_t buildSnapContext(SMeta* pMeta, int64_t snapVersion, int64_t suid, int8_t ...@@ -268,7 +268,7 @@ int32_t buildSnapContext(SMeta* pMeta, int64_t snapVersion, int64_t suid, int8_t
ctx->snapVersion = snapVersion; ctx->snapVersion = snapVersion;
ctx->suid = suid; ctx->suid = suid;
ctx->subType = subType; ctx->subType = subType;
ctx->queryMetaOrData = withMeta; ctx->queryMeta = withMeta;
ctx->withMeta = withMeta; ctx->withMeta = withMeta;
ctx->idVersion = taosHashInit(100, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, HASH_NO_LOCK); ctx->idVersion = taosHashInit(100, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), true, HASH_NO_LOCK);
if (ctx->idVersion == NULL) { if (ctx->idVersion == NULL) {
...@@ -475,7 +475,7 @@ int32_t getMetafromSnapShot(SSnapContext* ctx, void** pBuf, int32_t* contLen, in ...@@ -475,7 +475,7 @@ int32_t getMetafromSnapShot(SSnapContext* ctx, void** pBuf, int32_t* contLen, in
if (ctx->index >= taosArrayGetSize(ctx->idList)) { if (ctx->index >= taosArrayGetSize(ctx->idList)) {
metaDebug("tmqsnap get meta end"); metaDebug("tmqsnap get meta end");
ctx->index = 0; ctx->index = 0;
ctx->queryMetaOrData = false; // change to get data ctx->queryMeta = false; // change to get data
return 0; return 0;
} }
......
source/dnode/vnode/src/tq/tqExec.c
浏览文件 @ c0b41ea0
...@@ -169,6 +169,9 @@ int32_t tqScanTaosx(STQ* pTq, const STqHandle* pHandle, STaosxRsp* pRsp, SMqMeta ...@@ -169,6 +169,9 @@ int32_t tqScanTaosx(STQ* pTq, const STqHandle* pHandle, STaosxRsp* pRsp, SMqMeta
SMqMetaRsp* tmp = qStreamExtractMetaMsg(task); SMqMetaRsp* tmp = qStreamExtractMetaMsg(task);
if (tmp->rspOffset.type == TMQ_OFFSET__SNAPSHOT_DATA) { if (tmp->rspOffset.type == TMQ_OFFSET__SNAPSHOT_DATA) {
*pOffset = tmp->rspOffset;
qStreamPrepareScan(task, pOffset, pHandle->execHandle.subType);
tmp->rspOffset.type = TMQ_OFFSET__SNAPSHOT_META;
tqDebug("tmqsnap task exec change to get data"); tqDebug("tmqsnap task exec change to get data");
continue; continue;
} }
......
source/libs/executor/src/scanoperator.c
浏览文件 @ c0b41ea0
...@@ -2109,9 +2109,8 @@ static SSDataBlock* doRawScan(SOperatorInfo* pOperator) { ...@@ -2109,9 +2109,8 @@ static SSDataBlock* doRawScan(SOperatorInfo* pOperator) {
return NULL; return NULL;
} }
if (!sContext->queryMetaOrData) { // change to get data next poll request if (!sContext->queryMeta) { // change to get data next poll request
tqOffsetResetToData(&pTaskInfo->streamInfo.currentOffset, 0, INT64_MIN); tqOffsetResetToData(&pTaskInfo->streamInfo.metaRsp.rspOffset, 0, INT64_MIN);
pTaskInfo->streamInfo.metaRsp.rspOffset = pTaskInfo->streamInfo.currentOffset;
} else { } else {
tqOffsetResetToMeta(&pTaskInfo->streamInfo.currentOffset, uid); tqOffsetResetToMeta(&pTaskInfo->streamInfo.currentOffset, uid);
pTaskInfo->streamInfo.metaRsp.rspOffset = pTaskInfo->streamInfo.currentOffset; pTaskInfo->streamInfo.metaRsp.rspOffset = pTaskInfo->streamInfo.currentOffset;
......
utils/test/c/tmq_taosx_ci.c
浏览文件 @ c0b41ea0
...@@ -101,285 +101,285 @@ int buildDatabase(TAOS* pConn, TAOS_RES* pRes) { ...@@ -101,285 +101,285 @@ int buildDatabase(TAOS* pConn, TAOS_RES* pRes) {
taos_free_result(pRes); taos_free_result(pRes);
/* test for TD-20612 end*/ /* test for TD-20612 end*/
//
pRes = taos_query(pConn, // pRes = taos_query(pConn,
"create stable if not exists st1 (ts timestamp, c1 int, c2 float, c3 binary(16)) tags(t1 int, t3 " // "create stable if not exists st1 (ts timestamp, c1 int, c2 float, c3 binary(16)) tags(t1 int, t3 "
"nchar(8), t4 bool)"); // "nchar(8), t4 bool)");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to create super table st1, reason:%s\n", taos_errstr(pRes)); // printf("failed to create super table st1, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query(pConn, "create table if not exists ct0 using st1 tags(1000, \"ttt\", true)"); // pRes = taos_query(pConn, "create table if not exists ct0 using st1 tags(1000, \"ttt\", true)");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to create child table tu1, reason:%s\n", taos_errstr(pRes)); // printf("failed to create child table tu1, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query(pConn, "insert into ct0 values(1626006833400, 1, 2, 'a')"); // pRes = taos_query(pConn, "insert into ct0 values(1626006833400, 1, 2, 'a')");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to insert into ct0, reason:%s\n", taos_errstr(pRes)); // printf("failed to insert into ct0, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query(pConn, "create table if not exists ct1 using st1(t1) tags(2000)"); // pRes = taos_query(pConn, "create table if not exists ct1 using st1(t1) tags(2000)");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to create child table ct1, reason:%s\n", taos_errstr(pRes)); // printf("failed to create child table ct1, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query(pConn, "create table if not exists ct2 using st1(t1) tags(NULL)"); // pRes = taos_query(pConn, "create table if not exists ct2 using st1(t1) tags(NULL)");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to create child table ct2, reason:%s\n", taos_errstr(pRes)); // printf("failed to create child table ct2, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query(pConn, "insert into ct1 values(1626006833600, 3, 4, 'b')"); // pRes = taos_query(pConn, "insert into ct1 values(1626006833600, 3, 4, 'b')");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to insert into ct1, reason:%s\n", taos_errstr(pRes)); // printf("failed to insert into ct1, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query(pConn, "create table if not exists ct3 using st1(t1) tags(3000)"); // pRes = taos_query(pConn, "create table if not exists ct3 using st1(t1) tags(3000)");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to create child table ct3, reason:%s\n", taos_errstr(pRes)); // printf("failed to create child table ct3, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query( // pRes = taos_query(
pConn, // pConn,
"insert into ct3 values(1626006833600, 5, 6, 'c') ct1 values(1626006833601, 2, 3, 'sds') (1626006833602, 4, 5, " // "insert into ct3 values(1626006833600, 5, 6, 'c') ct1 values(1626006833601, 2, 3, 'sds') (1626006833602, 4, 5, "
"'ddd') ct0 values(1626006833603, 4, 3, 'hwj') ct1 values(now+5s, 23, 32, 's21ds')"); // "'ddd') ct0 values(1626006833603, 4, 3, 'hwj') ct1 values(now+5s, 23, 32, 's21ds')");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to insert into ct3, reason:%s\n", taos_errstr(pRes)); // printf("failed to insert into ct3, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query(pConn, "alter table st1 add column c4 bigint"); // pRes = taos_query(pConn, "alter table st1 add column c4 bigint");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to alter super table st1, reason:%s\n", taos_errstr(pRes)); // printf("failed to alter super table st1, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query(pConn, "alter table st1 modify column c3 binary(64)"); // pRes = taos_query(pConn, "alter table st1 modify column c3 binary(64)");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to alter super table st1, reason:%s\n", taos_errstr(pRes)); // printf("failed to alter super table st1, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query(pConn, // pRes = taos_query(pConn,
"insert into ct3 values(1626006833605, 53, 63, 'cffffffffffffffffffffffffffff', 8989898899999) " // "insert into ct3 values(1626006833605, 53, 63, 'cffffffffffffffffffffffffffff', 8989898899999) "
"(1626006833609, 51, 62, 'c333', 940)"); // "(1626006833609, 51, 62, 'c333', 940)");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to insert into ct3, reason:%s\n", taos_errstr(pRes)); // printf("failed to insert into ct3, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query(pConn, "insert into ct3 select * from ct1"); // pRes = taos_query(pConn, "insert into ct3 select * from ct1");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to insert into ct3, reason:%s\n", taos_errstr(pRes)); // printf("failed to insert into ct3, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query(pConn, "alter table st1 add tag t2 binary(64)"); // pRes = taos_query(pConn, "alter table st1 add tag t2 binary(64)");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to alter super table st1, reason:%s\n", taos_errstr(pRes)); // printf("failed to alter super table st1, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query(pConn, "alter table ct3 set tag t1=5000"); // pRes = taos_query(pConn, "alter table ct3 set tag t1=5000");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to slter child table ct3, reason:%s\n", taos_errstr(pRes)); // printf("failed to slter child table ct3, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query(pConn, "delete from abc1 .ct3 where ts < 1626006833606"); // pRes = taos_query(pConn, "delete from abc1 .ct3 where ts < 1626006833606");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to insert into ct3, reason:%s\n", taos_errstr(pRes)); // printf("failed to insert into ct3, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
if (g_conf.dropTable) { // if (g_conf.dropTable) {
pRes = taos_query(pConn, "drop table ct3, ct1"); // pRes = taos_query(pConn, "drop table ct3, ct1");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to drop child table ct3, reason:%s\n", taos_errstr(pRes)); // printf("failed to drop child table ct3, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query(pConn, "drop table st1"); // pRes = taos_query(pConn, "drop table st1");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to drop super table st1, reason:%s\n", taos_errstr(pRes)); // printf("failed to drop super table st1, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
} // }
//
pRes = taos_query(pConn, "create table if not exists n1(ts timestamp, c1 int, c2 nchar(4))"); // pRes = taos_query(pConn, "create table if not exists n1(ts timestamp, c1 int, c2 nchar(4))");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to create normal table n1, reason:%s\n", taos_errstr(pRes)); // printf("failed to create normal table n1, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query(pConn, "alter table n1 add column c3 bigint"); // pRes = taos_query(pConn, "alter table n1 add column c3 bigint");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to alter normal table n1, reason:%s\n", taos_errstr(pRes)); // printf("failed to alter normal table n1, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query(pConn, "alter table n1 modify column c2 nchar(8)"); // pRes = taos_query(pConn, "alter table n1 modify column c2 nchar(8)");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to alter normal table n1, reason:%s\n", taos_errstr(pRes)); // printf("failed to alter normal table n1, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query(pConn, "alter table n1 rename column c3 cc3"); // pRes = taos_query(pConn, "alter table n1 rename column c3 cc3");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to alter normal table n1, reason:%s\n", taos_errstr(pRes)); // printf("failed to alter normal table n1, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query(pConn, "alter table n1 comment 'hello'"); // pRes = taos_query(pConn, "alter table n1 comment 'hello'");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to alter normal table n1, reason:%s\n", taos_errstr(pRes)); // printf("failed to alter normal table n1, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query(pConn, "alter table n1 drop column c1"); // pRes = taos_query(pConn, "alter table n1 drop column c1");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to alter normal table n1, reason:%s\n", taos_errstr(pRes)); // printf("failed to alter normal table n1, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query(pConn, "insert into n1 values(now, 'eeee', 8989898899999) (now+9s, 'c333', 940)"); // pRes = taos_query(pConn, "insert into n1 values(now, 'eeee', 8989898899999) (now+9s, 'c333', 940)");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to insert into n1, reason:%s\n", taos_errstr(pRes)); // printf("failed to insert into n1, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
if (g_conf.dropTable) { // if (g_conf.dropTable) {
pRes = taos_query(pConn, "drop table n1"); // pRes = taos_query(pConn, "drop table n1");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to drop normal table n1, reason:%s\n", taos_errstr(pRes)); // printf("failed to drop normal table n1, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
} // }
//
pRes = taos_query(pConn, "create table jt(ts timestamp, i int) tags(t json)"); // pRes = taos_query(pConn, "create table jt(ts timestamp, i int) tags(t json)");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to create super table jt, reason:%s\n", taos_errstr(pRes)); // printf("failed to create super table jt, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query(pConn, "create table jt1 using jt tags('{\"k1\":1, \"k2\":\"hello\"}')"); // pRes = taos_query(pConn, "create table jt1 using jt tags('{\"k1\":1, \"k2\":\"hello\"}')");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to create super table jt, reason:%s\n", taos_errstr(pRes)); // printf("failed to create super table jt, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query(pConn, "create table jt2 using jt tags('')"); // pRes = taos_query(pConn, "create table jt2 using jt tags('')");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to create super table jt2, reason:%s\n", taos_errstr(pRes)); // printf("failed to create super table jt2, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query(pConn, "insert into jt1 values(now, 1)"); // pRes = taos_query(pConn, "insert into jt1 values(now, 1)");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to create super table jt1, reason:%s\n", taos_errstr(pRes)); // printf("failed to create super table jt1, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query(pConn, "insert into jt2 values(now, 11)"); // pRes = taos_query(pConn, "insert into jt2 values(now, 11)");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to create super table jt2, reason:%s\n", taos_errstr(pRes)); // printf("failed to create super table jt2, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
if (g_conf.dropTable) { // if (g_conf.dropTable) {
pRes = taos_query(pConn, // pRes = taos_query(pConn,
"create stable if not exists st1 (ts timestamp, c1 int, c2 float, c3 binary(16)) tags(t1 int, t3 " // "create stable if not exists st1 (ts timestamp, c1 int, c2 float, c3 binary(16)) tags(t1 int, t3 "
"nchar(8), t4 bool)"); // "nchar(8), t4 bool)");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to create super table st1, reason:%s\n", taos_errstr(pRes)); // printf("failed to create super table st1, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query(pConn, "drop table st1"); // pRes = taos_query(pConn, "drop table st1");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to drop super table st1, reason:%s\n", taos_errstr(pRes)); // printf("failed to drop super table st1, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
} // }
//
pRes = taos_query(pConn, // pRes = taos_query(pConn,
"create stable if not exists stt (ts timestamp, c1 int, c2 float, c3 binary(16)) tags(t1 int, t3 " // "create stable if not exists stt (ts timestamp, c1 int, c2 float, c3 binary(16)) tags(t1 int, t3 "
"nchar(8), t4 bool)"); // "nchar(8), t4 bool)");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to create super table stt, reason:%s\n", taos_errstr(pRes)); // printf("failed to create super table stt, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query(pConn, // pRes = taos_query(pConn,
"create stable if not exists sttb (ts timestamp, c1 int, c2 float, c3 binary(16)) tags(t1 int, t3 " // "create stable if not exists sttb (ts timestamp, c1 int, c2 float, c3 binary(16)) tags(t1 int, t3 "
"nchar(8), t4 bool)"); // "nchar(8), t4 bool)");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to create super table sttb, reason:%s\n", taos_errstr(pRes)); // printf("failed to create super table sttb, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = taos_query( // pRes = taos_query(
pConn, // pConn,
"create table if not exists stt1 using stt tags(2, \"stt1\", true) sttb1 using sttb tags(4, \"sttb1\", true) " // "create table if not exists stt1 using stt tags(2, \"stt1\", true) sttb1 using sttb tags(4, \"sttb1\", true) "
"stt2 using stt tags(43, \"stt2\", false) sttb2 using sttb tags(54, \"sttb2\", true)"); // "stt2 using stt tags(43, \"stt2\", false) sttb2 using sttb tags(54, \"sttb2\", true)");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to create child table stt1, reason:%s\n", taos_errstr(pRes)); // printf("failed to create child table stt1, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
//
pRes = // pRes =
taos_query(pConn, // taos_query(pConn,
"insert into stt1 values(now + 2s, 3, 2, 'stt1') stt3 using stt tags(23, \"stt3\", true) values(now + " // "insert into stt1 values(now + 2s, 3, 2, 'stt1') stt3 using stt tags(23, \"stt3\", true) values(now + "
"1s, 1, 2, 'stt3') sttb3 using sttb tags(4, \"sttb3\", true) values(now + 2s, 13, 22, 'sttb3') " // "1s, 1, 2, 'stt3') sttb3 using sttb tags(4, \"sttb3\", true) values(now + 2s, 13, 22, 'sttb3') "
"stt4 using stt tags(433, \"stt4\", false) values(now + 3s, 21, 21, 'stt4') sttb4 using sttb " // "stt4 using stt tags(433, \"stt4\", false) values(now + 3s, 21, 21, 'stt4') sttb4 using sttb "
"tags(543, \"sttb4\", true) values(now + 4s, 16, 25, 'sttb4')"); // "tags(543, \"sttb4\", true) values(now + 4s, 16, 25, 'sttb4')");
if (taos_errno(pRes) != 0) { // if (taos_errno(pRes) != 0) {
printf("failed to create child table stt1, reason:%s\n", taos_errstr(pRes)); // printf("failed to create child table stt1, reason:%s\n", taos_errstr(pRes));
return -1; // return -1;
} // }
taos_free_result(pRes); // taos_free_result(pRes);
return 0; return 0;
} }
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或