Enable jsonbc compression method for jsonb type

Nikita Glukhov · Nikita Glukhov · commit 8e650a2fbd38 · 2017-05-02T21:38:27.000+03:00
diff --git a/src/backend/access/common/tupdesc.c b/src/backend/access/common/tupdesc.c
@@ -785,7 +785,8 @@ TupleDescInitAttrCompression(TupleDesc desc,
 					: get_base_typnullcm(desc->attrs[attnum - 1]->atttypid);
 
 	ac->routineNull = OidIsValid(nullcmoid)
-						? GetCompressionMethodRoutineByCmId(nullcmoid)
+						? GetCompressionMethodRoutineByCmId(nullcmoid,
+											desc->attrs[attnum - 1]->atttypid)
 						: NULL;
 }
 
diff --git a/src/backend/catalog/heap.c b/src/backend/catalog/heap.c
@@ -1482,7 +1482,8 @@ DropAttributeCompression(HeapTuple tuple)
 {
 	Form_pg_attribute			att = (Form_pg_attribute) GETSTRUCT(tuple);
 	CompressionMethodRoutine   *cmr =
-						GetCompressionMethodRoutineByCmId(att->attcompression);
+						GetCompressionMethodRoutineByCmId(att->attcompression,
+														  att->atttypid);
 
 	if (cmr->dropAttr)
 	{
diff --git a/src/backend/commands/compressioncmds.c b/src/backend/commands/compressioncmds.c
@@ -243,12 +243,16 @@ get_compression_method_name(Oid cmOid)
  * which will be palloc'd in the caller's context.
  */
 CompressionMethodRoutine *
-GetCompressionMethodRoutine(Oid cmhandler)
+GetCompressionMethodRoutine(Oid cmhandler, Oid typeid)
 {
-	Datum		datum;
-	CompressionMethodRoutine *routine;
+	Datum						datum;
+	CompressionMethodRoutine   *routine;
+	CompressionMethodOpArgs		opargs;
 
-	datum = OidFunctionCall0(cmhandler);
+	opargs.op = CMOP_GET_ROUTINE;
+	opargs.args.getRoutine.typeid = typeid;
+
+	datum = OidFunctionCall1(cmhandler, PointerGetDatum(&opargs));
 	routine = (CompressionMethodRoutine *) DatumGetPointer(datum);
 
 	if (routine == NULL || !IsA(routine, CompressionMethodRoutine))
@@ -265,7 +269,7 @@ GetCompressionMethodRoutine(Oid cmhandler)
  * and get its CompressionMethodRoutine struct.
  */
 CompressionMethodRoutine *
-GetCompressionMethodRoutineByCmId(Oid cmoid)
+GetCompressionMethodRoutineByCmId(Oid cmoid, Oid typeid)
 {
 	HeapTuple			tuple;
 	Form_pg_compression	cmform;
@@ -291,5 +295,5 @@ GetCompressionMethodRoutineByCmId(Oid cmoid)
 	ReleaseSysCache(tuple);
 
 	/* And finally, call the handler function to get the API struct. */
-	return GetCompressionMethodRoutine(cmhandler);
+	return GetCompressionMethodRoutine(cmhandler, typeid);
 }
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
@@ -5239,7 +5239,8 @@ GetAttributeCompression(ColumnCompression *compression,
 		*optionsList = NIL;
 	}
 
-	*cmr = OidIsValid(*cmid) ? GetCompressionMethodRoutineByCmId(*cmid) : NULL;
+	*cmr = OidIsValid(*cmid) ?
+			GetCompressionMethodRoutineByCmId(*cmid, att->atttypid) : NULL;
 
 	if (*cmr && (*cmr)->options && (*cmr)->options->validate)
 		*optionsList = (*cmr)->options->validate(att, *optionsList);
@@ -12554,7 +12555,8 @@ ATExecAlterColumnCompression(AlteredTableInfo *tab, Relation rel,
 		if (OidIsValid(oldCm))
 		{
 			CompressionMethodRoutine *oldCmr =
-					GetCompressionMethodRoutineByCmId(oldCm);
+					GetCompressionMethodRoutineByCmId(oldCm,
+													  atttableform->atttypid);
 
 			if (oldCmr->dropAttr)
 			{
diff --git a/src/backend/utils/cache/relcache.c b/src/backend/utils/cache/relcache.c
@@ -575,7 +575,8 @@ RelationBuildTupleDesc(Relation relation)
 			List		   *optionsList;
 			CompressionMethodRoutine *cmr;
 
-			cmr = GetCompressionMethodRoutineByCmId(attp->attcompression);
+			cmr = GetCompressionMethodRoutineByCmId(attp->attcompression,
+													attp->atttypid);
 			optionsDatum = get_attcmoptions(RelationGetRelid(relation),
 											attp->attnum);
 			optionsList = untransformRelOptions(optionsDatum);
diff --git a/src/include/access/compression.h b/src/include/access/compression.h
@@ -50,7 +50,23 @@ typedef struct CompressionMethodRoutine
 	DecompressionRoutine	decompress;
 } CompressionMethodRoutine;
 
-extern CompressionMethodRoutine *GetCompressionMethodRoutine(Oid cmhandler);
-extern CompressionMethodRoutine *GetCompressionMethodRoutineByCmId(Oid cmoid);
+typedef enum { CMOP_GET_ROUTINE } CompressionMethodOp;
+
+typedef struct CompressionMethodOpArgs
+{
+	CompressionMethodOp op;
+	union
+	{
+		struct
+		{
+			Oid	typeid;
+		} getRoutine;
+	} args;
+} CompressionMethodOpArgs;
+
+extern CompressionMethodRoutine *GetCompressionMethodRoutine(Oid cmhandler,
+															 Oid typeid);
+extern CompressionMethodRoutine *GetCompressionMethodRoutineByCmId(Oid cmoid,
+																   Oid typeid);
 
 #endif /* COMPRESSION_H */

Original file line number	Diff line number	Diff line change
`@@ -785,7 +785,8 @@ TupleDescInitAttrCompression(TupleDesc desc,`
`785`	`785`	`: get_base_typnullcm(desc->attrs[attnum - 1]->atttypid);`
`786`	`786`
`787`	`787`	`ac->routineNull = OidIsValid(nullcmoid)`
`788`		`- ? GetCompressionMethodRoutineByCmId(nullcmoid)`
	`788`	`+ ? GetCompressionMethodRoutineByCmId(nullcmoid,`
	`789`	`+ desc->attrs[attnum - 1]->atttypid)`
`789`	`790`	`: NULL;`
`790`	`791`	`}`
`791`	`792`
Original file line number	Diff line number	Diff line change
`@@ -1482,7 +1482,8 @@ DropAttributeCompression(HeapTuple tuple)`
`1482`	`1482`	`{`
`1483`	`1483`	`Form_pg_attribute att = (Form_pg_attribute) GETSTRUCT(tuple);`
`1484`	`1484`	`CompressionMethodRoutine *cmr =`
`1485`		`- GetCompressionMethodRoutineByCmId(att->attcompression);`
	`1485`	`+ GetCompressionMethodRoutineByCmId(att->attcompression,`
	`1486`	`+ att->atttypid);`
`1486`	`1487`
`1487`	`1488`	`if (cmr->dropAttr)`
`1488`	`1489`	`{`
Original file line number	Diff line number	Diff line change
`@@ -5239,7 +5239,8 @@ GetAttributeCompression(ColumnCompression *compression,`
`5239`	`5239`	`*optionsList = NIL;`
`5240`	`5240`	`}`
`5241`	`5241`
`5242`		`- cmr = OidIsValid(cmid) ? GetCompressionMethodRoutineByCmId(*cmid) : NULL;`
	`5242`	`+ cmr = OidIsValid(cmid) ?`
	`5243`	`+ GetCompressionMethodRoutineByCmId(*cmid, att->atttypid) : NULL;`
`5243`	`5244`
`5244`	`5245`	`if (cmr && (cmr)->options && (*cmr)->options->validate)`
`5245`	`5246`	`optionsList = (cmr)->options->validate(att, *optionsList);`
`@@ -12554,7 +12555,8 @@ ATExecAlterColumnCompression(AlteredTableInfo *tab, Relation rel,`
`12554`	`12555`	`if (OidIsValid(oldCm))`
`12555`	`12556`	`{`
`12556`	`12557`	`CompressionMethodRoutine *oldCmr =`
`12557`		`- GetCompressionMethodRoutineByCmId(oldCm);`
	`12558`	`+ GetCompressionMethodRoutineByCmId(oldCm,`
	`12559`	`+ atttableform->atttypid);`
`12558`	`12560`
`12559`	`12561`	`if (oldCmr->dropAttr)`
`12560`	`12562`	`{`