diff --git a/src/client/src/tscParseOpenTSDB.c b/src/client/src/tscParseOpenTSDB.c index 14693ae361b533287e3377e644908c5c8a613c79..47bf474e51d11aeb965aa10b31511aefaafe0bc7 100644 --- a/src/client/src/tscParseOpenTSDB.c +++ b/src/client/src/tscParseOpenTSDB.c @@ -58,12 +58,7 @@ static int32_t parseTelnetMetric(TAOS_SML_DATA_POINT *pSml, const char **index, break; } - //convert dot to underscore for now, will be removed once dot is allowed in tbname. - if (*cur == '.') { - pSml->stableName[len] = '_'; - } else { - pSml->stableName[len] = *cur; - } + pSml->stableName[len] = *cur; cur++; len++; @@ -461,13 +456,6 @@ int32_t parseMetricFromJSON(cJSON *root, TAOS_SML_DATA_POINT* pSml, SSmlLinesInf return TSDB_CODE_TSC_INVALID_JSON; } - //convert dot to underscore for now, will be removed once dot is allowed in tbname. - for (int i = 0; i < strlen(metric->valuestring); ++i) { - if (metric->valuestring[i] == '.') { - metric->valuestring[i] = '_'; - } - } - tstrncpy(pSml->stableName, metric->valuestring, stableLen + 1); return TSDB_CODE_SUCCESS; diff --git a/tests/pytest/insert/insertJSONPayload.py b/tests/pytest/insert/insertJSONPayload.py index 88b03cf3f526a380a97acf2a45b86a2c64b66069..4ce244bddd202da62a7cd3e9582bb14be2088cf2 100644 --- a/tests/pytest/insert/insertJSONPayload.py +++ b/tests/pytest/insert/insertJSONPayload.py @@ -35,7 +35,7 @@ class TDTestCase: print("============= step0 : test metric ================") payload = ''' { - "metric": ".stb.0.", + "metric": "`.stb.0.`", "timestamp": 1626006833610123, "value": 10, "tags": { @@ -49,7 +49,7 @@ class TDTestCase: code = self._conn.insert_json_payload(payload) print("insert_json_payload result {}".format(code)) - tdSql.query("describe _stb_0_") + tdSql.query("describe `.stb.0.`") tdSql.checkRows(6) ### metric value ### diff --git a/tests/pytest/insert/insertTelnetLines.py b/tests/pytest/insert/insertTelnetLines.py index b47a74249bbad57ef758e886c513a7eea78b7634..5c89f028875d66618a39b3fb2df9ca3f6bcb898b 100644 --- a/tests/pytest/insert/insertTelnetLines.py +++ b/tests/pytest/insert/insertTelnetLines.py @@ -36,7 +36,7 @@ class TDTestCase: "stb0_0 1626006833639000000ns 4i8 host=\"host0\" interface=\"eth0\"", "stb0_1 1626006833639000000ns 4i8 host=\"host0\" interface=\"eth0\"", "stb0_2 1626006833639000000ns 4i8 host=\"host0\" interface=\"eth0\"", - ".stb0.3. 1626006833639000000ns 4i8 host=\"host0\" interface=\"eth0\"", + "`.stb0.3.` 1626006833639000000ns 4i8 host=\"host0\" interface=\"eth0\"", ] code = self._conn.insert_telnet_lines(lines0) @@ -54,7 +54,7 @@ class TDTestCase: tdSql.query("describe stb0_2") tdSql.checkRows(4) - tdSql.query("describe _stb0_3_") + tdSql.query("describe `.stb0.3.`") tdSql.checkRows(4) ### timestamp ###