Skip to content

T
TDengine

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

通知 1192
Star 22018
Fork 4786
T
TDengine
提交 a9bd009b 编写于 作者: L Liu Jicong
浏览文件
操作

fix tq

上级 f3aa8139
隐藏空白更改
内联 并排
Showing with 481 addition and 468 deletion
source/client/test/clientTests.cpp
浏览文件 @ a9bd009b
...@@ -61,472 +61,472 @@ TEST(testCase, connect_Test) { ...@@ -61,472 +61,472 @@ TEST(testCase, connect_Test) {
taos_close(pConn); taos_close(pConn);
} }
TEST(testCase, create_user_Test) { //TEST(testCase, create_user_Test) {
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0); //TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
assert(pConn != NULL); //assert(pConn != NULL);
TAOS_RES* pRes = taos_query(pConn, "create user abc pass 'abc'");
if (taos_errno(pRes) != TSDB_CODE_SUCCESS) {
printf("failed to create user, reason:%s\n", taos_errstr(pRes));
}
taos_free_result(pRes);
taos_close(pConn);
}
TEST(testCase, create_account_Test) {
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
assert(pConn != NULL);
TAOS_RES* pRes = taos_query(pConn, "create account aabc pass 'abc'"); //TAOS_RES* pRes = taos_query(pConn, "create user abc pass 'abc'");
if (taos_errno(pRes) != TSDB_CODE_SUCCESS) { //if (taos_errno(pRes) != TSDB_CODE_SUCCESS) {
printf("failed to create user, reason:%s\n", taos_errstr(pRes)); //printf("failed to create user, reason:%s\n", taos_errstr(pRes));
} //}
taos_free_result(pRes);
taos_close(pConn);
}
TEST(testCase, drop_account_Test) {
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
assert(pConn != NULL);
TAOS_RES* pRes = taos_query(pConn, "drop account aabc");
if (taos_errno(pRes) != TSDB_CODE_SUCCESS) {
printf("failed to create user, reason:%s\n", taos_errstr(pRes));
}
taos_free_result(pRes);
taos_close(pConn);
}
TEST(testCase, show_user_Test) {
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
assert(pConn != NULL);
TAOS_RES* pRes = taos_query(pConn, "show users");
TAOS_ROW pRow = NULL;
TAOS_FIELD* pFields = taos_fetch_fields(pRes);
int32_t numOfFields = taos_num_fields(pRes);
char str[512] = {0};
while ((pRow = taos_fetch_row(pRes)) != NULL) {
int32_t code = taos_print_row(str, pRow, pFields, numOfFields);
printf("%s\n", str);
}
taos_free_result(pRes);
taos_close(pConn);
}
TEST(testCase, drop_user_Test) {
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
assert(pConn != NULL);
TAOS_RES* pRes = taos_query(pConn, "drop user abc");
if (taos_errno(pRes) != TSDB_CODE_SUCCESS) {
printf("failed to create user, reason:%s\n", taos_errstr(pRes));
}
taos_free_result(pRes);
taos_close(pConn);
}
TEST(testCase, show_db_Test) {
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
assert(pConn != NULL);
TAOS_RES* pRes = taos_query(pConn, "show databases");
TAOS_ROW pRow = NULL;
TAOS_FIELD* pFields = taos_fetch_fields(pRes);
int32_t numOfFields = taos_num_fields(pRes);
char str[512] = {0};
while ((pRow = taos_fetch_row(pRes)) != NULL) {
int32_t code = taos_print_row(str, pRow, pFields, numOfFields);
printf("%s\n", str);
}
taos_close(pConn);
}
TEST(testCase, create_db_Test) {
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
assert(pConn != NULL);
TAOS_RES* pRes = taos_query(pConn, "create database abc1 vgroups 2");
if (taos_errno(pRes) != 0) {
printf("error in create db, reason:%s\n", taos_errstr(pRes));
}
TAOS_FIELD* pFields = taos_fetch_fields(pRes);
ASSERT_TRUE(pFields == NULL);
int32_t numOfFields = taos_num_fields(pRes);
ASSERT_EQ(numOfFields, 0);
taos_free_result(pRes); //taos_free_result(pRes);
//taos_close(pConn);
//}
pRes = taos_query(pConn, "create database abc1 vgroups 4"); //TEST(testCase, create_account_Test) {
if (taos_errno(pRes) != 0) { //TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
printf("error in create db, reason:%s\n", taos_errstr(pRes)); //assert(pConn != NULL);
}
taos_close(pConn);
}
TEST(testCase, create_dnode_Test) { //TAOS_RES* pRes = taos_query(pConn, "create account aabc pass 'abc'");
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0); //if (taos_errno(pRes) != TSDB_CODE_SUCCESS) {
assert(pConn != NULL); //printf("failed to create user, reason:%s\n", taos_errstr(pRes));
//}
TAOS_RES* pRes = taos_query(pConn, "create dnode abc1 port 7000"); //taos_free_result(pRes);
if (taos_errno(pRes) != 0) { //taos_close(pConn);
printf("error in create dnode, reason:%s\n", taos_errstr(pRes)); //}
}
taos_free_result(pRes);
pRes = taos_query(pConn, "create dnode 1.1.1.1 port 9000"); //TEST(testCase, drop_account_Test) {
if (taos_errno(pRes) != 0) { //TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
printf("failed to create dnode, reason:%s\n", taos_errstr(pRes)); //assert(pConn != NULL);
}
taos_free_result(pRes);
taos_close(pConn); //TAOS_RES* pRes = taos_query(pConn, "drop account aabc");
} //if (taos_errno(pRes) != TSDB_CODE_SUCCESS) {
//printf("failed to create user, reason:%s\n", taos_errstr(pRes));
//}
TEST(testCase, drop_dnode_Test) { //taos_free_result(pRes);
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0); //taos_close(pConn);
assert(pConn != NULL); //}
TAOS_RES* pRes = taos_query(pConn, "drop dnode 3"); //TEST(testCase, show_user_Test) {
if (taos_errno(pRes) != 0) { //TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
printf("error in drop dnode, reason:%s\n", taos_errstr(pRes)); //assert(pConn != NULL);
}
TAOS_FIELD* pFields = taos_fetch_fields(pRes); //TAOS_RES* pRes = taos_query(pConn, "show users");
ASSERT_TRUE(pFields == NULL); //TAOS_ROW pRow = NULL;
int32_t numOfFields = taos_num_fields(pRes); //TAOS_FIELD* pFields = taos_fetch_fields(pRes);
ASSERT_EQ(numOfFields, 0); //int32_t numOfFields = taos_num_fields(pRes);
pRes = taos_query(pConn, "drop dnode 4"); //char str[512] = {0};
if (taos_errno(pRes) != 0) { //while ((pRow = taos_fetch_row(pRes)) != NULL) {
printf("error in drop dnode, reason:%s\n", taos_errstr(pRes)); //int32_t code = taos_print_row(str, pRow, pFields, numOfFields);
} //printf("%s\n", str);
//}
taos_free_result(pRes); //taos_free_result(pRes);
taos_close(pConn); //taos_close(pConn);
} //}
TEST(testCase, use_db_test) { //TEST(testCase, drop_user_Test) {
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0); //TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
assert(pConn != NULL); //assert(pConn != NULL);
TAOS_RES* pRes = taos_query(pConn, "use abc1"); //TAOS_RES* pRes = taos_query(pConn, "drop user abc");
if (taos_errno(pRes) != 0) { //if (taos_errno(pRes) != TSDB_CODE_SUCCESS) {
printf("error in use db, reason:%s\n", taos_errstr(pRes)); //printf("failed to create user, reason:%s\n", taos_errstr(pRes));
} //}
TAOS_FIELD* pFields = taos_fetch_fields(pRes); //taos_free_result(pRes);
ASSERT_TRUE(pFields == NULL); //taos_close(pConn);
//}
int32_t numOfFields = taos_num_fields(pRes); //TEST(testCase, show_db_Test) {
ASSERT_EQ(numOfFields, 0); //TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
//assert(pConn != NULL);
taos_close(pConn); //TAOS_RES* pRes = taos_query(pConn, "show databases");
} //TAOS_ROW pRow = NULL;
TEST(testCase, drop_db_test) { //TAOS_FIELD* pFields = taos_fetch_fields(pRes);
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0); //int32_t numOfFields = taos_num_fields(pRes);
assert(pConn != NULL);
showDB(pConn); //char str[512] = {0};
//while ((pRow = taos_fetch_row(pRes)) != NULL) {
//int32_t code = taos_print_row(str, pRow, pFields, numOfFields);
//printf("%s\n", str);
//}
TAOS_RES* pRes = taos_query(pConn, "drop database abc1"); //taos_close(pConn);
if (taos_errno(pRes) != 0) { //}
printf("failed to drop db, reason:%s\n", taos_errstr(pRes));
}
taos_free_result(pRes);
showDB(pConn); //TEST(testCase, create_db_Test) {
//TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
//assert(pConn != NULL);
pRes = taos_query(pConn, "create database abc1"); //TAOS_RES* pRes = taos_query(pConn, "create database abc1 vgroups 2");
if (taos_errno(pRes) != 0) { //if (taos_errno(pRes) != 0) {
printf("create to drop db, reason:%s\n", taos_errstr(pRes)); //printf("error in create db, reason:%s\n", taos_errstr(pRes));
} //}
taos_free_result(pRes);
taos_close(pConn);
}
TEST(testCase, create_stable_Test) { //TAOS_FIELD* pFields = taos_fetch_fields(pRes);
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0); //ASSERT_TRUE(pFields == NULL);
assert(pConn != NULL);
TAOS_RES* pRes = taos_query(pConn, "create database if not exists abc1 vgroups 2"); //int32_t numOfFields = taos_num_fields(pRes);
if (taos_errno(pRes) != 0) { //ASSERT_EQ(numOfFields, 0);
printf("error in create db, reason:%s\n", taos_errstr(pRes));
}
taos_free_result(pRes);
pRes = taos_query(pConn, "create table if not exists abc1.st1(ts timestamp, k int) tags(a int)"); //taos_free_result(pRes);
if (taos_errno(pRes) != 0) {
printf("error in create stable, reason:%s\n", taos_errstr(pRes));
}
TAOS_FIELD* pFields = taos_fetch_fields(pRes); //pRes = taos_query(pConn, "create database abc1 vgroups 4");
ASSERT_TRUE(pFields == NULL); //if (taos_errno(pRes) != 0) {
//printf("error in create db, reason:%s\n", taos_errstr(pRes));
//}
//taos_close(pConn);
//}
int32_t numOfFields = taos_num_fields(pRes); //TEST(testCase, create_dnode_Test) {
ASSERT_EQ(numOfFields, 0); //TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
taos_free_result(pRes); //assert(pConn != NULL);
pRes = taos_query(pConn, "create stable if not exists abc1.`123_$^)` (ts timestamp, `abc` int) tags(a int)"); //TAOS_RES* pRes = taos_query(pConn, "create dnode abc1 port 7000");
if (taos_errno(pRes) != 0) { //if (taos_errno(pRes) != 0) {
printf("failed to create super table 123_$^), reason:%s\n", taos_errstr(pRes)); //printf("error in create dnode, reason:%s\n", taos_errstr(pRes));
} //}
//taos_free_result(pRes);
pRes = taos_query(pConn, "use abc1"); //pRes = taos_query(pConn, "create dnode 1.1.1.1 port 9000");
taos_free_result(pRes); //if (taos_errno(pRes) != 0) {
pRes = taos_query(pConn, "drop stable `123_$^)`"); //printf("failed to create dnode, reason:%s\n", taos_errstr(pRes));
if (taos_errno(pRes) != 0) { //}
printf("failed to drop super table 123_$^), reason:%s\n", taos_errstr(pRes)); //taos_free_result(pRes);
}
taos_close(pConn); //taos_close(pConn);
} //}
TEST(testCase, create_table_Test) { //TEST(testCase, drop_dnode_Test) {
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0); //TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
assert(pConn != NULL); //assert(pConn != NULL);
TAOS_RES* pRes = taos_query(pConn, "use abc1"); //TAOS_RES* pRes = taos_query(pConn, "drop dnode 3");
taos_free_result(pRes); //if (taos_errno(pRes) != 0) {
//printf("error in drop dnode, reason:%s\n", taos_errstr(pRes));
//}
pRes = taos_query(pConn, "create table if not exists tm0(ts timestamp, k int)"); //TAOS_FIELD* pFields = taos_fetch_fields(pRes);
ASSERT_EQ(taos_errno(pRes), 0); //ASSERT_TRUE(pFields == NULL);
taos_free_result(pRes); //int32_t numOfFields = taos_num_fields(pRes);
//ASSERT_EQ(numOfFields, 0);
pRes = taos_query(pConn, "create table if not exists tm0(ts timestamp, k blob)"); //pRes = taos_query(pConn, "drop dnode 4");
ASSERT_NE(taos_errno(pRes), 0); //if (taos_errno(pRes) != 0) {
//printf("error in drop dnode, reason:%s\n", taos_errstr(pRes));
//}
taos_free_result(pRes); //taos_free_result(pRes);
taos_close(pConn); //taos_close(pConn);
} //}
TEST(testCase, create_ctable_Test) { //TEST(testCase, use_db_test) {
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0); //TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
assert(pConn != NULL); //assert(pConn != NULL);
TAOS_RES* pRes = taos_query(pConn, "use abc1"); //TAOS_RES* pRes = taos_query(pConn, "use abc1");
if (taos_errno(pRes) != 0) { //if (taos_errno(pRes) != 0) {
printf("failed to use db, reason:%s\n", taos_errstr(pRes)); //printf("error in use db, reason:%s\n", taos_errstr(pRes));
} //}
taos_free_result(pRes);
pRes = taos_query(pConn, "create stable if not exists st1 (ts timestamp, k int ) tags(a int)"); //TAOS_FIELD* pFields = taos_fetch_fields(pRes);
if (taos_errno(pRes) != 0) { //ASSERT_TRUE(pFields == NULL);
printf("failed to create stable, reason:%s\n", taos_errstr(pRes));
}
taos_free_result(pRes);
pRes = taos_query(pConn, "create table tm0 using st1 tags(1)"); //int32_t numOfFields = taos_num_fields(pRes);
if (taos_errno(pRes) != 0) { //ASSERT_EQ(numOfFields, 0);
printf("failed to create child table tm0, reason:%s\n", taos_errstr(pRes));
}
taos_free_result(pRes);
taos_close(pConn);
}
TEST(testCase, show_stable_Test) {
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
assert(pConn != nullptr);
TAOS_RES* pRes = taos_query(pConn, "show abc1.stables"); //taos_close(pConn);
if (taos_errno(pRes) != 0) { //}
printf("failed to show stables, reason:%s\n", taos_errstr(pRes));
taos_free_result(pRes);
ASSERT_TRUE(false);
}
TAOS_ROW pRow = NULL;
TAOS_FIELD* pFields = taos_fetch_fields(pRes);
int32_t numOfFields = taos_num_fields(pRes);
char str[512] = {0}; //TEST(testCase, drop_db_test) {
while ((pRow = taos_fetch_row(pRes)) != NULL) { //TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
int32_t code = taos_print_row(str, pRow, pFields, numOfFields); //assert(pConn != NULL);
printf("%s\n", str);
}
taos_free_result(pRes); //showDB(pConn);
taos_close(pConn);
}
TEST(testCase, show_vgroup_Test) { //TAOS_RES* pRes = taos_query(pConn, "drop database abc1");
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0); //if (taos_errno(pRes) != 0) {
assert(pConn != NULL); //printf("failed to drop db, reason:%s\n", taos_errstr(pRes));
//}
//taos_free_result(pRes);
TAOS_RES* pRes = taos_query(pConn, "use abc1"); //showDB(pConn);
if (taos_errno(pRes) != 0) {
printf("failed to use db, reason:%s\n", taos_errstr(pRes));
}
taos_free_result(pRes);
pRes = taos_query(pConn, "show vgroups"); //pRes = taos_query(pConn, "create database abc1");
if (taos_errno(pRes) != 0) { //if (taos_errno(pRes) != 0) {
printf("failed to show vgroups, reason:%s\n", taos_errstr(pRes)); //printf("create to drop db, reason:%s\n", taos_errstr(pRes));
taos_free_result(pRes); //}
ASSERT_TRUE(false); //taos_free_result(pRes);
} //taos_close(pConn);
//}
TAOS_ROW pRow = NULL; //TEST(testCase, create_stable_Test) {
//TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
//assert(pConn != NULL);
//TAOS_RES* pRes = taos_query(pConn, "create database if not exists abc1 vgroups 2");
//if (taos_errno(pRes) != 0) {
//printf("error in create db, reason:%s\n", taos_errstr(pRes));
//}
//taos_free_result(pRes);
//pRes = taos_query(pConn, "create table if not exists abc1.st1(ts timestamp, k int) tags(a int)");
//if (taos_errno(pRes) != 0) {
//printf("error in create stable, reason:%s\n", taos_errstr(pRes));
//}
//TAOS_FIELD* pFields = taos_fetch_fields(pRes);
//ASSERT_TRUE(pFields == NULL);
//int32_t numOfFields = taos_num_fields(pRes);
//ASSERT_EQ(numOfFields, 0);
//taos_free_result(pRes);
//pRes = taos_query(pConn, "create stable if not exists abc1.`123_$^)` (ts timestamp, `abc` int) tags(a int)");
//if (taos_errno(pRes) != 0) {
//printf("failed to create super table 123_$^), reason:%s\n", taos_errstr(pRes));
//}
//pRes = taos_query(pConn, "use abc1");
//taos_free_result(pRes);
//pRes = taos_query(pConn, "drop stable `123_$^)`");
//if (taos_errno(pRes) != 0) {
//printf("failed to drop super table 123_$^), reason:%s\n", taos_errstr(pRes));
//}
//taos_close(pConn);
//}
TAOS_FIELD* pFields = taos_fetch_fields(pRes); //TEST(testCase, create_table_Test) {
int32_t numOfFields = taos_num_fields(pRes); //TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
//assert(pConn != NULL);
char str[512] = {0}; //TAOS_RES* pRes = taos_query(pConn, "use abc1");
while ((pRow = taos_fetch_row(pRes)) != NULL) { //taos_free_result(pRes);
int32_t code = taos_print_row(str, pRow, pFields, numOfFields);
printf("%s\n", str);
}
taos_free_result(pRes); //pRes = taos_query(pConn, "create table if not exists tm0(ts timestamp, k int)");
taos_close(pConn); //ASSERT_EQ(taos_errno(pRes), 0);
}
TEST(testCase, create_multiple_tables) { //taos_free_result(pRes);
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
ASSERT_NE(pConn, nullptr);
TAOS_RES* pRes = taos_query(pConn, "use abc1"); //pRes = taos_query(pConn, "create table if not exists tm0(ts timestamp, k blob)");
if (taos_errno(pRes) != 0) { //ASSERT_NE(taos_errno(pRes), 0);
printf("failed to use db, reason:%s\n", taos_errstr(pRes));
taos_free_result(pRes);
taos_close(pConn);
return;
}
taos_free_result(pRes); //taos_free_result(pRes);
//taos_close(pConn);
//}
pRes = taos_query(pConn, "create table t_2 using st1 tags(1)"); //TEST(testCase, create_ctable_Test) {
if (taos_errno(pRes) != 0) { //TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
printf("failed to create multiple tables, reason:%s\n", taos_errstr(pRes)); //assert(pConn != NULL);
taos_free_result(pRes);
ASSERT_TRUE(false); //TAOS_RES* pRes = taos_query(pConn, "use abc1");
} //if (taos_errno(pRes) != 0) {
//printf("failed to use db, reason:%s\n", taos_errstr(pRes));
//}
//taos_free_result(pRes);
//pRes = taos_query(pConn, "create stable if not exists st1 (ts timestamp, k int ) tags(a int)");
//if (taos_errno(pRes) != 0) {
//printf("failed to create stable, reason:%s\n", taos_errstr(pRes));
//}
//taos_free_result(pRes);
//pRes = taos_query(pConn, "create table tm0 using st1 tags(1)");
//if (taos_errno(pRes) != 0) {
//printf("failed to create child table tm0, reason:%s\n", taos_errstr(pRes));
//}
//taos_free_result(pRes);
//taos_close(pConn);
//}
taos_free_result(pRes); //TEST(testCase, show_stable_Test) {
pRes = taos_query(pConn, "create table t_3 using st1 tags(2)"); //TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
if (taos_errno(pRes) != 0) { //assert(pConn != nullptr);
printf("failed to create multiple tables, reason:%s\n", taos_errstr(pRes));
taos_free_result(pRes); //TAOS_RES* pRes = taos_query(pConn, "show abc1.stables");
ASSERT_TRUE(false); //if (taos_errno(pRes) != 0) {
} //printf("failed to show stables, reason:%s\n", taos_errstr(pRes));
//taos_free_result(pRes);
//ASSERT_TRUE(false);
//}
//TAOS_ROW pRow = NULL;
//TAOS_FIELD* pFields = taos_fetch_fields(pRes);
//int32_t numOfFields = taos_num_fields(pRes);
//char str[512] = {0};
//while ((pRow = taos_fetch_row(pRes)) != NULL) {
//int32_t code = taos_print_row(str, pRow, pFields, numOfFields);
//printf("%s\n", str);
//}
//taos_free_result(pRes);
//taos_close(pConn);
//}
TAOS_ROW pRow = NULL; //TEST(testCase, show_vgroup_Test) {
TAOS_FIELD* pFields = taos_fetch_fields(pRes); //TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
int32_t numOfFields = taos_num_fields(pRes); //assert(pConn != NULL);
char str[512] = {0}; //TAOS_RES* pRes = taos_query(pConn, "use abc1");
while ((pRow = taos_fetch_row(pRes)) != NULL) { //if (taos_errno(pRes) != 0) {
int32_t code = taos_print_row(str, pRow, pFields, numOfFields); //printf("failed to use db, reason:%s\n", taos_errstr(pRes));
printf("%s\n", str); //}
} //taos_free_result(pRes);
taos_free_result(pRes); //pRes = taos_query(pConn, "show vgroups");
//if (taos_errno(pRes) != 0) {
//printf("failed to show vgroups, reason:%s\n", taos_errstr(pRes));
//taos_free_result(pRes);
//ASSERT_TRUE(false);
//}
for (int32_t i = 0; i < 20; ++i) { //TAOS_ROW pRow = NULL;
char sql[512] = {0};
snprintf(sql, tListLen(sql),
"create table t_x_%d using st1 tags(2) t_x_%d using st1 tags(5) t_x_%d using st1 tags(911)", i,
(i + 1) * 30, (i + 2) * 40);
TAOS_RES* pres = taos_query(pConn, sql);
if (taos_errno(pres) != 0) {
printf("failed to create table %d\n, reason:%s", i, taos_errstr(pres));
}
taos_free_result(pres);
}
taos_close(pConn); //TAOS_FIELD* pFields = taos_fetch_fields(pRes);
} //int32_t numOfFields = taos_num_fields(pRes);
TEST(testCase, show_table_Test) { //char str[512] = {0};
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0); //while ((pRow = taos_fetch_row(pRes)) != NULL) {
assert(pConn != NULL); //int32_t code = taos_print_row(str, pRow, pFields, numOfFields);
//printf("%s\n", str);
//}
TAOS_RES* pRes = taos_query(pConn, "show tables"); //taos_free_result(pRes);
if (taos_errno(pRes) != 0) { //taos_close(pConn);
printf("failed to show tables, reason:%s\n", taos_errstr(pRes)); //}
taos_free_result(pRes);
}
taos_free_result(pRes); //TEST(testCase, create_multiple_tables) {
//TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
//ASSERT_NE(pConn, nullptr);
//TAOS_RES* pRes = taos_query(pConn, "use abc1");
//if (taos_errno(pRes) != 0) {
//printf("failed to use db, reason:%s\n", taos_errstr(pRes));
//taos_free_result(pRes);
//taos_close(pConn);
//return;
//}
//taos_free_result(pRes);
//pRes = taos_query(pConn, "create table t_2 using st1 tags(1)");
//if (taos_errno(pRes) != 0) {
//printf("failed to create multiple tables, reason:%s\n", taos_errstr(pRes));
//taos_free_result(pRes);
//ASSERT_TRUE(false);
//}
//taos_free_result(pRes);
//pRes = taos_query(pConn, "create table t_3 using st1 tags(2)");
//if (taos_errno(pRes) != 0) {
//printf("failed to create multiple tables, reason:%s\n", taos_errstr(pRes));
//taos_free_result(pRes);
//ASSERT_TRUE(false);
//}
//TAOS_ROW pRow = NULL;
//TAOS_FIELD* pFields = taos_fetch_fields(pRes);
//int32_t numOfFields = taos_num_fields(pRes);
//char str[512] = {0};
//while ((pRow = taos_fetch_row(pRes)) != NULL) {
//int32_t code = taos_print_row(str, pRow, pFields, numOfFields);
//printf("%s\n", str);
//}
//taos_free_result(pRes);
//for (int32_t i = 0; i < 20; ++i) {
//char sql[512] = {0};
//snprintf(sql, tListLen(sql),
//"create table t_x_%d using st1 tags(2) t_x_%d using st1 tags(5) t_x_%d using st1 tags(911)", i,
//(i + 1) * 30, (i + 2) * 40);
//TAOS_RES* pres = taos_query(pConn, sql);
//if (taos_errno(pres) != 0) {
//printf("failed to create table %d\n, reason:%s", i, taos_errstr(pres));
//}
//taos_free_result(pres);
//}
//taos_close(pConn);
//}
pRes = taos_query(pConn, "show abc1.tables"); //TEST(testCase, show_table_Test) {
if (taos_errno(pRes) != 0) { //TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
printf("failed to show tables, reason:%s\n", taos_errstr(pRes)); //assert(pConn != NULL);
taos_free_result(pRes);
}
TAOS_ROW pRow = NULL; //TAOS_RES* pRes = taos_query(pConn, "show tables");
TAOS_FIELD* pFields = taos_fetch_fields(pRes); //if (taos_errno(pRes) != 0) {
int32_t numOfFields = taos_num_fields(pRes); //printf("failed to show tables, reason:%s\n", taos_errstr(pRes));
//taos_free_result(pRes);
//}
int32_t count = 0; //taos_free_result(pRes);
char str[512] = {0};
while ((pRow = taos_fetch_row(pRes)) != NULL) { //pRes = taos_query(pConn, "show abc1.tables");
int32_t code = taos_print_row(str, pRow, pFields, numOfFields); //if (taos_errno(pRes) != 0) {
printf("%d: %s\n", ++count, str); //printf("failed to show tables, reason:%s\n", taos_errstr(pRes));
} //taos_free_result(pRes);
//}
taos_free_result(pRes); //TAOS_ROW pRow = NULL;
taos_close(pConn); //TAOS_FIELD* pFields = taos_fetch_fields(pRes);
} //int32_t numOfFields = taos_num_fields(pRes);
TEST(testCase, drop_stable_Test) { //int32_t count = 0;
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0); //char str[512] = {0};
assert(pConn != nullptr);
TAOS_RES* pRes = taos_query(pConn, "create database if not exists abc1"); //while ((pRow = taos_fetch_row(pRes)) != NULL) {
if (taos_errno(pRes) != 0) { //int32_t code = taos_print_row(str, pRow, pFields, numOfFields);
printf("error in creating db, reason:%s\n", taos_errstr(pRes)); //printf("%d: %s\n", ++count, str);
} //}
taos_free_result(pRes);
pRes = taos_query(pConn, "use abc1"); //taos_free_result(pRes);
if (taos_errno(pRes) != 0) { //taos_close(pConn);
printf("error in using db, reason:%s\n", taos_errstr(pRes)); //}
}
taos_free_result(pRes);
pRes = taos_query(pConn, "drop stable st1"); //TEST(testCase, drop_stable_Test) {
if (taos_errno(pRes) != 0) { //TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
printf("failed to drop stable, reason:%s\n", taos_errstr(pRes)); //assert(pConn != nullptr);
}
//TAOS_RES* pRes = taos_query(pConn, "create database if not exists abc1");
//if (taos_errno(pRes) != 0) {
//printf("error in creating db, reason:%s\n", taos_errstr(pRes));
//}
//taos_free_result(pRes);
//pRes = taos_query(pConn, "use abc1");
//if (taos_errno(pRes) != 0) {
//printf("error in using db, reason:%s\n", taos_errstr(pRes));
//}
//taos_free_result(pRes);
//pRes = taos_query(pConn, "drop stable st1");
//if (taos_errno(pRes) != 0) {
//printf("failed to drop stable, reason:%s\n", taos_errstr(pRes));
//}
//taos_free_result(pRes);
//taos_close(pConn);
//}
taos_free_result(pRes); //TEST(testCase, generated_request_id_test) {
taos_close(pConn); //SHashObj* phash = taosHashInit(10000, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_ENTRY_LOCK);
}
TEST(testCase, generated_request_id_test) { //for (int32_t i = 0; i < 50000; ++i) {
SHashObj* phash = taosHashInit(10000, taosGetDefaultHashFunction(TSDB_DATA_TYPE_BIGINT), false, HASH_ENTRY_LOCK); //uint64_t v = generateRequestId();
//void* result = taosHashGet(phash, &v, sizeof(v));
for (int32_t i = 0; i < 50000; ++i) { //if (result != nullptr) {
uint64_t v = generateRequestId(); //printf("0x%lx, index:%d\n", v, i);
void* result = taosHashGet(phash, &v, sizeof(v)); //}
if (result != nullptr) { //assert(result == nullptr);
printf("0x%lx, index:%d\n", v, i); //taosHashPut(phash, &v, sizeof(v), NULL, 0);
} //}
assert(result == nullptr);
taosHashPut(phash, &v, sizeof(v), NULL, 0);
}
taosHashCleanup(phash); //taosHashCleanup(phash);
} //}
TEST(testCase, create_topic_Test) { TEST(testCase, create_topic_Test) {
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0); TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
...@@ -552,29 +552,35 @@ TEST(testCase, create_topic_Test) { ...@@ -552,29 +552,35 @@ TEST(testCase, create_topic_Test) {
taos_close(pConn); taos_close(pConn);
} }
TEST(testCase, insert_test) { //TEST(testCase, insert_test) {
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0); //TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
ASSERT_NE(pConn, nullptr); //ASSERT_NE(pConn, nullptr);
TAOS_RES* pRes = taos_query(pConn, "use abc1"); //TAOS_RES* pRes = taos_query(pConn, "use abc1");
taos_free_result(pRes); //taos_free_result(pRes);
pRes = taos_query(pConn, "insert into t_2 values(now, 1)"); //pRes = taos_query(pConn, "insert into t_2 values(now, 1)");
if (taos_errno(pRes) != 0) { //if (taos_errno(pRes) != 0) {
printf("failed to create multiple tables, reason:%s\n", taos_errstr(pRes)); //printf("failed to create multiple tables, reason:%s\n", taos_errstr(pRes));
taos_free_result(pRes); //taos_free_result(pRes);
ASSERT_TRUE(false); //ASSERT_TRUE(false);
} //}
taos_free_result(pRes); //taos_free_result(pRes);
taos_close(pConn); //taos_close(pConn);
} //}
#if 0
TEST(testCase, tmq_subscribe_Test) { TEST(testCase, tmq_subscribe_Test) {
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0); TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
assert(pConn != NULL); assert(pConn != NULL);
TAOS_RES* pRes = taos_query(pConn, "use abc1");
if (taos_errno(pRes) != 0) {
printf("error in use db, reason:%s\n", taos_errstr(pRes));
}
taos_free_result(pRes);
tmq_conf_t* conf = tmq_conf_new(); tmq_conf_t* conf = tmq_conf_new();
tmq_conf_set(conf, "group.id", "tg1"); tmq_conf_set(conf, "group.id", "tg1");
tmq_t* tmq = taos_consumer_new(pConn, conf, NULL, 0); tmq_t* tmq = taos_consumer_new(pConn, conf, NULL, 0);
...@@ -595,7 +601,6 @@ TEST(testCase, tmq_consume_Test) { ...@@ -595,7 +601,6 @@ TEST(testCase, tmq_consume_Test) {
TEST(testCase, tmq_commit_TEST) { TEST(testCase, tmq_commit_TEST) {
} }
#endif
//TEST(testCase, insert_test) { //TEST(testCase, insert_test) {
// TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0); // TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
...@@ -615,56 +620,56 @@ TEST(testCase, tmq_commit_TEST) { ...@@ -615,56 +620,56 @@ TEST(testCase, tmq_commit_TEST) {
// taos_close(pConn); // taos_close(pConn);
//} //}
TEST(testCase, projection_query_tables) { //TEST(testCase, projection_query_tables) {
TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0); //TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
ASSERT_NE(pConn, nullptr); //ASSERT_NE(pConn, nullptr);
TAOS_RES* pRes = taos_query(pConn, "use abc1"); //TAOS_RES* pRes = taos_query(pConn, "use abc1");
taos_free_result(pRes); //taos_free_result(pRes);
pRes = taos_query(pConn, "create stable st1 (ts timestamp, k int) tags(a int)"); //pRes = taos_query(pConn, "create stable st1 (ts timestamp, k int) tags(a int)");
if (taos_errno(pRes) != 0) { //if (taos_errno(pRes) != 0) {
printf("failed to create table tu, reason:%s\n", taos_errstr(pRes)); //printf("failed to create table tu, reason:%s\n", taos_errstr(pRes));
} //}
taos_free_result(pRes); //taos_free_result(pRes);
pRes = taos_query(pConn, "create table tu using st1 tags(1)"); //pRes = taos_query(pConn, "create table tu using st1 tags(1)");
if (taos_errno(pRes) != 0) { //if (taos_errno(pRes) != 0) {
printf("failed to create table tu, reason:%s\n", taos_errstr(pRes)); //printf("failed to create table tu, reason:%s\n", taos_errstr(pRes));
} //}
taos_free_result(pRes); //taos_free_result(pRes);
for(int32_t i = 0; i < 100000; ++i) { //for(int32_t i = 0; i < 100000; ++i) {
char sql[512] = {0}; //char sql[512] = {0};
sprintf(sql, "insert into tu values(now+%da, %d)", i, i); //sprintf(sql, "insert into tu values(now+%da, %d)", i, i);
TAOS_RES* p = taos_query(pConn, sql); //TAOS_RES* p = taos_query(pConn, sql);
if (taos_errno(p) != 0) { //if (taos_errno(p) != 0) {
printf("failed to insert data, reason:%s\n", taos_errstr(p)); //printf("failed to insert data, reason:%s\n", taos_errstr(p));
} //}
taos_free_result(p); //taos_free_result(p);
} //}
pRes = taos_query(pConn, "select * from tu"); //pRes = taos_query(pConn, "select * from tu");
if (taos_errno(pRes) != 0) { //if (taos_errno(pRes) != 0) {
printf("failed to select from table, reason:%s\n", taos_errstr(pRes)); //printf("failed to select from table, reason:%s\n", taos_errstr(pRes));
taos_free_result(pRes); //taos_free_result(pRes);
ASSERT_TRUE(false); //ASSERT_TRUE(false);
} //}
TAOS_ROW pRow = NULL; //TAOS_ROW pRow = NULL;
TAOS_FIELD* pFields = taos_fetch_fields(pRes); //TAOS_FIELD* pFields = taos_fetch_fields(pRes);
int32_t numOfFields = taos_num_fields(pRes); //int32_t numOfFields = taos_num_fields(pRes);
char str[512] = {0}; //char str[512] = {0};
while ((pRow = taos_fetch_row(pRes)) != NULL) { //while ((pRow = taos_fetch_row(pRes)) != NULL) {
int32_t code = taos_print_row(str, pRow, pFields, numOfFields); //int32_t code = taos_print_row(str, pRow, pFields, numOfFields);
printf("%s\n", str); //printf("%s\n", str);
} //}
taos_free_result(pRes); //taos_free_result(pRes);
taos_close(pConn); //taos_close(pConn);
} //}
//TEST(testCase, projection_query_stables) { //TEST(testCase, projection_query_stables) {
// TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0); // TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0);
......
source/dnode/mnode/impl/src/mndSubscribe.c
浏览文件 @ a9bd009b
...@@ -43,7 +43,7 @@ static int32_t mndProcessSubscribeInternalRsp(SMnodeMsg *pMsg); ...@@ -43,7 +43,7 @@ static int32_t mndProcessSubscribeInternalRsp(SMnodeMsg *pMsg);
static int32_t mndProcessMqTimerMsg(SMnodeMsg *pMsg); static int32_t mndProcessMqTimerMsg(SMnodeMsg *pMsg);
static int mndBuildMqSetConsumerVgReq(SMnode *pMnode, STrans *pTrans, SMqConsumerObj *pConsumer, static int mndBuildMqSetConsumerVgReq(SMnode *pMnode, STrans *pTrans, SMqConsumerObj *pConsumer,
SMqConsumerTopic *pConsumerTopic, SMqTopicObj *pTopic); SMqConsumerTopic *pConsumerTopic, SMqTopicObj *pTopic, SMqConsumerEp *pSub);
int32_t mndInitSubscribe(SMnode *pMnode) { int32_t mndInitSubscribe(SMnode *pMnode) {
SSdbTable table = {.sdbType = SDB_SUBSCRIBE, SSdbTable table = {.sdbType = SDB_SUBSCRIBE,
...@@ -184,7 +184,7 @@ static int mndInitUnassignedVg(SMnode *pMnode, SMqTopicObj *pTopic, SArray *unas ...@@ -184,7 +184,7 @@ static int mndInitUnassignedVg(SMnode *pMnode, SMqTopicObj *pTopic, SArray *unas
} }
static int mndBuildMqSetConsumerVgReq(SMnode *pMnode, STrans *pTrans, SMqConsumerObj *pConsumer, static int mndBuildMqSetConsumerVgReq(SMnode *pMnode, STrans *pTrans, SMqConsumerObj *pConsumer,
SMqConsumerTopic *pConsumerTopic, SMqTopicObj *pTopic) { SMqConsumerTopic *pConsumerTopic, SMqTopicObj *pTopic, SMqConsumerEp* pCEp) {
int32_t sz = taosArrayGetSize(pConsumerTopic->pVgInfo); int32_t sz = taosArrayGetSize(pConsumerTopic->pVgInfo);
for (int32_t i = 0; i < sz; i++) { for (int32_t i = 0; i < sz; i++) {
int32_t vgId = *(int32_t *)taosArrayGet(pConsumerTopic->pVgInfo, i); int32_t vgId = *(int32_t *)taosArrayGet(pConsumerTopic->pVgInfo, i);
...@@ -199,6 +199,8 @@ static int mndBuildMqSetConsumerVgReq(SMnode *pMnode, STrans *pTrans, SMqConsume ...@@ -199,6 +199,8 @@ static int mndBuildMqSetConsumerVgReq(SMnode *pMnode, STrans *pTrans, SMqConsume
req.sql = pTopic->sql; req.sql = pTopic->sql;
req.logicalPlan = pTopic->logicalPlan; req.logicalPlan = pTopic->logicalPlan;
req.physicalPlan = pTopic->physicalPlan; req.physicalPlan = pTopic->physicalPlan;
req.qmsg = strdup(pCEp->qmsg);
req.qmsgLen = strlen(req.qmsg);
int32_t tlen = tEncodeSMqSetCVgReq(NULL, &req); int32_t tlen = tEncodeSMqSetCVgReq(NULL, &req);
void *buf = malloc(sizeof(SMsgHead) + tlen); void *buf = malloc(sizeof(SMsgHead) + tlen);
if (buf == NULL) { if (buf == NULL) {
...@@ -501,17 +503,21 @@ static int32_t mndProcessSubscribeReq(SMnodeMsg *pMsg) { ...@@ -501,17 +503,21 @@ static int32_t mndProcessSubscribeReq(SMnodeMsg *pMsg) {
} }
taosArrayPush(pSub->availConsumer, &consumerId); taosArrayPush(pSub->availConsumer, &consumerId);
SMqConsumerTopic *pConsumerTopic = tNewConsumerTopic(consumerId, pTopic, pSub); SMqConsumerTopic *pConsumerTopic = tNewConsumerTopic(consumerId, pTopic, pSub);
taosArrayPush(pConsumer->topics, pConsumerTopic); taosArrayPush(pConsumer->topics, pConsumerTopic);
if (taosArrayGetSize(pConsumerTopic->pVgInfo) > 0) { if (taosArrayGetSize(pConsumerTopic->pVgInfo) > 0) {
ASSERT(taosArrayGetSize(pConsumerTopic->pVgInfo) == 1); ASSERT(taosArrayGetSize(pConsumerTopic->pVgInfo) == 1);
int32_t vgId = *(int32_t *)taosArrayGetLast(pConsumerTopic->pVgInfo); int32_t vgId = *(int32_t *)taosArrayGetLast(pConsumerTopic->pVgInfo);
// send setmsg to vnode SMqConsumerEp* pCEp = taosArrayGetLast(pSub->assigned);
if (mndBuildMqSetConsumerVgReq(pMnode, pTrans, pConsumer, pConsumerTopic, pTopic) < 0) { if (pCEp->vgId == vgId) {
// TODO if (mndBuildMqSetConsumerVgReq(pMnode, pTrans, pConsumer, pConsumerTopic, pTopic, pCEp) < 0) {
return -1; // TODO
return -1;
}
} }
// send setmsg to vnode
} }
SSdbRaw *pRaw = mndSubActionEncode(pSub); SSdbRaw *pRaw = mndSubActionEncode(pSub);
......
source/dnode/vnode/src/tq/tq.c
浏览文件 @ a9bd009b
...@@ -811,7 +811,7 @@ int32_t tqProcessSetConnReq(STQ* pTq, char* msg, SRpcMsg** ppRsp) { ...@@ -811,7 +811,7 @@ int32_t tqProcessSetConnReq(STQ* pTq, char* msg, SRpcMsg** ppRsp) {
for (int i = 0; i < TQ_BUFFER_SIZE; i++) { for (int i = 0; i < TQ_BUFFER_SIZE; i++) {
pTopic->buffer.output[i].status = 0; pTopic->buffer.output[i].status = 0;
STqReadHandle* pReadHandle = tqInitSubmitMsgScanner(pTq->pMeta); STqReadHandle* pReadHandle = tqInitSubmitMsgScanner(pTq->pMeta);
pTopic->buffer.output[i].task = qCreateStreamExecTaskInfo(&req.qmsg, pReadHandle); pTopic->buffer.output[i].task = qCreateStreamExecTaskInfo(req.qmsg, pReadHandle);
} }
taosArrayPush(pConsumer->topics, pTopic); taosArrayPush(pConsumer->topics, pTopic);
terrno = TSDB_CODE_SUCCESS; terrno = TSDB_CODE_SUCCESS;
......
source/libs/planner/src/physicalPlanJson.c
浏览文件 @ a9bd009b
...@@ -1132,6 +1132,7 @@ int32_t subPlanToString(const SSubplan* subplan, char** str, int32_t* len) { ...@@ -1132,6 +1132,7 @@ int32_t subPlanToString(const SSubplan* subplan, char** str, int32_t* len) {
} }
int32_t stringToSubplan(const char* str, SSubplan** subplan) { int32_t stringToSubplan(const char* str, SSubplan** subplan) {
printf("aa: %s\n", str);
cJSON* json = cJSON_Parse(str); cJSON* json = cJSON_Parse(str);
if (NULL == json) { if (NULL == json) {
return TSDB_CODE_FAILED; return TSDB_CODE_FAILED;
......
source/libs/scheduler/src/scheduler.c
浏览文件 @ a9bd009b
...@@ -1482,13 +1482,14 @@ int32_t schedulerConvertDagToTaskList(SQueryDag* pDag, SArray **pTasks) { ...@@ -1482,13 +1482,14 @@ int32_t schedulerConvertDagToTaskList(SQueryDag* pDag, SArray **pTasks) {
} }
int32_t msgSize = sizeof(SSubQueryMsg) + msgLen; int32_t msgSize = sizeof(SSubQueryMsg) + msgLen;
msg = calloc(1, msgSize);
if (NULL == msg) { if (NULL == msg) {
qError("calloc %d failed", msgSize); qError("calloc %d failed", msgSize);
SCH_ERR_JRET(TSDB_CODE_QRY_OUT_OF_MEMORY); SCH_ERR_JRET(TSDB_CODE_QRY_OUT_OF_MEMORY);
} }
SSubQueryMsg *pMsg = (SSubQueryMsg*) msg; SSubQueryMsg* pMsg = calloc(1, msgSize);
/*SSubQueryMsg *pMsg = (SSubQueryMsg*) msg;*/
memcpy(pMsg->msg, msg, msgLen);
pMsg->header.vgId = tInfo.addr.nodeId; pMsg->header.vgId = tInfo.addr.nodeId;
...@@ -1497,7 +1498,7 @@ int32_t schedulerConvertDagToTaskList(SQueryDag* pDag, SArray **pTasks) { ...@@ -1497,7 +1498,7 @@ int32_t schedulerConvertDagToTaskList(SQueryDag* pDag, SArray **pTasks) {
pMsg->taskId = schGenUUID(); pMsg->taskId = schGenUUID();
pMsg->taskType = TASK_TYPE_PERSISTENT; pMsg->taskType = TASK_TYPE_PERSISTENT;
pMsg->contentLen = msgLen; pMsg->contentLen = msgLen;
memcpy(pMsg->msg, msg, msgLen); /*memcpy(pMsg->msg, ((SSubQueryMsg*)msg)->msg, msgLen);*/
tInfo.msg = pMsg; tInfo.msg = pMsg;
......
source/util/test/CMakeLists.txt
浏览文件 @ a9bd009b
...@@ -13,12 +13,12 @@ IF (HEADER_GTEST_INCLUDE_DIR AND (LIB_GTEST_STATIC_DIR OR LIB_GTEST_SHARED_DIR)) ...@@ -13,12 +13,12 @@ IF (HEADER_GTEST_INCLUDE_DIR AND (LIB_GTEST_STATIC_DIR OR LIB_GTEST_SHARED_DIR))
LIST(REMOVE_ITEM SOURCE_LIST ${CMAKE_CURRENT_SOURCE_DIR}/trefTest.c) LIST(REMOVE_ITEM SOURCE_LIST ${CMAKE_CURRENT_SOURCE_DIR}/trefTest.c)
ADD_EXECUTABLE(utilTest ${SOURCE_LIST}) ADD_EXECUTABLE(utilTest ${SOURCE_LIST})
TARGET_LINK_LIBRARIES(utilTest util common os gtest pthread gcov) TARGET_LINK_LIBRARIES(utilTest util common os gtest pthread)
LIST(REMOVE_ITEM SOURCE_LIST ${CMAKE_CURRENT_SOURCE_DIR}/cacheTest.cpp) LIST(REMOVE_ITEM SOURCE_LIST ${CMAKE_CURRENT_SOURCE_DIR}/cacheTest.cpp)
LIST(APPEND SOURCE_LIST ${CMAKE_CURRENT_SOURCE_DIR}/hashTest.cpp) LIST(APPEND SOURCE_LIST ${CMAKE_CURRENT_SOURCE_DIR}/hashTest.cpp)
ADD_EXECUTABLE(hashTest ${SOURCE_LIST}) ADD_EXECUTABLE(hashTest ${SOURCE_LIST})
TARGET_LINK_LIBRARIES(hashTest util common os gtest pthread gcov) TARGET_LINK_LIBRARIES(hashTest util common os gtest pthread)
LIST(APPEND BIN_SRC ${CMAKE_CURRENT_SOURCE_DIR}/trefTest.c) LIST(APPEND BIN_SRC ${CMAKE_CURRENT_SOURCE_DIR}/trefTest.c)
ADD_EXECUTABLE(trefTest ${BIN_SRC}) ADD_EXECUTABLE(trefTest ${BIN_SRC})
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或