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

fix(tsdb): update the initial value of pk for varchar type.

This commit is contained in:
Haojun Liao 2024-04-18 16:17:29 +08:00
parent c43c0cf427
commit c94c9a900c
2 changed files with 5 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
source/dnode/vnode/src/tsdb/tsdbRead2.c
View File

@ -103,30 +103,10 @@ int32_t pkCompEx(SRowKey* p1, SRowKey* p2) {
return 1; return 1;
} }
ASSERT(p1->numOfPKs == p2->numOfPKs);
if (p1->numOfPKs == 0) { if (p1->numOfPKs == 0) {
return 0; return 0;
} else { } else {
if (IS_VAR_DATA_TYPE(p1->pks[0].type)) { return tRowKeyCompare(p1, p2);
int32_t len = TMIN(p1->pks[0].nData, p2->pks[0].nData);
int32_t ret = strncmp((char*)p1->pks[0].pData, (char*)p2->pks[0].pData, len);
if (ret == 0) {
if (p1->pks[0].nData == p2->pks[0].nData) {
return 0;
} else {
return p1->pks[0].nData > p2->pks[0].nData ? 1 : -1;
}
} else {
return ret > 0 ? 1 : -1;
}
} else {
if (p1->pks[0].val == p2->pks[0].val) {
return 0;
} else {
return tValueCompare(&p1->pks[0], &p2->pks[0]);
}
}
} }
} }

4
source/dnode/vnode/src/tsdb/tsdbReadUtil.c
View File

@ -191,6 +191,10 @@ int32_t initRowKey(SRowKey* pKey, int64_t ts, int32_t numOfPks, int32_t type, in
terrno = TSDB_CODE_OUT_OF_MEMORY; terrno = TSDB_CODE_OUT_OF_MEMORY;
return terrno; return terrno;
} }
if (!asc) {
pKey->numOfPKs = 2;
}
} }
} }