fix(query): set the correct schema version for each record in buffer.

b4f6f3ef · Haojun Liao · 0f0060f8 · b4f6f3ef
隐藏空白更改
内联并排

Showing with 1 addition and 3 deletion

source/dnode/vnode/src/tsdb/tsdbRead.c source/dnode/vnode/src/tsdb/tsdbRead.c +1 -3

未找到文件。
--- a/source/dnode/vnode/src/tsdb/tsdbRead.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead.c
@@ -1657,9 +1657,7 @@ static int32_t mergeTwoRowFromMem(STsdbReadHandle* pTsdbReadHandle, int32_t capa
  if (row2) {
    isRow2DataRow = TD_IS_TP_ROW(row2);
    if (pSchema2 == NULL) {
-      // pSchema2 = metaGetTbTSchema(REPO_META(pTsdbReadHandle->pTsdb), uid, TD_ROW_SVER(row2));
-      // TODO: use the real schemaVersion
-      pSchema2 = metaGetTbTSchema(REPO_META(pTsdbReadHandle->pTsdb), uid, 1);
+      pSchema2 = metaGetTbTSchema(REPO_META(pTsdbReadHandle->pTsdb), uid,  TD_ROW_SVER(row2));
    }
    if (isRow2DataRow) {
      numOfColsOfRow2 = schemaNCols(pSchema2);