[columnar] Adjust row number with vectorized batch reading

* If row is deleted we don't write data or any other information in vector * Flushed row mask should increase current command id for tuple visibility
hydradatabase · Feb 10, 2023 · 7e15b4c · 7e15b4c
1 parent cabe2b1
commit 7e15b4c
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/columnar/src/backend/columnar/columnar_metadata.c b/columnar/src/backend/columnar/columnar_metadata.c
@@ -972,6 +972,8 @@ void FlushRowMaskCache(RowMaskWriteStateEntry *rowMaskEntry)
 
 	systable_endscan_ordered(scanDescriptor);
 	table_close(columnarChunkGroupMask, AccessShareLock);
+
+	CommandCounterIncrement();
 }
 
 

diff --git a/columnar/src/backend/columnar/columnar_reader.c b/columnar/src/backend/columnar/columnar_reader.c
@@ -1995,6 +1995,7 @@ ReadChunkGroupNextVector(ChunkGroupReadState *chunkGroupReadState, Datum *column
 	memset(columnNulls, true, sizeof(bool) * chunkGroupReadState->columnCount);
 
 	int i;
+	int rowNumberIndex = 0;
 
 	for (i = 0; i < chunkGroupReadState->rowCount; i ++)
 	{
@@ -2013,7 +2014,6 @@ ReadChunkGroupNextVector(ChunkGroupReadState *chunkGroupReadState, Datum *column
 			{
 				(*chunkReadRows)++;
 				chunkGroupReadState->currentRow++;
-				rowNumber[i] = stripeFirstRowNumber + chunkGroupReadState->currentRow - 1;
 				continue;
 			}
 		}
@@ -2048,7 +2048,7 @@ ReadChunkGroupNextVector(ChunkGroupReadState *chunkGroupReadState, Datum *column
 
 		(*chunkReadRows)++;
 		chunkGroupReadState->currentRow++;
-		rowNumber[i] = stripeFirstRowNumber + chunkGroupReadState->currentRow - 1;
+		rowNumber[rowNumberIndex++] = stripeFirstRowNumber + chunkGroupReadState->currentRow - 1;
 	}
 
 	return true;
-Original file line number
+Diff line change
@@ Expand Up @@
     	systable_endscan_ordered(scanDescriptor);
     	table_close(columnarChunkGroupMask, AccessShareLock);
+    	CommandCounterIncrement();
     }
@@ Expand Down @@