Skip to content

T
TDengine

慢慢CG / TDengine
与 Fork 源项目一致

Fork自 taosdata / TDengine

通知 1
Star 0
Fork 0
T
TDengine
提交 ccbda72c 编写于 作者: Z zhaoyanggh
浏览文件
操作

change snprintf back to strncpy

上级 31bfb19b
隐藏空白更改
内联 并排
Showing with 17 addition and 13 deletion
src/kit/taosdemo/taosdemo.c
浏览文件 @ ccbda72c
...@@ -6434,7 +6434,8 @@ static int64_t generateStbRowData( ...@@ -6434,7 +6434,8 @@ static int64_t generateStbRowData(
"(%" PRId64 "", timestamp); "(%" PRId64 "", timestamp);
for (int i = 0; i < stbInfo->columnCount; i++) { for (int i = 0; i < stbInfo->columnCount; i++) {
dataLen += snprintf(pstr + dataLen, 2, ","); tstrncpy(pstr + dataLen, ",", 2);
dataLen += 1;
if ((stbInfo->columns[i].data_type == TSDB_DATA_TYPE_BINARY) if ((stbInfo->columns[i].data_type == TSDB_DATA_TYPE_BINARY)
|| (stbInfo->columns[i].data_type == TSDB_DATA_TYPE_NCHAR)) { || (stbInfo->columns[i].data_type == TSDB_DATA_TYPE_NCHAR)) {
...@@ -6468,25 +6469,25 @@ static int64_t generateStbRowData( ...@@ -6468,25 +6469,25 @@ static int64_t generateStbRowData(
tmp = rand_int_str(); tmp = rand_int_str();
} }
tmpLen = strlen(tmp); tmpLen = strlen(tmp);
dataLen += snprintf(pstr + dataLen, tmpLen + 1, "%s", tmp); tstrncpy(pstr + dataLen, tmp, min(tmpLen + 1, INT_BUFF_LEN));
break; break;
case TSDB_DATA_TYPE_UINT: case TSDB_DATA_TYPE_UINT:
tmp = rand_uint_str(); tmp = rand_uint_str();
tmpLen = strlen(tmp); tmpLen = strlen(tmp);
dataLen += snprintf(pstr + dataLen, tmpLen + 1, "%s", tmp); tstrncpy(pstr + dataLen, tmp, min(tmpLen + 1, INT_BUFF_LEN));
break; break;
case TSDB_DATA_TYPE_BIGINT: case TSDB_DATA_TYPE_BIGINT:
tmp = rand_bigint_str(); tmp = rand_bigint_str();
tmpLen = strlen(tmp); tmpLen = strlen(tmp);
dataLen += snprintf(pstr + dataLen, tmpLen + 1, "%s", tmp); tstrncpy(pstr + dataLen, tmp, min(tmpLen + 1, BIGINT_BUFF_LEN));
break; break;
case TSDB_DATA_TYPE_UBIGINT: case TSDB_DATA_TYPE_UBIGINT:
tmp = rand_ubigint_str(); tmp = rand_ubigint_str();
tmpLen = strlen(tmp); tmpLen = strlen(tmp);
dataLen += snprintf(pstr + dataLen, tmpLen + 1, "%s", tmp); tstrncpy(pstr + dataLen, tmp, min(tmpLen + 1, BIGINT_BUFF_LEN));
break; break;
case TSDB_DATA_TYPE_FLOAT: case TSDB_DATA_TYPE_FLOAT:
...@@ -6500,49 +6501,49 @@ static int64_t generateStbRowData( ...@@ -6500,49 +6501,49 @@ static int64_t generateStbRowData(
tmp = rand_float_str(); tmp = rand_float_str();
} }
tmpLen = strlen(tmp); tmpLen = strlen(tmp);
dataLen += snprintf(pstr + dataLen, tmpLen + 1, "%s", tmp); tstrncpy(pstr + dataLen, tmp, min(tmpLen + 1, FLOAT_BUFF_LEN));
break; break;
case TSDB_DATA_TYPE_DOUBLE: case TSDB_DATA_TYPE_DOUBLE:
tmp = rand_double_str(); tmp = rand_double_str();
tmpLen = strlen(tmp); tmpLen = strlen(tmp);
dataLen += snprintf(pstr + dataLen, tmpLen + 1, "%s", tmp); tstrncpy(pstr + dataLen, tmp, min(tmpLen + 1, DOUBLE_BUFF_LEN));
break; break;
case TSDB_DATA_TYPE_SMALLINT: case TSDB_DATA_TYPE_SMALLINT:
tmp = rand_smallint_str(); tmp = rand_smallint_str();
tmpLen = strlen(tmp); tmpLen = strlen(tmp);
dataLen += snprintf(pstr + dataLen, tmpLen + 1, "%s", tmp); tstrncpy(pstr + dataLen, tmp, min(tmpLen + 1, SMALLINT_BUFF_LEN));
break; break;
case TSDB_DATA_TYPE_USMALLINT: case TSDB_DATA_TYPE_USMALLINT:
tmp = rand_usmallint_str(); tmp = rand_usmallint_str();
tmpLen = strlen(tmp); tmpLen = strlen(tmp);
dataLen += snprintf(pstr + dataLen, tmpLen + 1, "%s", tmp); tstrncpy(pstr + dataLen, tmp, min(tmpLen + 1, SMALLINT_BUFF_LEN));
break; break;
case TSDB_DATA_TYPE_TINYINT: case TSDB_DATA_TYPE_TINYINT:
tmp = rand_tinyint_str(); tmp = rand_tinyint_str();
tmpLen = strlen(tmp); tmpLen = strlen(tmp);
dataLen += snprintf(pstr + dataLen, tmpLen + 1, "%s", tmp); tstrncpy(pstr + dataLen, tmp, min(tmpLen + 1, TINYINT_BUFF_LEN));
break; break;
case TSDB_DATA_TYPE_UTINYINT: case TSDB_DATA_TYPE_UTINYINT:
tmp = rand_utinyint_str(); tmp = rand_utinyint_str();
tmpLen = strlen(tmp); tmpLen = strlen(tmp);
dataLen += snprintf(pstr + dataLen, tmpLen +1, "%s", tmp); tstrncpy(pstr + dataLen, tmp, min(tmpLen + 1, TINYINT_BUFF_LEN));
break; break;
case TSDB_DATA_TYPE_BOOL: case TSDB_DATA_TYPE_BOOL:
tmp = rand_bool_str(); tmp = rand_bool_str();
tmpLen = strlen(tmp); tmpLen = strlen(tmp);
dataLen += snprintf(pstr + dataLen, tmpLen + 1, "%s", tmp); tstrncpy(pstr + dataLen, tmp, min(tmpLen + 1, BOOL_BUFF_LEN));
break; break;
case TSDB_DATA_TYPE_TIMESTAMP: case TSDB_DATA_TYPE_TIMESTAMP:
tmp = rand_bigint_str(); tmp = rand_bigint_str();
tmpLen = strlen(tmp); tmpLen = strlen(tmp);
dataLen += snprintf(pstr + dataLen, min(tmpLen + 1, BIGINT_BUFF_LEN), "%s", tmp); tstrncpy(pstr + dataLen, tmp, min(tmpLen + 1, BIGINT_BUFF_LEN));
break; break;
case TSDB_DATA_TYPE_NULL: case TSDB_DATA_TYPE_NULL:
...@@ -6553,6 +6554,9 @@ static int64_t generateStbRowData( ...@@ -6553,6 +6554,9 @@ static int64_t generateStbRowData(
stbInfo->columns[i].dataType); stbInfo->columns[i].dataType);
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
if (tmp) {
dataLen += tmpLen;
}
} }
if (dataLen > (remainderBufLen - (128))) if (dataLen > (remainderBufLen - (128)))
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或