xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

TD-166

This commit is contained in:
hzcheng 2020-04-27 14:51:06 +08:00
parent 4a56bea1f8
commit 7ed514b733
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/common/src/tdataformat.c
View File

@ -14,6 +14,7 @@
*/ */
#include "tdataformat.h" #include "tdataformat.h"
#include "tutil.h" #include "tutil.h"
#include "wchar.h"
/** /**
* Create a SSchema object with nCols columns * Create a SSchema object with nCols columns
@ -174,7 +175,12 @@ int tdAppendColVal(SDataRow row, void *value, int8_t type, int32_t bytes, int32_
if (value == NULL) { if (value == NULL) {
*(int32_t *)dataRowAt(row, toffset) = -1; *(int32_t *)dataRowAt(row, toffset) = -1;
} else { } else {
int16_t slen = (type) ? strnlen((char *)value, bytes) : wcsnlen((wchar_t *)value, bytes/TSDB_NCHAR_SIZE) * TSDB_NCHAR_SIZE; int16_t slen = 0;
if (type == TSDB_DATA_TYPE_BINARY) {
slen = strnlen((char *)value, bytes);
} else {
slen = wcsnlen((wchar_t *)value, (bytes) / TSDB_NCHAR_SIZE) * TSDB_NCHAR_SIZE;
}
if (slen > bytes) return -1; if (slen > bytes) return -1;
*(int32_t *)dataRowAt(row, toffset) = dataRowLen(row); *(int32_t *)dataRowAt(row, toffset) = dataRowLen(row);