Add heap_form_tuple_compress()

Nikita Glukhov · Nikita Glukhov · commit a3d99034dfaf · 2017-05-02T21:38:24.000+03:00
diff --git a/src/backend/access/common/heaptuple.c b/src/backend/access/common/heaptuple.c
@@ -717,9 +717,10 @@ tuple_decompress_attr(TupleDesc tupdesc, int attnum, Datum value)
  * The result is allocated in the current memory context.
  */
 HeapTuple
-heap_form_tuple(TupleDesc tupleDescriptor,
-				Datum *values,
-				bool *isnull)
+heap_form_tuple_compress(TupleDesc tupleDescriptor,
+						 Datum *values,
+						 bool *isnull,
+						 bool *compress)
 {
 	HeapTuple	tuple;			/* return tuple */
 	HeapTupleHeader td;			/* tuple data */
@@ -749,7 +750,8 @@ heap_form_tuple(TupleDesc tupleDescriptor,
 			if (!tupleDescriptor->tdcompression)
 				break;
 		}
-		else if ((OidIsValid(tupleDescriptor->attrs[i]->attcompression) ||
+		else if (compress ? compress[i] :
+				 (OidIsValid(tupleDescriptor->attrs[i]->attcompression) ||
 				  (tupleDescriptor->attrs[i]->attlen == -1 &&
 				   OidIsValid(tupleDescriptor->attrs[i]->attrelid) &&
 				   tupleDescriptor->tdcompression &&
diff --git a/src/include/access/htup_details.h b/src/include/access/htup_details.h
@@ -798,8 +798,10 @@ extern Datum heap_getsysattr(HeapTuple tup, int attnum, TupleDesc tupleDesc,
 extern HeapTuple heap_copytuple(HeapTuple tuple);
 extern void heap_copytuple_with_tuple(HeapTuple src, HeapTuple dest);
 extern Datum heap_copy_tuple_as_datum(HeapTuple tuple, TupleDesc tupleDesc);
-extern HeapTuple heap_form_tuple(TupleDesc tupleDescriptor,
-				Datum *values, bool *isnull);
+extern HeapTuple heap_form_tuple_compress(TupleDesc tupleDescriptor,
+				Datum *values, bool *isnull, bool *compress);
+#define heap_form_tuple(tupdesc, values, isnull) \
+		heap_form_tuple_compress(tupdesc, values, isnull, NULL)
 extern HeapTuple heap_modify_tuple(HeapTuple tuple,
 				  TupleDesc tupleDesc,
 				  Datum *replValues,
