From 6f202d270e66eee02e7d87f314ea2fcc3a281a82 Mon Sep 17 00:00:00 2001
From: lichuang <lichuang1982@gmail.com>
Date: Tue, 18 May 2021 19:50:35 +0800
Subject: [PATCH] [TD-4034]restore last not NULL column

---
 src/tsdb/src/tsdbMain.c | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/tsdb/src/tsdbMain.c b/src/tsdb/src/tsdbMain.c
index 3be78e21dd..8e1207b98a 100644
--- a/src/tsdb/src/tsdbMain.c
+++ b/src/tsdb/src/tsdbMain.c
@@ -652,7 +652,8 @@ static int restoreLastColumns(STsdbRepo *pRepo, STable *pTable, SReadH* pReadh)
   }
   memset(pBlockStatis, 0, numColumns * sizeof(SDataStatis));
   for(int32_t i = 0; i < numColumns; ++i) {
-    pBlockStatis[i].colId = i;
+    STColumn *pCol = schemaColAt(pSchema, i);
+    pBlockStatis[i].colId = pCol->colId;
   }
 
   // load block from backward
@@ -678,6 +679,17 @@ static int restoreLastColumns(STsdbRepo *pRepo, STable *pTable, SReadH* pReadh)
     }
 
     for (uint32_t colId = 0; colId < numColumns && numColumns > pTable->restoreColumnNum; ++colId) {
+      STColumn *pCol = schemaColAt(pSchema, colId);
+
+      if (colId >= pTable->lastColNum) {
+        pTable->lastCols = realloc(pTable->lastCols, colId + 5);
+        for (int m = 0; m < 5; ++m) {
+          pTable->lastCols[m + pTable->lastColNum].bytes = 0;
+          pTable->lastCols[m + pTable->lastColNum].pData = NULL;
+        }
+        pTable->lastColNum += colId + 5;
+      }
+
       // ignore loaded columns
       if (pTable->lastCols[colId].bytes != 0) {
         continue;
@@ -689,7 +701,6 @@ static int restoreLastColumns(STsdbRepo *pRepo, STable *pTable, SReadH* pReadh)
       }
 
       // OK,let's load row from backward to get not-null column
-      STColumn *pCol = schemaColAt(pSchema, colId);
       for (int32_t rowId = pBlock->numOfRows - 1; rowId >= 0; rowId--) {
         SDataCol *pDataCol = pReadh->pDCols[0]->cols + colId;
         tdAppendColVal(row, tdGetColDataOfRow(pDataCol, rowId), pCol->type, pCol->bytes, pCol->offset);
-- 
GitLab