resolve merge conflict

351757c7 · Ganlin Zhao · e56f55c3 · d1ba1794 · 351757c7
显示空白变更内容
内联并排

Showing with 1 addition and 1 deletion

src/client/src/tscParseLineProtocol.c src/client/src/tscParseLineProtocol.c +1 -1

未找到文件。
--- a/src/client/src/tscParseLineProtocol.c
+++ b/src/client/src/tscParseLineProtocol.c
@@ -1400,7 +1400,7 @@ static int32_t convertSmlTimeStamp(TAOS_SML_KV *pVal, char *value,
  if (ret) {
    return ret;
  }
-  //printf("Timestamp after conversion:%ld\n", tsVal);
+  tscDebug("Timestamp after conversion:%"PRId64"\n", tsVal);
  pVal->type = TSDB_DATA_TYPE_TIMESTAMP;
  pVal->length = (int16_t)tDataTypes[pVal->type].bytes;