From 226e2be3876d0bda3dc33d16dfa0bed246b7b74f Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Mon, 22 Mar 2021 09:21:37 -0400 Subject: [PATCH] More code cleanup for configurable TOAST compression. Remove unused macro. Fix confusion about whether a TOAST compression method is identified by an OID or a char. Justin Pryzby Discussion: http://postgr.es/m/20210321235544.GD4203@telsasoft.com --- src/backend/commands/tablecmds.c | 9 +++++---- src/include/access/toast_compression.h | 2 -- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 877c08814e..22f3c5efc0 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -7847,6 +7847,7 @@ SetIndexStorageProperties(Relation rel, Relation attrelation, index_close(indrel, lockmode); } } + /* * ALTER TABLE ALTER COLUMN SET STORAGE * @@ -15070,7 +15071,7 @@ ATExecSetCompression(AlteredTableInfo *tab, AttrNumber attnum; char *compression; char typstorage; - Oid cmoid; + char cmethod; ObjectAddress address; Assert(IsA(newValue, String)); @@ -15104,10 +15105,10 @@ ATExecSetCompression(AlteredTableInfo *tab, format_type_be(atttableform->atttypid)))); /* get the attribute compression method. */ - cmoid = GetAttributeCompression(atttableform, compression); + cmethod = GetAttributeCompression(atttableform, compression); /* update pg_attribute entry */ - atttableform->attcompression = cmoid; + atttableform->attcompression = cmethod; CatalogTupleUpdate(attrel, &tuple->t_self, tuple); InvokeObjectPostAlterHook(RelationRelationId, @@ -15118,7 +15119,7 @@ ATExecSetCompression(AlteredTableInfo *tab, * Apply the change to indexes as well (only for simple index columns, * matching behavior of index.c ConstructTupleDescriptor()). */ - SetIndexStorageProperties(rel, attrel, attnum, cmoid, '\0', lockmode); + SetIndexStorageProperties(rel, attrel, attnum, cmethod, '\0', lockmode); heap_freetuple(tuple); diff --git a/src/include/access/toast_compression.h b/src/include/access/toast_compression.h index 5c9220c171..44b73bd57c 100644 --- a/src/include/access/toast_compression.h +++ b/src/include/access/toast_compression.h @@ -50,8 +50,6 @@ typedef enum ToastCompressionId errdetail("This functionality requires the server to be built with lz4 support."), \ errhint("You need to rebuild PostgreSQL using --with-lz4."))) -#define IsValidCompression(cm) ((cm) != InvalidCompressionMethod) - #define IsStorageCompressible(storage) ((storage) != TYPSTORAGE_PLAIN && \ (storage) != TYPSTORAGE_EXTERNAL)