Refactor internals to support pageinspect (#850)

In late december 2024 I was busy supporting pageinspect extension for AO/AOCS relations in out GP6 fork. Here is prelimitary patch for supporting same in CBDB.
apache · Jan 9, 2025 · dbc7a71 · dbc7a71
1 parent 3419239
commit dbc7a71
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 4 deletions.
diff --git a/src/backend/access/appendonly/appendonlyam.c b/src/backend/access/appendonly/appendonlyam.c
@@ -137,7 +137,7 @@ initscan(AppendOnlyScanDesc scan, ScanKey key)
 /*
  * Open the next file segment to scan and allocate all resources needed for it.
  */
-static bool
+bool
 SetNextFileSegForRead(AppendOnlyScanDesc scan)
 {
 	Relation	reln = scan->aos_rd;
@@ -470,7 +470,7 @@ CloseWritableFileSeg(AppendOnlyInsertDesc aoInsertDesc)
 
 /* ------------------------------------------------------------------------------ */
 
-static void
+void
 AppendOnlyExecutorReadBlock_GetContents(AppendOnlyExecutorReadBlock *executorReadBlock)
 {
 	VarBlockCheckError varBlockCheckError;
@@ -669,7 +669,7 @@ AppendOnlyExecutorReadBlock_GetContents(AppendOnlyExecutorReadBlock *executorRea
 	}
 }
 
-static bool
+bool
 AppendOnlyExecutorReadBlock_GetBlockInfo(AppendOnlyStorageRead *storageRead,
 										 AppendOnlyExecutorReadBlock *executorReadBlock)
 {
@@ -1011,7 +1011,8 @@ AppendOnlyExecutorReadBlock_ProcessTuple(AppendOnlyExecutorReadBlock *executorRe
 	return valid;
 }
 
-static bool
+
+bool
 AppendOnlyExecutorReadBlock_ScanNextTuple(AppendOnlyExecutorReadBlock *executorReadBlock,
 										  int nkeys,
 										  ScanKey key,

diff --git a/src/backend/cdb/cdbvarblock.c b/src/backend/cdb/cdbvarblock.c
@@ -755,6 +755,7 @@ VarBlockGetItemPtrAndLen(
 	VarBlockByteOffset offset;
 
 	Assert(varBlockReader != NULL);
+	Assert(varBlockReader->header);
 
 	header = varBlockReader->header;
 	buffer = (uint8 *) header;
@@ -804,6 +805,7 @@ VarBlockReaderGetNextItemPtr(
 
 	Assert(varBlockReader != NULL);
 	Assert(itemLen != NULL);
+	Assert(varBlockReader->header);
 
 	if (varBlockReader->nextIndex >=
 		VarBlockGet_itemCount(varBlockReader->header))
@@ -828,6 +830,7 @@ VarBlockReaderItemCount(
 						VarBlockReader *varBlockReader)
 {
 	Assert(varBlockReader != NULL);
+	Assert(varBlockReader->header != NULL);
 
 	return VarBlockGet_itemCount(varBlockReader->header);
 }
@@ -844,6 +847,7 @@ VarBlockReaderGetItemPtr(
 	uint8	   *nextItemPtr;
 
 	Assert(varBlockReader != NULL);
+	Assert(varBlockReader->header);
 	Assert(itemIndex >= 0);
 	Assert(itemIndex < VarBlockGet_itemCount(varBlockReader->header));
 

diff --git a/src/include/cdb/cdbappendonlyam.h b/src/include/cdb/cdbappendonlyam.h
@@ -481,4 +481,18 @@ extern ExprState* appendonly_predicate_pushdown_prepare(AppendOnlyScanDesc scan,
 												   ExprState *qual,
 												   ExprContext *ecxt);
 
+extern bool AppendOnlyExecutorReadBlock_GetBlockInfo(AppendOnlyStorageRead *storageRead,
+										 AppendOnlyExecutorReadBlock *executorReadBlock);
+
+extern void AppendOnlyStorageRead_CloseFile(AppendOnlyStorageRead *storageRead);
+
+extern bool SetNextFileSegForRead(AppendOnlyScanDesc scan);
+
+extern bool AppendOnlyExecutorReadBlock_ScanNextTuple(AppendOnlyExecutorReadBlock *executorReadBlock,
+										  int nkeys,
+										  ScanKey key,
+										  TupleTableSlot *slot);
+
+extern void AppendOnlyExecutorReadBlock_GetContents(AppendOnlyExecutorReadBlock *executorReadBlock);
+
 #endif   /* CDBAPPENDONLYAM_H */