fix output/read plans in _outAggref(), _readAggref() and _readAgg()

PostgreSQL 9.6 added new fields to Aggref for to partial aggregation,
and the functions were not reading them correctly.

diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 21f47c0d84072b4c01fbf55a94e8d255d690cdbe..4769f17a8f5462e5ebbf2d8fd989f164e6309d9e 100644 (file)
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -1775,6 +1775,11 @@ _outAggref(StringInfo str, const Aggref *node)
        else
 #endif
        WRITE_OID_FIELD(inputcollid);
+#ifdef XCP
+       if (portable_output)
+               WRITE_TYPID_FIELD(aggtranstype);
+       else
+#endif
        WRITE_OID_FIELD(aggtranstype);
        WRITE_NODE_FIELD(aggargtypes);
        WRITE_NODE_FIELD(aggdirectargs);

diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index 9141d9cade4081baae6852a6ec3ad752cb571bb9..6950338edb172a5be98717a1c8d30ec46b9a66bc 100644 (file)
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -904,6 +904,11 @@ _readAggref(void)
        else
 #endif
        READ_OID_FIELD(inputcollid);
+#ifdef XCP
+       if (portable_input)
+               READ_TYPID_FIELD(aggtranstype);
+       else
+#endif
        READ_OID_FIELD(aggtranstype);
        READ_NODE_FIELD(aggargtypes);
        READ_NODE_FIELD(aggdirectargs);
@@ -2781,6 +2786,7 @@ _readGroup(void)
 static Agg *
 _readAgg(void)
 {
+       int i;
        READ_LOCALS(Agg);
 
        ReadCommonPlan(&local_node->plan);
@@ -2789,7 +2795,57 @@ _readAgg(void)
        READ_ENUM_FIELD(aggsplit, AggSplit);
        READ_INT_FIELD(numCols);
        READ_ATTRNUMBER_ARRAY(grpColIdx, local_node->numCols);
+
+#ifdef PGXC
+       token = pg_strtok(&length);             /* skip :grpOperators */
+       local_node->grpOperators = (Oid *) palloc(local_node->numCols * sizeof(Oid));
+       for (i = 0; i < local_node->numCols; i++)
+       {
+               token = pg_strtok(&length);
+               if (portable_input)
+               {
+                       char       *nspname; /* namespace name */
+                       char       *oprname; /* operator name */
+                       char       *leftnspname; /* left type namespace */
+                       char       *leftname; /* left type name */
+                       Oid                     oprleft; /* left type */
+                       char       *rightnspname; /* right type namespace */
+                       char       *rightname; /* right type name */
+                       Oid                     oprright; /* right type */
+                       /* token is already set to nspname */
+                       nspname = nullable_string(token, length);
+                       token = pg_strtok(&length); /* get operator name */
+                       oprname = nullable_string(token, length);
+                       token = pg_strtok(&length); /* left type namespace */
+                       leftnspname = nullable_string(token, length);
+                       token = pg_strtok(&length); /* left type name */
+                       leftname = nullable_string(token, length);
+                       token = pg_strtok(&length); /* right type namespace */
+                       rightnspname = nullable_string(token, length);
+                       token = pg_strtok(&length); /* right type name */
+                       rightname = nullable_string(token, length);
+                       if (leftname)
+                               oprleft = get_typname_typid(leftname,
+                                                                                       NSP_OID(leftnspname));
+                       else
+                               oprleft = InvalidOid;
+                       if (rightname)
+                               oprright = get_typname_typid(rightname,
+                                                                                        NSP_OID(rightnspname));
+                       else
+                               oprright = InvalidOid;
+                       local_node->grpOperators[i] = get_operid(oprname,
+                                                                                                        oprleft,
+                                                                                                        oprright,
+                                                                                                        NSP_OID(nspname));
+               }
+               else
+                       local_node->grpOperators[i] = atooid(token);
+       }
+#else
        READ_OID_ARRAY(grpOperators, local_node->numCols);
+#endif
+
        READ_LONG_FIELD(numGroups);
        READ_NODE_FIELD(groupingSets);
        READ_NODE_FIELD(chain);