提交 9a64c0ee 编写于 作者: W wpan

fix windows compile error

上级 079e063b
...@@ -253,9 +253,9 @@ typedef struct SFilterInfo { ...@@ -253,9 +253,9 @@ typedef struct SFilterInfo {
#define FILTER_GET_COL_FIELD_TYPE(fi) (((SSchema *)((fi)->desc))->type) #define FILTER_GET_COL_FIELD_TYPE(fi) (((SSchema *)((fi)->desc))->type)
#define FILTER_GET_COL_FIELD_SIZE(fi) (((SSchema *)((fi)->desc))->bytes) #define FILTER_GET_COL_FIELD_SIZE(fi) (((SSchema *)((fi)->desc))->bytes)
#define FILTER_GET_COL_FIELD_DESC(fi) ((SSchema *)((fi)->desc)) #define FILTER_GET_COL_FIELD_DESC(fi) ((SSchema *)((fi)->desc))
#define FILTER_GET_COL_FIELD_DATA(fi, ri) ((fi)->data + ((SSchema *)((fi)->desc))->bytes * (ri)) #define FILTER_GET_COL_FIELD_DATA(fi, ri) ((char *)(fi)->data + ((SSchema *)((fi)->desc))->bytes * (ri))
#define FILTER_GET_VAL_FIELD_TYPE(fi) (((tVariant *)((fi)->desc))->nType) #define FILTER_GET_VAL_FIELD_TYPE(fi) (((tVariant *)((fi)->desc))->nType)
#define FILTER_GET_VAL_FIELD_DATA(fi) ((fi)->data) #define FILTER_GET_VAL_FIELD_DATA(fi) ((char *)(fi)->data)
#define FILTER_GET_TYPE(fl) ((fl) & FLD_TYPE_MAX) #define FILTER_GET_TYPE(fl) ((fl) & FLD_TYPE_MAX)
#define FILTER_GROUP_UNIT(i, g, uid) ((i)->units + (g)->unitIdxs[uid]) #define FILTER_GROUP_UNIT(i, g, uid) ((i)->units + (g)->unitIdxs[uid])
......
...@@ -898,7 +898,7 @@ int32_t filterConvertSetFromBinary(void **q, const char *buf, int32_t len, uint3 ...@@ -898,7 +898,7 @@ int32_t filterConvertSetFromBinary(void **q, const char *buf, int32_t len, uint3
if (bufLen < t) { if (bufLen < t) {
tmp = realloc(tmp, t * TSDB_NCHAR_SIZE); tmp = realloc(tmp, t * TSDB_NCHAR_SIZE);
bufLen = t; bufLen = (int32_t)t;
} }
bool converted = false; bool converted = false;
...@@ -1623,7 +1623,7 @@ int32_t filterInitValFieldData(SFilterInfo *info) { ...@@ -1623,7 +1623,7 @@ int32_t filterInitValFieldData(SFilterInfo *info) {
fi->data = calloc(var->nLen, tDataTypes[type].bytes); fi->data = calloc(var->nLen, tDataTypes[type].bytes);
for (int32_t a = 0; a < var->nLen; ++a) { for (int32_t a = 0; a < var->nLen; ++a) {
int64_t *v = taosArrayGet(var->arr, a); int64_t *v = taosArrayGet(var->arr, a);
assignVal(fi->data + a * tDataTypes[type].bytes, (char *)v, 0, type); assignVal((char *)fi->data + a * tDataTypes[type].bytes, (char *)v, 0, type);
} }
continue; continue;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册