From 1d77cde433d1241f3cfa542d2c122c440834d42b Mon Sep 17 00:00:00 2001
From: Haojun Liao <hjliao@taosdata.com>
Date: Wed, 20 Mar 2024 23:03:48 +0800
Subject: [PATCH] refactor: do some internal refactor.

---
 source/dnode/vnode/src/tsdb/tsdbRead2.c    |  6 +++---
 source/dnode/vnode/src/tsdb/tsdbReadUtil.c | 12 ++++++------
 source/dnode/vnode/src/tsdb/tsdbReadUtil.h |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbRead2.c b/source/dnode/vnode/src/tsdb/tsdbRead2.c
index 8b20b9e0f1..4960937297 100644
--- a/source/dnode/vnode/src/tsdb/tsdbRead2.c
+++ b/source/dnode/vnode/src/tsdb/tsdbRead2.c
@@ -2815,10 +2815,10 @@ static void buildCleanBlockFromDataFiles(STsdbReader* pReader, STableBlockScanIn
   pKey->numOfPKs = pReader->numOfPks;
 
   // todo opt allocation, and handle varchar primary key
-  pKey->pks[0].val = asc ? pBlockInfo->lastPrimaryKey.val : pBlockInfo->firstPrimaryKey.val;
+  pKey->pks[0].val = asc ? pBlockInfo->lastPk.val : pBlockInfo->firstPk.val;
 
-  pInfo->pks[0].val = pBlockInfo->firstPrimaryKey.val;
-  pInfo->pks[1].val = pBlockInfo->lastPrimaryKey.val;
+  pInfo->pks[0].val = pBlockInfo->firstPk.val;
+  pInfo->pks[1].val = pBlockInfo->lastPk.val;
 
   tsdbDebug("%p uid:%" PRIu64
             " clean file block retrieved from file, global index:%d, "
diff --git a/source/dnode/vnode/src/tsdb/tsdbReadUtil.c b/source/dnode/vnode/src/tsdb/tsdbReadUtil.c
index e99ea3467a..e843216172 100644
--- a/source/dnode/vnode/src/tsdb/tsdbReadUtil.c
+++ b/source/dnode/vnode/src/tsdb/tsdbReadUtil.c
@@ -380,19 +380,19 @@ static void recordToBlockInfo(SFileDataBlockInfo* pBlockInfo, SBrinRecord* recor
 
   if (pFirstKey->numOfPKs > 0) {
     if (IS_NUMERIC_TYPE(pFirstKey->pks[0].type)) {
-      pBlockInfo->firstPrimaryKey.val = pFirstKey->pks[0].val;
-      pBlockInfo->lastPrimaryKey.val = record->lastKey.key.pks[0].val;
+      pBlockInfo->firstPk.val = pFirstKey->pks[0].val;
+      pBlockInfo->lastPk.val = record->lastKey.key.pks[0].val;
 
       pBlockInfo->firstPKLen = 0;
       pBlockInfo->lastPKLen = 0;
     } else {  // todo handle memory alloc error, opt memory alloc perf
       pBlockInfo->firstPKLen = pFirstKey->pks[0].nData;
-      pBlockInfo->firstPrimaryKey.pData = taosMemoryCalloc(1, pBlockInfo->firstPKLen);
-      memcpy(pBlockInfo->firstPrimaryKey.pData, pFirstKey->pks[0].pData, pBlockInfo->firstPKLen);
+      pBlockInfo->firstPk.pData = taosMemoryCalloc(1, pBlockInfo->firstPKLen);
+      memcpy(pBlockInfo->firstPk.pData, pFirstKey->pks[0].pData, pBlockInfo->firstPKLen);
 
       pBlockInfo->lastPKLen = record->lastKey.key.pks[0].nData;
-      pBlockInfo->lastPrimaryKey.pData = taosMemoryCalloc(1, pBlockInfo->lastPKLen);
-      memcpy(pBlockInfo->lastPrimaryKey.pData, record->lastKey.key.pks[0].pData, pBlockInfo->lastPKLen);
+      pBlockInfo->lastPk.pData = taosMemoryCalloc(1, pBlockInfo->lastPKLen);
+      memcpy(pBlockInfo->lastPk.pData, record->lastKey.key.pks[0].pData, pBlockInfo->lastPKLen);
     }
   }
 }
diff --git a/source/dnode/vnode/src/tsdb/tsdbReadUtil.h b/source/dnode/vnode/src/tsdb/tsdbReadUtil.h
index 2dbae87c56..2e61f6dff9 100644
--- a/source/dnode/vnode/src/tsdb/tsdbReadUtil.h
+++ b/source/dnode/vnode/src/tsdb/tsdbReadUtil.h
@@ -189,13 +189,13 @@ typedef struct SFileDataBlockInfo {
   union {
     int64_t  val;
     uint8_t* pData;
-  } firstPrimaryKey;
+  } firstPk;
 
   int64_t lastKey;
   union {
     int64_t  val;
     uint8_t* pData;
-  } lastPrimaryKey;
+  } lastPk;
 
   int32_t firstPKLen;
   int32_t lastPKLen;