external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Support GENERATE ALWAYS AS STORED

pull/2879/head
Philip Dubé 2019-08-09 22:38:03 +00:00
parent 936d546a3c
commit 41dca121e2
3 changed files with 40 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/backend/distributed/commands/create_distributed_table.c
View File

@ -1368,7 +1368,11 @@ TupleDescColumnNameList(TupleDesc tupleDescriptor)
Form_pg_attribute currentColumn = TupleDescAttr(tupleDescriptor, columnIndex); Form_pg_attribute currentColumn = TupleDescAttr(tupleDescriptor, columnIndex);
char *columnName = NameStr(currentColumn->attname); char *columnName = NameStr(currentColumn->attname);
if (currentColumn->attisdropped) if (currentColumn->attisdropped
#if PG_VERSION_NUM >= 120000
|| currentColumn->attgenerated == ATTRIBUTE_GENERATED_STORED
#endif
)
{ {
continue; continue;
} }

27
src/backend/distributed/commands/multi_copy.c
View File

@ -64,6 +64,7 @@
#include "access/sysattr.h" #include "access/sysattr.h"
#include "access/xact.h" #include "access/xact.h"
#include "catalog/namespace.h" #include "catalog/namespace.h"
#include "catalog/pg_attribute.h"
#include "catalog/pg_type.h" #include "catalog/pg_type.h"
#include "commands/copy.h" #include "commands/copy.h"
#include "commands/defrem.h" #include "commands/defrem.h"
@ -481,7 +482,11 @@ CopyToExistingShards(CopyStmt *copyStatement, char *completionTag)
Form_pg_attribute currentColumn = TupleDescAttr(tupleDescriptor, columnIndex); Form_pg_attribute currentColumn = TupleDescAttr(tupleDescriptor, columnIndex);
char *columnName = NameStr(currentColumn->attname); char *columnName = NameStr(currentColumn->attname);
if (currentColumn->attisdropped) if (currentColumn->attisdropped
#if PG_VERSION_NUM >= 120000
|| currentColumn->attgenerated == ATTRIBUTE_GENERATED_STORED
#endif
)
{ {
continue; continue;
} }
@ -510,7 +515,7 @@ CopyToExistingShards(CopyStmt *copyStatement, char *completionTag)
* of BeginCopyFrom. However, we obviously should not do this in relcache * of BeginCopyFrom. However, we obviously should not do this in relcache
* and therefore make a copy of the Relation. * and therefore make a copy of the Relation.
*/ */
copiedDistributedRelation = (Relation) palloc0(sizeof(RelationData)); copiedDistributedRelation = (Relation) palloc(sizeof(RelationData));
copiedDistributedRelationTuple = (Form_pg_class) palloc(CLASS_TUPLE_SIZE); copiedDistributedRelationTuple = (Form_pg_class) palloc(CLASS_TUPLE_SIZE);
/* /*
@ -1028,7 +1033,11 @@ CanUseBinaryCopyFormat(TupleDesc tupleDescription)
Form_pg_attribute currentColumn = TupleDescAttr(tupleDescription, columnIndex); Form_pg_attribute currentColumn = TupleDescAttr(tupleDescription, columnIndex);
Oid typeId = InvalidOid; Oid typeId = InvalidOid;
if (currentColumn->attisdropped) if (currentColumn->attisdropped
#if PG_VERSION_NUM >= 120000
|| currentColumn->attgenerated == ATTRIBUTE_GENERATED_STORED
#endif
)
{ {
continue; continue;
} }
@ -1667,7 +1676,11 @@ AppendCopyRowData(Datum *valueArray, bool *isNullArray, TupleDesc rowDescriptor,
value = CoerceColumnValue(value, &columnCoercionPaths[columnIndex]); value = CoerceColumnValue(value, &columnCoercionPaths[columnIndex]);
} }
if (currentColumn->attisdropped) if (currentColumn->attisdropped
#if PG_VERSION_NUM >= 120000
|| currentColumn->attgenerated == ATTRIBUTE_GENERATED_STORED
#endif
)
{ {
continue; continue;
} }
@ -1787,7 +1800,11 @@ AvailableColumnCount(TupleDesc tupleDescriptor)
{ {
Form_pg_attribute currentColumn = TupleDescAttr(tupleDescriptor, columnIndex); Form_pg_attribute currentColumn = TupleDescAttr(tupleDescriptor, columnIndex);
if (!currentColumn->attisdropped) if (!currentColumn->attisdropped
#if PG_VERSION_NUM >= 120000
&& currentColumn->attgenerated != ATTRIBUTE_GENERATED_STORED
#endif
)
{ {
columnCount++; columnCount++;
} }

14
src/backend/distributed/utils/citus_ruleutils.c
View File

@ -312,7 +312,7 @@ pg_get_tableschemadef_string(Oid tableRelationId, bool includeSequenceDefaults)
* reasoning behind this is that Citus implements declarative partitioning * reasoning behind this is that Citus implements declarative partitioning
* by creating the partitions first and then sending * by creating the partitions first and then sending
* "ALTER TABLE parent_table ATTACH PARTITION .." command. This may not play * "ALTER TABLE parent_table ATTACH PARTITION .." command. This may not play
* well with regular inhereted tables, which isn't a big concern from Citus' * well with regular inherited tables, which isn't a big concern from Citus'
* perspective. * perspective.
*/ */
if (!attributeForm->attisdropped) if (!attributeForm->attisdropped)
@ -371,7 +371,19 @@ pg_get_tableschemadef_string(Oid tableRelationId, bool includeSequenceDefaults)
defaultString = deparse_expression(defaultNode, defaultContext, defaultString = deparse_expression(defaultNode, defaultContext,
false, false); false, false);
#if PG_VERSION_NUM >= 120000
if (attributeForm->attgenerated == ATTRIBUTE_GENERATED_STORED)
{
appendStringInfo(&buffer, " GENERATED ALWAYS AS (%s) STORED",
defaultString);
}
else
{
appendStringInfo(&buffer, " DEFAULT %s", defaultString);
}
#else
appendStringInfo(&buffer, " DEFAULT %s", defaultString); appendStringInfo(&buffer, " DEFAULT %s", defaultString);
#endif
} }
} }