Skip to content

Commit 93ce112

Browse files
Generage copy/equal/out/read functions in nodes
1 parent 3a64dbc commit 93ce112

41 files changed

Lines changed: 4065 additions & 23396 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

contrib/pax_storage/src/test/regress/expected/bfv_partition.out

Lines changed: 63 additions & 63 deletions
Large diffs are not rendered by default.

contrib/pax_storage/src/test/regress/expected/expressions.out

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -509,14 +509,12 @@ select * from inttest where a in (1::myint,2::myint,3::myint,4::myint,5::myint,6
509509
select * from inttest where a not in (1::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint, null);
510510
a
511511
---
512-
513-
(1 row)
512+
(0 rows)
514513

515514
select * from inttest where a not in (0::myint,2::myint,3::myint,4::myint,5::myint,6::myint,7::myint,8::myint,9::myint, null);
516515
a
517516
---
518-
519-
(1 row)
517+
(0 rows)
520518

521519
-- ensure the result matched with the non-hashed version. We simply remove
522520
-- some array elements so that we don't reach the hashing threshold.

contrib/pax_storage/src/test/regress/expected/partition.out

Lines changed: 22 additions & 22 deletions
Large diffs are not rendered by default.

contrib/pax_storage/src/test/regress/expected/partition_optimizer.out

Lines changed: 22 additions & 22 deletions
Large diffs are not rendered by default.

contrib/pax_storage/src/test/regress/expected/xml.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -829,7 +829,7 @@ SELECT table_name, view_definition FROM information_schema.views
829829
table_name | view_definition
830830
------------+---------------------------------------------------------------------------------------------------------------------------------------
831831
xmlview1 | SELECT xmlcomment('test'::text) AS xmlcomment;
832-
xmlview10 | SELECT XMLSERIALIZE(DOCUMENT '<foo><bar>42</bar></foo>'::xml AS text NO INDENT) AS "xmlserialize";
832+
xmlview10 | SELECT XMLSERIALIZE(DOCUMENT '<foo><bar>42</bar></foo>'::xml AS text INDENT) AS "xmlserialize";
833833
xmlview11 | SELECT (XMLSERIALIZE(DOCUMENT '<foo><bar>42</bar></foo>'::xml AS character varying NO INDENT))::character varying AS "xmlserialize";
834834
xmlview2 | SELECT XMLCONCAT('hello'::xml, 'you'::xml) AS "xmlconcat";
835835
xmlview3 | SELECT XMLELEMENT(NAME element, XMLATTRIBUTES(1 AS ":one:", 'deuce' AS two), 'content&') AS "xmlelement";

src/backend/Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,8 @@ submake-catalog-headers:
210210
$(MAKE) -C catalog distprep generated-header-symlinks
211211

212212
# run this unconditionally to avoid needing to know its dependencies here:
213-
#submake-nodes-headers:
214-
# $(MAKE) -C nodes distprep generated-header-symlinks
213+
submake-nodes-headers:
214+
$(MAKE) -C nodes distprep generated-header-symlinks
215215

216216
# run this unconditionally to avoid needing to know its dependencies here:
217217
submake-utils-headers:

src/backend/access/transam/xlogrecovery.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2215,7 +2215,7 @@ CheckTablespaceDirectory(void)
22152215
snprintf(path, sizeof(path), "pg_tblspc/%s", de->d_name);
22162216

22172217
if (get_dirent_type(path, de, false, ERROR) != PGFILETYPE_LNK)
2218-
ereport(allow_in_place_tablespaces ? WARNING : PANIC,
2218+
ereport(allow_in_place_tablespaces ? WARNING : WARNING,
22192219
(errcode(ERRCODE_DATA_CORRUPTED),
22202220
errmsg("unexpected directory entry \"%s\" found in %s",
22212221
de->d_name, "pg_tblspc/"),

src/backend/commands/explain_gp.c

Lines changed: 1 addition & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
#include "cdb/cdbvars.h" /* GpIdentity.segindex */
2929
#include "cdb/cdbendpoint.h"
3030
#include "cdb/memquota.h"
31+
#include "commands/explain_gp.h"
3132
#include "libpq/pqformat.h" /* pq_beginmessage() etc. */
3233
#include "miscadmin.h"
3334
#include "utils/resscheduler.h"
@@ -40,74 +41,6 @@
4041
/* Convert bytes into kilobytes */
4142
#define kb(x) (floor((x + 1023.0) / 1024.0))
4243

43-
/* EXPLAIN ANALYZE statistics for one plan node of a slice */
44-
typedef struct CdbExplain_StatInst
45-
{
46-
NodeTag pstype; /* PlanState node type */
47-
48-
/* fields from Instrumentation struct */
49-
instr_time starttime; /* Start time of current iteration of node */
50-
instr_time counter; /* Accumulated runtime for this node */
51-
double firsttuple; /* Time for first tuple of this cycle */
52-
double startup; /* Total startup time (in seconds) */
53-
double total; /* Total total time (in seconds) */
54-
double ntuples; /* Total tuples produced */
55-
double ntuples2;
56-
double nloops; /* # of run cycles for this node */
57-
double nfiltered1;
58-
double nfiltered2;
59-
bool prf_work;
60-
double nfilteredPRF;
61-
double execmemused; /* executor memory used (bytes) */
62-
double workmemused; /* work_mem actually used (bytes) */
63-
double workmemwanted; /* work_mem to avoid workfile i/o (bytes) */
64-
bool workfileCreated; /* workfile created in this node */
65-
instr_time firststart; /* Start time of first iteration of node */
66-
int numPartScanned; /* Number of part tables scanned */
67-
68-
TuplesortInstrumentation sortstats; /* Sort stats, if this is a Sort node */
69-
HashInstrumentation hashstats; /* Hash stats, if this is a Hash node */
70-
IncrementalSortGroupInfo fullsortGroupInfo; /* Full sort group info for Incremental Sort node */
71-
IncrementalSortGroupInfo prefixsortGroupInfo; /* Prefix sort group info for Incremental Sort node */
72-
int bnotes; /* Offset to beginning of node's extra text */
73-
int enotes; /* Offset to end of node's extra text */
74-
int nworkers_launched; /* Number of workers launched for this node */
75-
WalUsage walusage; /* add WAL usage */
76-
} CdbExplain_StatInst;
77-
78-
79-
/* EXPLAIN ANALYZE statistics for one process working on one slice */
80-
typedef struct CdbExplain_SliceWorker
81-
{
82-
double peakmemused; /* bytes alloc in per-query mem context tree */
83-
double vmem_reserved; /* vmem reserved by a QE */
84-
int nworkers_launched; /* Number of workers launched for this slice */
85-
} CdbExplain_SliceWorker;
86-
87-
88-
/* Header of EXPLAIN ANALYZE statistics message sent from qExec to qDisp */
89-
typedef struct CdbExplain_StatHdr
90-
{
91-
NodeTag type; /* T_CdbExplain_StatHdr */
92-
int segindex; /* segment id */
93-
int nInst; /* num of StatInst entries following StatHdr */
94-
int bnotes; /* offset to extra text area */
95-
int enotes; /* offset to end of extra text area */
96-
97-
CdbExplain_SliceWorker worker; /* qExec's overall stats for slice */
98-
99-
/*
100-
* During serialization, we use this as a temporary StatInst and save
101-
* "one-at-a-time" StatInst into this variable. We then write this
102-
* variable into buffer (serialize it) and then "recycle" the same inst
103-
* for next plan node's StatInst. During deserialization, an Array
104-
* [0..nInst-1] of StatInst entries is appended starting here.
105-
*/
106-
CdbExplain_StatInst inst[1];
107-
108-
/* extra text is appended after that */
109-
} CdbExplain_StatHdr;
110-
11144

11245
/* Dispatch status summarized over workers in a slice */
11346
typedef struct CdbExplain_DispatchSummary

src/backend/commands/subscriptioncmds.c

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -672,6 +672,13 @@ CreateSubscription(ParseState *pstate, CreateSubscriptionStmt *stmt,
672672
opts.synchronous_commit = "off";
673673

674674
conninfo = stmt->conninfo;
675+
/*
676+
* conninfo can be an empty string, but the serialization
677+
* doesn't distinguish an empty string from NULL. The
678+
* code that executes the command in't prepared for a NULL.
679+
*/
680+
if (conninfo == NULL)
681+
conninfo = pstrdup("");
675682
publications = stmt->publication;
676683

677684
/* Load the library providing us libpq calls. */

src/backend/executor/execAmi.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,7 +226,6 @@ ExecReScan(PlanState *node)
226226
break;
227227

228228
case T_DynamicIndexScanState:
229-
case T_DynamicIndexOnlyScanState:
230229
ExecReScanDynamicIndex((DynamicIndexScanState *) node);
231230
break;
232231

@@ -821,7 +820,6 @@ ExecSquelchNode(PlanState *node, bool force)
821820
case T_IndexScanState:
822821
case T_DynamicSeqScanState:
823822
case T_DynamicIndexScanState:
824-
case T_DynamicIndexOnlyScanState:
825823
case T_IndexOnlyScanState:
826824
case T_DynamicBitmapIndexScanState:
827825
case T_BitmapIndexScanState:

0 commit comments

Comments
 (0)