From aa3032cfdd90c1edab6393c234174828a8238007 Mon Sep 17 00:00:00 2001
From: Hadi Moshayedi <hadi@moshayedi.net>
Date: Mon, 5 Oct 2020 10:30:02 -0700
Subject: [PATCH] Address feedback

---
 cstore_tableam.c       | 38 ++++++++++----------------------------
 expected/am_vacuum.out |  6 +++---
 sql/am_vacuum.sql      |  6 +++---
 3 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/cstore_tableam.c b/cstore_tableam.c
index 337dbe06f..39a0695e2 100644
--- a/cstore_tableam.c
+++ b/cstore_tableam.c
@@ -143,8 +143,8 @@ RelationColumnList(Relation rel)
 		Index varno = 0;
 		AttrNumber varattno = i + 1;
 		Oid vartype = tupdesc->attrs[i].atttypid;
-		int32 vartypmod = 0;
-		Oid varcollid = 0;
+		int32 vartypmod = tupdesc->attrs[i].atttypmod;
+		Oid varcollid = tupdesc->attrs[i].attcollation;
 		Index varlevelsup = 0;
 		Var *var;
 
@@ -530,16 +530,14 @@ cstore_relation_copy_for_cluster(Relation OldHeap, Relation NewHeap,
 	TableWriteState *writeState = NULL;
 	TableReadState *readState = NULL;
 	CStoreOptions *cstoreOptions = NULL;
-	Datum *sourceValues = NULL;
-	bool *sourceNulls = NULL;
-	Datum *targetValues = NULL;
-	bool *targetNulls = NULL;
+	Datum *values = NULL;
+	bool *nulls = NULL;
 	TupleDesc sourceDesc = RelationGetDescr(OldHeap);
 	TupleDesc targetDesc = RelationGetDescr(NewHeap);
 
 	if (OldIndex != NULL || use_sort)
 	{
-		ereport(ERROR, (errmsg("cstore_am doesn't support indexes")));
+		ereport(ERROR, (errmsg(CSTORE_TABLEAM_NAME " doesn't support indexes")));
 	}
 
 	/*
@@ -559,34 +557,18 @@ cstore_relation_copy_for_cluster(Relation OldHeap, Relation NewHeap,
 
 	readState = CStoreBeginRead(OldHeap, sourceDesc, RelationColumnList(OldHeap), NULL);
 
-	sourceValues = palloc0(sourceDesc->natts * sizeof(Datum));
-	sourceNulls = palloc0(sourceDesc->natts * sizeof(bool));
-
-	targetValues = palloc0(targetDesc->natts * sizeof(Datum));
-	targetNulls = palloc0(targetDesc->natts * sizeof(bool));
+	values = palloc0(sourceDesc->natts * sizeof(Datum));
+	nulls = palloc0(sourceDesc->natts * sizeof(bool));
 
 	*num_tuples = 0;
 
-	while (CStoreReadNextRow(readState, sourceValues, sourceNulls))
+	while (CStoreReadNextRow(readState, values, nulls))
 	{
-		memset(targetNulls, true, targetDesc->natts * sizeof(bool));
-
-		for (int attrIndex = 0; attrIndex < sourceDesc->natts; attrIndex++)
-		{
-			FormData_pg_attribute *sourceAttr = TupleDescAttr(sourceDesc, attrIndex);
-
-			if (!sourceAttr->attisdropped)
-			{
-				targetNulls[attrIndex] = sourceNulls[attrIndex];
-				targetValues[attrIndex] = sourceValues[attrIndex];
-			}
-		}
-
-		CStoreWriteRow(writeState, targetValues, targetNulls);
+		CStoreWriteRow(writeState, values, nulls);
 		(*num_tuples)++;
 	}
 
-	*tups_vacuumed = *num_tuples;
+	*tups_vacuumed = 0;
 
 	CStoreEndWrite(writeState);
 	CStoreEndRead(readState);
diff --git a/expected/am_vacuum.out b/expected/am_vacuum.out
index 3abb3c668..dbeddca2b 100644
--- a/expected/am_vacuum.out
+++ b/expected/am_vacuum.out
@@ -1,4 +1,4 @@
-SELECT count(*) AS columnar_table_count FROM cstore.cstore_tables \gset
+SELECT count(*) AS columnar_table_count FROM cstore.cstore_data_files \gset
 CREATE TABLE t(a int, b int) USING cstore_tableam;
 SELECT count(*) FROM cstore.cstore_stripes a, pg_class b WHERE a.relfilenode=b.relfilenode AND b.relname='t';
  count 
@@ -89,7 +89,7 @@ SELECT stripe, attr, block, minimum_value IS NULL, maximum_value IS NULL FROM cs
 (6 rows)
 
 -- Make sure we cleaned-up the transient table metadata after VACUUM FULL commands
-SELECT count(*) - :columnar_table_count FROM cstore.cstore_tables;
+SELECT count(*) - :columnar_table_count FROM cstore.cstore_data_files;
  ?column? 
 ----------
         1
@@ -97,7 +97,7 @@ SELECT count(*) - :columnar_table_count FROM cstore.cstore_tables;
 
 DROP TABLE t;
 -- Make sure we cleaned the metadata for t too
-SELECT count(*) - :columnar_table_count FROM cstore.cstore_tables;
+SELECT count(*) - :columnar_table_count FROM cstore.cstore_data_files;
  ?column? 
 ----------
         0
diff --git a/sql/am_vacuum.sql b/sql/am_vacuum.sql
index 6a5e0687e..8cb70167d 100644
--- a/sql/am_vacuum.sql
+++ b/sql/am_vacuum.sql
@@ -1,4 +1,4 @@
-SELECT count(*) AS columnar_table_count FROM cstore.cstore_tables \gset
+SELECT count(*) AS columnar_table_count FROM cstore.cstore_data_files \gset
 
 CREATE TABLE t(a int, b int) USING cstore_tableam;
 
@@ -39,9 +39,9 @@ VACUUM FULL t;
 SELECT stripe, attr, block, minimum_value IS NULL, maximum_value IS NULL FROM cstore.cstore_skipnodes a, pg_class b WHERE a.relfilenode=b.relfilenode AND b.relname='t' ORDER BY 1, 2, 3;
 
 -- Make sure we cleaned-up the transient table metadata after VACUUM FULL commands
-SELECT count(*) - :columnar_table_count FROM cstore.cstore_tables;
+SELECT count(*) - :columnar_table_count FROM cstore.cstore_data_files;
 
 DROP TABLE t;
 
 -- Make sure we cleaned the metadata for t too
-SELECT count(*) - :columnar_table_count FROM cstore.cstore_tables;
+SELECT count(*) - :columnar_table_count FROM cstore.cstore_data_files;