Add TAPAS storage

Nikita Glukhov · Nikita Glukhov · commit eb5d44a3685d · 2021-03-29T20:40:14.000+03:00
diff --git a/src/backend/access/brin/brin_tuple.c b/src/backend/access/brin/brin_tuple.c
@@ -219,6 +219,7 @@ brin_form_tuple(BrinDesc *brdesc, BlockNumber blkno, BrinMemTuple *tuple,
 			if (!VARATT_IS_EXTENDED(DatumGetPointer(value)) &&
 				VARSIZE(DatumGetPointer(value)) > TOAST_INDEX_TARGET &&
 				(atttype->typstorage == TYPSTORAGE_EXTENDED ||
+				 atttype->typstorage == TYPSTORAGE_TAPAS ||
 				 atttype->typstorage == TYPSTORAGE_MAIN))
 			{
 				Datum	cvalue;
diff --git a/src/backend/access/common/indextuple.c b/src/backend/access/common/indextuple.c
@@ -101,6 +101,7 @@ index_form_tuple(TupleDesc tupleDescriptor,
 		if (!VARATT_IS_EXTENDED(DatumGetPointer(untoasted_values[i])) &&
 			VARSIZE(DatumGetPointer(untoasted_values[i])) > TOAST_INDEX_TARGET &&
 			(att->attstorage == TYPSTORAGE_EXTENDED ||
+			 att->attstorage == TYPSTORAGE_TAPAS ||
 			 att->attstorage == TYPSTORAGE_MAIN))
 		{
 			Datum	cvalue;
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
@@ -2099,6 +2099,8 @@ storage_name(char c)
 			return "EXTENDED";
 		case TYPSTORAGE_MAIN:
 			return "MAIN";
+		case TYPSTORAGE_TAPAS:
+			return "TAPAS";
 		default:
 			return "???";
 	}
@@ -7941,6 +7943,8 @@ ATExecSetStorage(Relation rel, const char *colName, Node *newValue, LOCKMODE loc
 		newstorage = TYPSTORAGE_EXTENDED;
 	else if (pg_strcasecmp(storagemode, "main") == 0)
 		newstorage = TYPSTORAGE_MAIN;
+	else if (pg_strcasecmp(storagemode, "tapas") == 0)
+		newstorage = TYPSTORAGE_TAPAS;
 	else
 	{
 		ereport(ERROR,
diff --git a/src/backend/commands/typecmds.c b/src/backend/commands/typecmds.c
@@ -447,6 +447,8 @@ DefineType(ParseState *pstate, List *names, List *parameters)
 			storage = TYPSTORAGE_EXTENDED;
 		else if (pg_strcasecmp(a, "main") == 0)
 			storage = TYPSTORAGE_MAIN;
+		else if (pg_strcasecmp(a, "tapas") == 0)
+			storage = TYPSTORAGE_TAPAS;
 		else
 			ereport(ERROR,
 					(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
@@ -4145,6 +4147,8 @@ AlterType(AlterTypeStmt *stmt)
 				atparams.storage = TYPSTORAGE_EXTENDED;
 			else if (pg_strcasecmp(a, "main") == 0)
 				atparams.storage = TYPSTORAGE_MAIN;
+			else if (pg_strcasecmp(a, "tapas") == 0)
+				atparams.storage = TYPSTORAGE_TAPAS;
 			else
 				ereport(ERROR,
 						(errcode(ERRCODE_INVALID_PARAMETER_VALUE),
diff --git a/src/bin/psql/describe.c b/src/bin/psql/describe.c
@@ -2107,7 +2107,8 @@ describeOneTableDetails(const char *schemaname,
 									  (storage[0] == 'm' ? "main" :
 									   (storage[0] == 'x' ? "extended" :
 										(storage[0] == 'e' ? "external" :
-										 "???")))),
+										 (storage[0] == 't' ? "tapas" :
+										 "???"))))),
 							  false, false);
 		}
 
diff --git a/src/include/catalog/pg_type.h b/src/include/catalog/pg_type.h
@@ -306,6 +306,7 @@ DECLARE_UNIQUE_INDEX(pg_type_typname_nsp_index, 2704, on pg_type using btree(typ
 #define  TYPSTORAGE_EXTERNAL	'e' /* toastable, don't try to compress */
 #define  TYPSTORAGE_EXTENDED	'x' /* fully toastable */
 #define  TYPSTORAGE_MAIN		'm' /* like 'x' but try to store inline */
+#define  TYPSTORAGE_TAPAS		't' /* store compressed chunks, first chunk inlined */
 
 /* Is a type OID a polymorphic pseudotype?	(Beware of multiple evaluation) */
 #define IsPolymorphicType(typid)  \
diff --git a/src/test/regress/expected/type_sanity.out b/src/test/regress/expected/type_sanity.out
@@ -20,7 +20,7 @@ WHERE p1.typnamespace = 0 OR
     (p1.typtype not in ('b', 'c', 'd', 'e', 'p', 'r', 'm')) OR
     NOT p1.typisdefined OR
     (p1.typalign not in ('c', 's', 'i', 'd')) OR
-    (p1.typstorage not in ('p', 'x', 'e', 'm'));
+    (p1.typstorage not in ('p', 'x', 'e', 'm', 't'));
  oid | typname 
 -----+---------
 (0 rows)
diff --git a/src/test/regress/sql/type_sanity.sql b/src/test/regress/sql/type_sanity.sql
@@ -23,7 +23,7 @@ WHERE p1.typnamespace = 0 OR
     (p1.typtype not in ('b', 'c', 'd', 'e', 'p', 'r', 'm')) OR
     NOT p1.typisdefined OR
     (p1.typalign not in ('c', 's', 'i', 'd')) OR
-    (p1.typstorage not in ('p', 'x', 'e', 'm'));
+    (p1.typstorage not in ('p', 'x', 'e', 'm', 't'));
 
 -- Look for "pass by value" types that can't be passed by value.
 

Original file line number	Diff line number	Diff line change
`@@ -219,6 +219,7 @@ brin_form_tuple(BrinDesc brdesc, BlockNumber blkno, BrinMemTuple tuple,`
`219`	`219`	`if (!VARATT_IS_EXTENDED(DatumGetPointer(value)) &&`
`220`	`220`	`VARSIZE(DatumGetPointer(value)) > TOAST_INDEX_TARGET &&`
`221`	`221`	`(atttype->typstorage == TYPSTORAGE_EXTENDED \|\|`
	`222`	`+ atttype->typstorage == TYPSTORAGE_TAPAS \|\|`
`222`	`223`	`atttype->typstorage == TYPSTORAGE_MAIN))`
`223`	`224`	`{`
`224`	`225`	`Datum cvalue;`
Original file line number	Diff line number	Diff line change
`@@ -101,6 +101,7 @@ index_form_tuple(TupleDesc tupleDescriptor,`
`101`	`101`	`if (!VARATT_IS_EXTENDED(DatumGetPointer(untoasted_values[i])) &&`
`102`	`102`	`VARSIZE(DatumGetPointer(untoasted_values[i])) > TOAST_INDEX_TARGET &&`
`103`	`103`	`(att->attstorage == TYPSTORAGE_EXTENDED \|\|`
	`104`	`+ att->attstorage == TYPSTORAGE_TAPAS \|\|`
`104`	`105`	`att->attstorage == TYPSTORAGE_MAIN))`
`105`	`106`	`{`
`106`	`107`	`Datum cvalue;`
Original file line number	Diff line number	Diff line change
`@@ -2107,7 +2107,8 @@ describeOneTableDetails(const char *schemaname,`
`2107`	`2107`	`(storage[0] == 'm' ? "main" :`
`2108`	`2108`	`(storage[0] == 'x' ? "extended" :`
`2109`	`2109`	`(storage[0] == 'e' ? "external" :`
`2110`		`- "???")))),`
	`2110`	`+ (storage[0] == 't' ? "tapas" :`
	`2111`	`+ "???"))))),`
`2111`	`2112`	`false, false);`
`2112`	`2113`	`}`
`2113`	`2114`