提交 55f4d952 编写于 作者: wmmhello's avatar wmmhello

fix:support multi json format

上级 aef5bed4
...@@ -177,7 +177,7 @@ typedef struct { ...@@ -177,7 +177,7 @@ typedef struct {
int32_t lineNum; int32_t lineNum;
SSmlMsgBuf msgBuf; SSmlMsgBuf msgBuf;
// cJSON *root; // for parse json cJSON *root; // for parse json
int8_t offset[4]; int8_t offset[4];
SSmlLineInfo *lines; // element is SSmlLineInfo SSmlLineInfo *lines; // element is SSmlLineInfo
...@@ -226,6 +226,7 @@ int32_t is_same_child_table_telnet(const void *a, const void *b); ...@@ -226,6 +226,7 @@ int32_t is_same_child_table_telnet(const void *a, const void *b);
int64_t smlParseOpenTsdbTime(SSmlHandle *info, const char *data, int32_t len); int64_t smlParseOpenTsdbTime(SSmlHandle *info, const char *data, int32_t len);
int32_t smlClearForRerun(SSmlHandle *info); int32_t smlClearForRerun(SSmlHandle *info);
int32_t smlParseValue(SSmlKv *pVal, SSmlMsgBuf *msg); int32_t smlParseValue(SSmlKv *pVal, SSmlMsgBuf *msg);
uint8_t smlGetTimestampLen(int64_t num);
int32_t smlParseInfluxString(SSmlHandle *info, char *sql, char *sqlEnd, SSmlLineInfo *elements); int32_t smlParseInfluxString(SSmlHandle *info, char *sql, char *sqlEnd, SSmlLineInfo *elements);
int32_t smlParseTelnetString(SSmlHandle *info, char *sql, char *sqlEnd, SSmlLineInfo *elements); int32_t smlParseTelnetString(SSmlHandle *info, char *sql, char *sqlEnd, SSmlLineInfo *elements);
......
此差异已折叠。
...@@ -411,28 +411,28 @@ TEST(testCase, smlParseCols_Test) { ...@@ -411,28 +411,28 @@ TEST(testCase, smlParseCols_Test) {
smlDestroyInfo(info); smlDestroyInfo(info);
} }
//TEST(testCase, smlGetTimestampLen_Test) { TEST(testCase, smlGetTimestampLen_Test) {
// uint8_t len = smlGetTimestampLen(0); uint8_t len = smlGetTimestampLen(0);
// ASSERT_EQ(len, 1); ASSERT_EQ(len, 1);
//
// len = smlGetTimestampLen(1); len = smlGetTimestampLen(1);
// ASSERT_EQ(len, 1); ASSERT_EQ(len, 1);
//
// len = smlGetTimestampLen(10); len = smlGetTimestampLen(10);
// ASSERT_EQ(len, 2); ASSERT_EQ(len, 2);
//
// len = smlGetTimestampLen(390); len = smlGetTimestampLen(390);
// ASSERT_EQ(len, 3); ASSERT_EQ(len, 3);
//
// len = smlGetTimestampLen(-1); len = smlGetTimestampLen(-1);
// ASSERT_EQ(len, 1); ASSERT_EQ(len, 1);
//
// len = smlGetTimestampLen(-10); len = smlGetTimestampLen(-10);
// ASSERT_EQ(len, 2); ASSERT_EQ(len, 2);
//
// len = smlGetTimestampLen(-390); len = smlGetTimestampLen(-390);
// ASSERT_EQ(len, 3); ASSERT_EQ(len, 3);
//} }
TEST(testCase, smlParseNumber_Test) { TEST(testCase, smlParseNumber_Test) {
SSmlKv kv = {0}; SSmlKv kv = {0};
......
...@@ -1719,7 +1719,6 @@ class TDTestCase: ...@@ -1719,7 +1719,6 @@ class TDTestCase:
print(err.errno) print(err.errno)
def runAll(self): def runAll(self):
"""
for value_type in ["obj", "default"]: for value_type in ["obj", "default"]:
self.initCheckCase(value_type) self.initCheckCase(value_type)
self.symbolsCheckCase(value_type) self.symbolsCheckCase(value_type)
...@@ -1772,7 +1771,7 @@ class TDTestCase: ...@@ -1772,7 +1771,7 @@ class TDTestCase:
# self.sStbStbDdataDtsMtInsertMultiThreadCheckCase() # self.sStbStbDdataDtsMtInsertMultiThreadCheckCase()
# self.sStbDtbDdataDtsMtInsertMultiThreadCheckCase() # self.sStbDtbDdataDtsMtInsertMultiThreadCheckCase()
# self.lengthIcreaseCrashCheckCase() # self.lengthIcreaseCrashCheckCase()
"""
def run(self): def run(self):
print("running {}".format(__file__)) print("running {}".format(__file__))
self.createDb() self.createDb()
......
...@@ -1416,8 +1416,8 @@ class TDTestCase: ...@@ -1416,8 +1416,8 @@ class TDTestCase:
self.symbolsCheckCase() self.symbolsCheckCase()
self.tsCheckCase() self.tsCheckCase()
self.openTstbTelnetTsCheckCase() self.openTstbTelnetTsCheckCase()
#self.idSeqCheckCase() self.idSeqCheckCase()
#self.idLetterCheckCase() self.idLetterCheckCase()
self.noIdCheckCase() self.noIdCheckCase()
self.maxColTagCheckCase() self.maxColTagCheckCase()
self.stbTbNameCheckCase() self.stbTbNameCheckCase()
...@@ -1450,7 +1450,7 @@ class TDTestCase: ...@@ -1450,7 +1450,7 @@ class TDTestCase:
self.spellCheckCase() self.spellCheckCase()
self.pointTransCheckCase() self.pointTransCheckCase()
self.defaultTypeCheckCase() self.defaultTypeCheckCase()
#self.tbnameTagsColsNameCheckCase() self.tbnameTagsColsNameCheckCase()
# # # MultiThreads # # # MultiThreads
# self.stbInsertMultiThreadCheckCase() # self.stbInsertMultiThreadCheckCase()
# self.sStbStbDdataInsertMultiThreadCheckCase() # self.sStbStbDdataInsertMultiThreadCheckCase()
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册