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[email protected]

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 877c08814e0772b80f44cbceda833e8c756dbd8f..22f3c5efc09957d57d92a4136b6f55cd74c92740 100644 (file)
--- 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 5c9220c171024433d3c550894ec1b453e10b61d5..44b73bd57c2913dcab3ccd1abdbb268cc6abbe26 100644 (file)
--- 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)