misc fixes for columnar

pg16_kickoff
onderkalaci 2023-05-05 15:33:21 +03:00
parent a2c8dc65ce
commit 634da77253
6 changed files with 19 additions and 19 deletions

View File

@ -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;

View File

@ -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;
}

View File

@ -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);
}
}

View File

@ -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;
/*

View File

@ -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);

View File

@ -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);