From 9d3d129fef2ad42747022e5c96dea2363e31e698 Mon Sep 17 00:00:00 2001
From: lichuang <lichuang1982@gmail.com>
Date: Mon, 17 May 2021 13:37:59 +0800
Subject: [PATCH] [TD-4034]add timestamp in last NULL column

---
 src/common/inc/tdataformat.h | 1 +
 src/tsdb/src/tsdbMemTable.c  | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/common/inc/tdataformat.h b/src/common/inc/tdataformat.h
index 88d5b85010..fcae7a415f 100644
--- a/src/common/inc/tdataformat.h
+++ b/src/common/inc/tdataformat.h
@@ -234,6 +234,7 @@ typedef struct SDataCol {
   int             len;        // column data length
   VarDataOffsetT *dataOff;    // For binary and nchar data, the offset in the data column
   void *          pData;      // Actual data pointer
+  TSKEY           ts;         // only used in last NULL column
 } SDataCol;
 
 static FORCE_INLINE void dataColReset(SDataCol *pDataCol) { pDataCol->len = 0; }
diff --git a/src/tsdb/src/tsdbMemTable.c b/src/tsdb/src/tsdbMemTable.c
index 2409536924..e1f6625ffa 100644
--- a/src/tsdb/src/tsdbMemTable.c
+++ b/src/tsdb/src/tsdbMemTable.c
@@ -985,7 +985,7 @@ static void updateTableLatestColumn(STsdbRepo *pRepo, STable *pTable, SDataRow r
   for (int j = 0; j < schemaNCols(pSchema); j++) {
     if (j >= pTable->lastColNum) {
       pTable->lastCols = realloc(pTable->lastCols, pTable->lastColNum + 10);
-      for (int i = 0; i < 10; ++i) {
+      for (i = 0; i < 10; ++i) {
         pTable->lastCols[i + pTable->lastColNum].bytes = 0;
         pTable->lastCols[i + pTable->lastColNum].pData = NULL;
       }
@@ -1009,6 +1009,7 @@ static void updateTableLatestColumn(STsdbRepo *pRepo, STable *pTable, SDataRow r
     //tsdbDebug("vgId:%d cache column %d for %d,%p", REPO_ID(pRepo), j, pDataCol->bytes, pDataCol->pData);
 
     memcpy(pDataCol->pData, value, pDataCol->bytes);
+    pDataCol->ts = dataRowTKey(row);
   }
 }
 
-- 
GitLab