diff --git a/source/client/test/clientTests.cpp b/source/client/test/clientTests.cpp index 9810b308574eacf78e29e3104bbab49b856532c4..4170401f00471b7ad935a5e9bbd3cfa5e5752662 100644 --- a/source/client/test/clientTests.cpp +++ b/source/client/test/clientTests.cpp @@ -49,7 +49,7 @@ int main(int argc, char** argv) { TEST(testCase, driverInit_Test) { taos_init(); } TEST(testCase, connect_Test) { - TAOS* pConn = taos_connect("localhost", "root", "taosdata", NULL, 0); + TAOS* pConn = taos_connect("localhost", "root", "taosdata", "abc1", 0); if (pConn == NULL) { printf("failed to connect to server, reason:%s\n", taos_errstr(NULL)); } diff --git a/source/libs/planner/src/physicalPlanJson.c b/source/libs/planner/src/physicalPlanJson.c index 97eb63ac3129bc8454b6263b7f8aca31f2dde397..c7a4e438baf026dfbbdce04c9640cad5c1adea3f 100644 --- a/source/libs/planner/src/physicalPlanJson.c +++ b/source/libs/planner/src/physicalPlanJson.c @@ -30,7 +30,8 @@ static void copyString(const cJSON* json, const char* name, char* dst) { } static int64_t getNumber(const cJSON* json, const char* name) { - return cJSON_GetNumberValue(cJSON_GetObjectItem(json, name)); + double d = cJSON_GetNumberValue(cJSON_GetObjectItem(json, name)); + return (int64_t) d; } static bool addObject(cJSON* json, const char* name, FToJson func, const void* obj) { @@ -541,17 +542,27 @@ static const char* jkTimeWindowEndKey = "EndKey"; static bool timeWindowToJson(const void* obj, cJSON* json) { const STimeWindow* win = (const STimeWindow*)obj; - bool res = cJSON_AddNumberToObject(json, jkTimeWindowStartKey, win->skey); + + char tmp[32] = {0}; + sprintf(tmp, "%"PRId64, win->skey); + + bool res = cJSON_AddStringToObject(json, jkTimeWindowStartKey, tmp); if (res) { - res = cJSON_AddNumberToObject(json, jkTimeWindowEndKey, win->ekey); + memset(tmp, 0, tListLen(tmp)); + sprintf(tmp, "%"PRId64, win->ekey); + res = cJSON_AddStringToObject(json, jkTimeWindowEndKey, tmp); } return res; } static bool timeWindowFromJson(const cJSON* json, void* obj) { STimeWindow* win = (STimeWindow*)obj; - win->skey = getNumber(json, jkTimeWindowStartKey); - win->ekey = getNumber(json, jkTimeWindowEndKey); + + char* p = getString(json, jkTimeWindowStartKey); + win->skey = strtoll(p, NULL, 10); + + p = getString(json, jkTimeWindowEndKey); + win->ekey = strtoll(p, NULL, 10); return true; } diff --git a/source/libs/qworker/src/qworker.c b/source/libs/qworker/src/qworker.c index 1be190065a093b55498727956140a4982f172ccb..249c78431362b03c8c2634889efea6b7905f56e9 100644 --- a/source/libs/qworker/src/qworker.c +++ b/source/libs/qworker/src/qworker.c @@ -1262,7 +1262,8 @@ int32_t qWorkerProcessQueryMsg(void *node, void *qWorkerMgmt, SRpcMsg *pMsg) { } QW_ERR_JRET(qwAddTask(qWorkerMgmt, sId, qId, tId, JOB_TASK_STATUS_EXECUTING)); - + QW_DLOG("query task received, reqId:0x%"PRIx64", physical plan:%s", qId, msg->msg); + code = qStringToSubplan(msg->msg, &plan); if (TSDB_CODE_SUCCESS != code) { QW_TASK_ELOG("string to subplan failed, code:%d", code);