fix: compile issues

include/common/tdatablock.h

@@ -180,6 +180,8 @@ int32_t colDataSetVal(SColumnInfoData* pColumnInfoData, uint32_t rowIndex, const
 int32_t colDataAppend(SColumnInfoData* pColumnInfoData, uint32_t rowIndex, const char* pData, bool isNull);
 int32_t colDataReassignVal(SColumnInfoData* pColumnInfoData, uint32_t dstRowIdx, uint32_t srcRowIdx, const char* pData);
 int32_t colDataSetNItems(SColumnInfoData* pColumnInfoData, uint32_t rowIndex, const char* pData, uint32_t numOfRows, bool trimValue);
+int32_t colDataCopyNItems(SColumnInfoData* pColumnInfoData, uint32_t currentRow, const char* pData,
+                            uint32_t numOfRows, bool isNull);
 int32_t colDataMergeCol(SColumnInfoData* pColumnInfoData, int32_t numOfRow1, int32_t* capacity,
                         const SColumnInfoData* pSource, int32_t numOfRow2);
 int32_t colDataAssign(SColumnInfoData* pColumnInfoData, const SColumnInfoData* pSource, int32_t numOfRows,

source/common/src/tdatablock.c

@@ -271,7 +271,7 @@ int32_t colDataCopyAndReassign(SColumnInfoData* pColumnInfoData, uint32_t curren
   
   if (numOfRows > 1) {
     int32_t* pOffset = pColumnInfoData->varmeta.offset;
-    memset(&pOffset[currentRow + 1], &pOffset[currentRow], sizeof(pOffset[0]) * (numOfRows - 1));
+    memset(&pOffset[currentRow + 1], pOffset[currentRow], sizeof(pOffset[0]) * (numOfRows - 1));
     pColumnInfoData->reassigned = true;  
   }
 

source/libs/executor/inc/hashjoin.h

@@ -21,6 +21,14 @@ extern "C" {
 
 #define HASH_JOIN_DEFAULT_PAGE_SIZE 10485760
 
+#pragma pack(push, 1) 
+typedef struct SBufRowInfo {
+  void*    next;
+  uint16_t pageId;
+  int32_t  offset;
+} SBufRowInfo;
+#pragma pack(pop)
+
 typedef struct SHJoinCtx {
   bool         rowRemains;
   SBufRowInfo* pBuildRow;
@@ -42,7 +50,6 @@ typedef struct SHJoinColInfo {
   int32_t  bytes;
   char*    data;
   char*    bitMap;
-  char*    dataInBuf;
 } SHJoinColInfo;
 
 typedef struct SBufPageInfo {
@@ -51,13 +58,6 @@ typedef struct SBufPageInfo {
   char*   data;
 } SBufPageInfo;
 
-#pragma pack(push, 1) 
-typedef struct SBufRowInfo {
-  void*    next;
-  uint16_t pageId;
-  int32_t  offset;
-} SBufRowInfo;
-#pragma pack(pop)
 
 typedef struct SGroupData {
   SBufRowInfo* rows;
@@ -96,9 +96,6 @@ typedef struct SHJoinOperatorInfo {
   SHJoinCtx        ctx;
 } SHJoinOperatorInfo;
 
-static SSDataBlock* doHashJoin(struct SOperatorInfo* pOperator);
-static void         destroyHashJoinOperator(void* param);
-
 #ifdef __cplusplus
 }
 #endif

source/libs/executor/inc/operator.h

@@ -126,6 +126,8 @@ SOperatorInfo* createTimeSliceOperatorInfo(SOperatorInfo* downstream, SPhysiNode
 
 SOperatorInfo* createMergeJoinOperatorInfo(SOperatorInfo** pDownstream, int32_t numOfDownstream, SSortMergeJoinPhysiNode* pJoinNode, SExecTaskInfo* pTaskInfo);
 
+SOperatorInfo* createHashJoinOperatorInfo(SOperatorInfo** pDownstream, int32_t numOfDownstream,         SHashJoinPhysiNode* pJoinNode, SExecTaskInfo* pTaskInfo);
+
 SOperatorInfo* createStreamSessionAggOperatorInfo(SOperatorInfo* downstream, SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo);
 
 SOperatorInfo* createStreamFinalSessionAggOperatorInfo(SOperatorInfo* downstream, SPhysiNode* pPhyNode, SExecTaskInfo* pTaskInfo, int32_t numOfChild);
@@ -163,4 +165,4 @@ int32_t        getOperatorExplainExecInfo(struct SOperatorInfo* operatorInfo, SA
 }
 #endif
 
-#endif  // TDENGINE_OPERATOR_H
+#endif  // TDENGINE_OPERATOR_H