Adds columnar.vacuum() and columnar.stats()

hydradatabase · Apr 20, 2023 · 5969ed7 · 5969ed7
1 parent 37a7de3
commit 5969ed7
Show file tree

Hide file tree

Showing 14 changed files with 972 additions and 21 deletions.
diff --git a/columnar/src/backend/columnar/columnar.control b/columnar/src/backend/columnar/columnar.control
@@ -1,4 +1,4 @@
 comment = 'Hydra Columnar extension'
-default_version = '11.1-5'
+default_version = '11.1-6'
 module_pathname = '$libdir/columnar'
 relocatable = false
diff --git a/columnar/src/backend/columnar/columnar_metadata.c b/columnar/src/backend/columnar/columnar_metadata.c
@@ -26,6 +26,7 @@
 
 #include "citus_version.h"
 #include "columnar/columnar.h"
+#include "columnar/columnar_metadata.h"
 #include "columnar/columnar_storage.h"
 #include "columnar/columnar_version_compat.h"
 #include "columnar/utils/listutils.h"
@@ -1960,7 +1961,7 @@ DeleteStripeFromColumnarMetadataTable(Oid metadataTableId,
 	ScanKeyData scanKey[2];
 	ScanKeyInit(&scanKey[0], storageIdAtrrNumber, BTEqualStrategyNumber,
 				F_INT8EQ, UInt64GetDatum(storageId));
-	ScanKeyInit(&scanKey[0], stripeIdAttrNumber, BTEqualStrategyNumber,
+	ScanKeyInit(&scanKey[1], stripeIdAttrNumber, BTEqualStrategyNumber,
 				F_INT8EQ, UInt64GetDatum(stripeId));
 
 	Relation metadataTable = try_relation_open(metadataTableId, AccessShareLock);
@@ -1973,7 +1974,7 @@ DeleteStripeFromColumnarMetadataTable(Oid metadataTableId,
 	Relation index = index_open(storageIdIndexId, AccessShareLock);
 
 	SysScanDesc scanDescriptor = systable_beginscan_ordered(metadataTable, index, NULL,
-															1, scanKey);
+															2, scanKey);
 
 	ModifyState *modifyState = StartModifyRelation(metadataTable);
 
@@ -2521,3 +2522,32 @@ GetHighestUsedRowNumber(uint64 storageId)
 
 	return highestRowNumber;
 }
+
+/*
+ * RewriteMetadataRowWithNewValues rewrites a given metadata entry
+ * for a storageId and a stripeId in place with a new offset,
+ * rowCount, sizeBytes, and chunkCount.
+ *
+ * This is used in the vacuum UDF to fill any existing holes
+ * if possible.
+ */
+StripeMetadata *
+RewriteStripeMetadataRowWithNewValues(Relation rel, uint64 stripeId,
+              uint64 sizeBytes, uint64 fileOffset, uint64 rowCount, uint64 chunkCount)
+{
+	uint64 storageId = ColumnarStorageGetStorageId(rel, false);
+
+	bool update[Natts_columnar_stripe] = { false };
+	update[Anum_columnar_stripe_file_offset - 1] = true;
+	update[Anum_columnar_stripe_data_length - 1] = true;
+	update[Anum_columnar_stripe_row_count - 1] = true;
+	update[Anum_columnar_stripe_chunk_count - 1] = true;
+
+	Datum newValues[Natts_columnar_stripe] = { 0 };
+	newValues[Anum_columnar_stripe_file_offset - 1] = Int64GetDatum(fileOffset);
+	newValues[Anum_columnar_stripe_data_length - 1] = Int64GetDatum(sizeBytes);
+	newValues[Anum_columnar_stripe_row_count - 1] = UInt64GetDatum(rowCount);
+	newValues[Anum_columnar_stripe_chunk_count - 1] = Int32GetDatum(chunkCount);
+
+	return UpdateStripeMetadataRow(storageId, stripeId, update, newValues);
+}
diff --git a/columnar/src/backend/columnar/columnar_reader.c b/columnar/src/backend/columnar/columnar_reader.c
@@ -706,7 +706,9 @@ ColumnarEndRead(ColumnarReadState *readState)
 		pfree(readState->currentStripeMetadata);
 	}
 
-	pfree(readState);
+	if (readState) {
+		pfree(readState);
+	}
 }