提交 1dd6f4bf 编写于 作者: Z zhaoyanggh

fix -N case

上级 840fd197
...@@ -2914,36 +2914,47 @@ void *asyncWrite(void *sarg) { ...@@ -2914,36 +2914,47 @@ void *asyncWrite(void *sarg) {
int startMultiThreadInsertData(int threads, char *db_name, char *precision, int startMultiThreadInsertData(int threads, char *db_name, char *precision,
SSuperTable *stbInfo) { SSuperTable *stbInfo) {
int32_t timePrec = TSDB_TIME_PRECISION_MILLI; int32_t timePrec = TSDB_TIME_PRECISION_MILLI;
stbInfo->tsPrecision = TSDB_SML_TIMESTAMP_MILLI_SECONDS; if (stbInfo) {
stbInfo->tsPrecision = TSDB_SML_TIMESTAMP_MILLI_SECONDS;
}
if (0 != precision[0]) { if (0 != precision[0]) {
if (0 == strncasecmp(precision, "ms", 2)) { if (0 == strncasecmp(precision, "ms", 2)) {
timePrec = TSDB_TIME_PRECISION_MILLI; timePrec = TSDB_TIME_PRECISION_MILLI;
stbInfo->tsPrecision = TSDB_SML_TIMESTAMP_MILLI_SECONDS; if (stbInfo) {
stbInfo->tsPrecision = TSDB_SML_TIMESTAMP_MILLI_SECONDS;
}
} else if (0 == strncasecmp(precision, "us", 2)) { } else if (0 == strncasecmp(precision, "us", 2)) {
timePrec = TSDB_TIME_PRECISION_MICRO; timePrec = TSDB_TIME_PRECISION_MICRO;
stbInfo->tsPrecision = TSDB_SML_TIMESTAMP_MICRO_SECONDS; if (stbInfo) {
stbInfo->tsPrecision = TSDB_SML_TIMESTAMP_MICRO_SECONDS;
}
} else if (0 == strncasecmp(precision, "ns", 2)) { } else if (0 == strncasecmp(precision, "ns", 2)) {
timePrec = TSDB_TIME_PRECISION_NANO; timePrec = TSDB_TIME_PRECISION_NANO;
stbInfo->tsPrecision = TSDB_SML_TIMESTAMP_NANO_SECONDS; if (stbInfo) {
stbInfo->tsPrecision = TSDB_SML_TIMESTAMP_NANO_SECONDS;
}
} else { } else {
errorPrint("Not support precision: %s\n", precision); errorPrint("Not support precision: %s\n", precision);
return -1; return -1;
} }
} }
if (stbInfo) {
if (stbInfo->iface == SML_IFACE) { if (stbInfo->iface == SML_IFACE) {
if (stbInfo->lineProtocol != TSDB_SML_LINE_PROTOCOL) { if (stbInfo->lineProtocol != TSDB_SML_LINE_PROTOCOL) {
if (stbInfo->columnCount != 1) { if (stbInfo->columnCount != 1) {
errorPrint( errorPrint(
"Schemaless telnet/json protocol can only have 1 column " "Schemaless telnet/json protocol can only have 1 "
"instead of %d\n", "column "
stbInfo->columnCount); "instead of %d\n",
return -1; stbInfo->columnCount);
return -1;
}
stbInfo->tsPrecision = TSDB_SML_TIMESTAMP_NOT_CONFIGURED;
}
if (stbInfo->lineProtocol != TSDB_SML_JSON_PROTOCOL) {
calcRowLen(stbInfo);
} }
stbInfo->tsPrecision = TSDB_SML_TIMESTAMP_NOT_CONFIGURED;
}
if (stbInfo->lineProtocol != TSDB_SML_JSON_PROTOCOL) {
calcRowLen(stbInfo);
} }
} }
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册