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

fix windows compile error

This commit is contained in:
wpan 2021-08-03 11:20:45 +08:00
parent 079e063b59
commit 9a64c0ee8f
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/query/inc/qFilter.h
View File

@ -253,9 +253,9 @@ typedef struct SFilterInfo {
#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_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_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_GROUP_UNIT(i, g, uid) ((i)->units + (g)->unitIdxs[uid])

4
src/query/src/qFilter.c
View File

@ -898,7 +898,7 @@ int32_t filterConvertSetFromBinary(void **q, const char *buf, int32_t len, uint3
if (bufLen < t) {
tmp = realloc(tmp, t * TSDB_NCHAR_SIZE);
bufLen = t;
bufLen = (int32_t)t;
}
bool converted = false;
@ -1623,7 +1623,7 @@ int32_t filterInitValFieldData(SFilterInfo *info) {
fi->data = calloc(var->nLen, tDataTypes[type].bytes);
for (int32_t a = 0; a < var->nLen; ++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;