From 634da772532c797eaaa0a848124b9e7c1ff75447 Mon Sep 17 00:00:00 2001 From: onderkalaci Date: Fri, 5 May 2023 15:33:21 +0300 Subject: [PATCH] misc fixes for columnar --- src/backend/columnar/columnar.c | 2 +- src/backend/columnar/columnar_metadata.c | 6 +++--- src/backend/distributed/operations/node_protocol.c | 8 ++++---- src/backend/distributed/shared_library_init.c | 2 +- src/include/columnar/columnar.h | 12 ++++++------ src/include/distributed/shared_library_init.h | 8 ++++---- 6 files changed, 19 insertions(+), 19 deletions(-) diff --git a/src/backend/columnar/columnar.c b/src/backend/columnar/columnar.c index 85ec06d00..6a2de8a44 100644 --- a/src/backend/columnar/columnar.c +++ b/src/backend/columnar/columnar.c @@ -148,7 +148,7 @@ ParseCompressionType(const char *compressionTypeString) * For compression algorithms that are invalid or not compiled, it * returns NULL. */ -const char * +PGDLLEXPORT const char * CompressionTypeStr(CompressionType requestedType) { for (int compressionIndex = 0; diff --git a/src/backend/columnar/columnar_metadata.c b/src/backend/columnar/columnar_metadata.c index 9333f74e2..6d1202404 100644 --- a/src/backend/columnar/columnar_metadata.c +++ b/src/backend/columnar/columnar_metadata.c @@ -528,7 +528,7 @@ DeleteColumnarTableOptions(Oid regclass, bool missingOk) } -bool +PGDLLEXPORT bool ReadColumnarOptions(Oid regclass, ColumnarOptions *options) { ScanKeyData scanKey[1]; @@ -1382,14 +1382,14 @@ UpdateStripeMetadataRow(uint64 storageId, uint64 stripeId, bool *update, Relation columnarStripes = table_open(columnarStripesOid, AccessShareLock); Oid indexId = ColumnarStripePKeyIndexRelationId(); - bool indexOk = OidIsValid(indexId); + bool indexOk = false && OidIsValid(indexId); SysScanDesc scanDescriptor = systable_beginscan(columnarStripes, indexId, indexOk, &dirtySnapshot, 2, scanKey); static bool loggedSlowMetadataAccessWarning = false; if (!indexOk && !loggedSlowMetadataAccessWarning) { - ereport(WARNING, (errmsg(SLOW_METADATA_ACCESS_WARNING, "stripe_pkey"))); + //ereport(WARNING, (errmsg(SLOW_METADATA_ACCESS_WARNING, "stripe_pkey"))); loggedSlowMetadataAccessWarning = true; } diff --git a/src/backend/distributed/operations/node_protocol.c b/src/backend/distributed/operations/node_protocol.c index fbca4f271..dca9906a6 100644 --- a/src/backend/distributed/operations/node_protocol.c +++ b/src/backend/distributed/operations/node_protocol.c @@ -631,12 +631,12 @@ GetPreLoadTableCreationCommands(Oid relationId, /* add columnar options for cstore tables */ - //if (accessMethod == NULL && extern_IsColumnarTableAmTable(relationId)) + if (accessMethod == NULL && extern_IsColumnarTableAmTable(relationId)) { - // TableDDLCommand *cstoreOptionsDDL = ColumnarGetTableOptionsDDL(relationId); - // if (cstoreOptionsDDL != NULL) + TableDDLCommand *cstoreOptionsDDL = ColumnarGetTableOptionsDDL(relationId); + if (cstoreOptionsDDL != NULL) { - // tableDDLEventList = lappend(tableDDLEventList, cstoreOptionsDDL); + tableDDLEventList = lappend(tableDDLEventList, cstoreOptionsDDL); } } diff --git a/src/backend/distributed/shared_library_init.c b/src/backend/distributed/shared_library_init.c index 9d9a18d70..f31250e7e 100644 --- a/src/backend/distributed/shared_library_init.c +++ b/src/backend/distributed/shared_library_init.c @@ -118,7 +118,7 @@ PG_MODULE_MAGIC; ColumnarSupportsIndexAM_type extern_ColumnarSupportsIndexAM = NULL; CompressionTypeStr_type extern_CompressionTypeStr = NULL; -IsColumnarTableAmTable_type extern_IsColumnarTableAmTable = NULL; +PGDLLEXPORT IsColumnarTableAmTable_type extern_IsColumnarTableAmTable = NULL; ReadColumnarOptions_type extern_ReadColumnarOptions = NULL; /* diff --git a/src/include/columnar/columnar.h b/src/include/columnar/columnar.h index 8d622b44e..96cff62ab 100644 --- a/src/include/columnar/columnar.h +++ b/src/include/columnar/columnar.h @@ -269,14 +269,14 @@ extern ChunkData * CreateEmptyChunkData(uint32 columnCount, bool *columnMask, uint32 chunkGroupRowCount); extern void FreeChunkData(ChunkData *chunkData); extern uint64 ColumnarTableRowCount(Relation relation); -extern const char * CompressionTypeStr(CompressionType type); +extern PGDLLEXPORT const char * CompressionTypeStr(CompressionType type); /* columnar_metadata_tables.c */ -extern void InitColumnarOptions(Oid regclass); -extern void SetColumnarOptions(Oid regclass, ColumnarOptions *options); -extern bool DeleteColumnarTableOptions(Oid regclass, bool missingOk); -extern bool ReadColumnarOptions(Oid regclass, ColumnarOptions *options); -extern bool IsColumnarTableAmTable(Oid relationId); +extern PGDLLEXPORT void InitColumnarOptions(Oid regclass); +extern PGDLLEXPORT void SetColumnarOptions(Oid regclass, ColumnarOptions *options); +extern PGDLLEXPORT bool DeleteColumnarTableOptions(Oid regclass, bool missingOk); +extern PGDLLEXPORT bool ReadColumnarOptions(Oid regclass, ColumnarOptions *options); +extern PGDLLEXPORT bool IsColumnarTableAmTable(Oid relationId); /* columnar_metadata_tables.c */ extern void DeleteMetadataRows(RelFileLocator relFileLocator); diff --git a/src/include/distributed/shared_library_init.h b/src/include/distributed/shared_library_init.h index 63a7147af..3764b52fd 100644 --- a/src/include/distributed/shared_library_init.h +++ b/src/include/distributed/shared_library_init.h @@ -17,10 +17,10 @@ #define MAX_SHARD_COUNT 64000 #define MAX_SHARD_REPLICATION_FACTOR 100 -extern ColumnarSupportsIndexAM_type extern_ColumnarSupportsIndexAM; -extern CompressionTypeStr_type extern_CompressionTypeStr; -extern IsColumnarTableAmTable_type extern_IsColumnarTableAmTable; -extern ReadColumnarOptions_type extern_ReadColumnarOptions; +extern PGDLLEXPORT ColumnarSupportsIndexAM_type extern_ColumnarSupportsIndexAM; +extern PGDLLEXPORT CompressionTypeStr_type extern_CompressionTypeStr; +extern PGDLLEXPORT IsColumnarTableAmTable_type extern_IsColumnarTableAmTable; +extern PGDLLEXPORT ReadColumnarOptions_type extern_ReadColumnarOptions; extern void StartupCitusBackend(void); extern const char * GetClientMinMessageLevelNameForValue(int minMessageLevel);