From ccba2c6612ce9e57a17774a2e594ee51ee5d7e1d Mon Sep 17 00:00:00 2001
From: factosea <285808407@qq.com>
Date: Mon, 19 Feb 2024 17:28:11 +0800
Subject: [PATCH] fix: block format

---
 source/client/src/clientImpl.c |  6 +++---
 source/common/src/tdatablock.c | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/source/client/src/clientImpl.c b/source/client/src/clientImpl.c
index 7556152f5a..6c48ad1fcb 100644
--- a/source/client/src/clientImpl.c
+++ b/source/client/src/clientImpl.c
@@ -2028,9 +2028,6 @@ int32_t setResultDataPtr(SReqResultInfo* pResultInfo, TAOS_FIELD* pFields, int32
   int32_t rows = *(int32_t*)p;
   p += sizeof(int32_t);
 
-  // bool blankFill = *(bool*)p;
-  p += sizeof(bool);
-
   int32_t cols = *(int32_t*)p;
   p += sizeof(int32_t);
 
@@ -2085,6 +2082,9 @@ int32_t setResultDataPtr(SReqResultInfo* pResultInfo, TAOS_FIELD* pFields, int32
     pStart += colLength[i];
   }
 
+  // bool blankFill = *(bool*)p;
+  p += sizeof(bool);
+
   if (convertUcs4) {
     code = doConvertUCS4(pResultInfo, numOfRows, numOfCols, colLength);
   }
diff --git a/source/common/src/tdatablock.c b/source/common/src/tdatablock.c
index d39daa53e3..d364a58494 100644
--- a/source/common/src/tdatablock.c
+++ b/source/common/src/tdatablock.c
@@ -2208,10 +2208,6 @@ int32_t blockEncode(const SSDataBlock* pBlock, char* data, int32_t numOfCols) {
   data += sizeof(int32_t);
   ASSERT(*rows > 0);
 
-  bool* blankFill = (bool*)data;
-  *blankFill = pBlock->info.blankFill;
-  data += sizeof(bool);
-
   int32_t* cols = (int32_t*)data;
   *cols = numOfCols;
   data += sizeof(int32_t);
@@ -2287,6 +2283,10 @@ int32_t blockEncode(const SSDataBlock* pBlock, char* data, int32_t numOfCols) {
     //    htonl(colSizes[col]), colSizes[col]);
   }
 
+  bool* blankFill = (bool*)data;
+  *blankFill = pBlock->info.blankFill;
+  data += sizeof(bool);
+
   *actualLen = dataLen;
   *groupId = pBlock->info.id.groupId;
   ASSERT(dataLen > 0);
@@ -2307,9 +2307,6 @@ const char* blockDecode(SSDataBlock* pBlock, const char* pData) {
   int32_t numOfRows = *(int32_t*)pStart;
   pStart += sizeof(int32_t);
 
-  bool blankFill = *(bool*)pStart;
-  pStart += sizeof(bool);
-
   // total columns sizeof(int32_t)
   int32_t numOfCols = *(int32_t*)pStart;
   pStart += sizeof(int32_t);
@@ -2383,6 +2380,9 @@ const char* blockDecode(SSDataBlock* pBlock, const char* pData) {
     pStart += colLen[i];
   }
 
+  bool blankFill = *(bool*)pStart;
+  pStart += sizeof(bool);
+
   pBlock->info.dataLoad = 1;
   pBlock->info.rows = numOfRows;
   pBlock->info.blankFill = blankFill;