This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new 9c1e9a806d8 Fix some answer files
9c1e9a806d8 is described below
commit 9c1e9a806d8e4aa859f544562b4782ce156f3aba
Author: Jinbao Chen <[email protected]>
AuthorDate: Sun Jan 4 23:58:18 2026 +0800
Fix some answer files
---
GNUmakefile.in | 4 +-
src/test/regress/expected/bb_mpph.out | 71 +++++++++++++++------------
src/test/regress/sql/bb_mpph.sql | 72 ++++++++++++++++------------
src/test/regress/sql/part_external_table.sql | 17 ++++---
4 files changed, 96 insertions(+), 68 deletions(-)
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 4e08ad6ee67..672487ff773 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -13,7 +13,7 @@ $(call recurse,all install,src config)
all:
# $(MAKE) -C contrib/auto_explain all
$(MAKE) -C contrib/citext all
-# $(MAKE) -C contrib/file_fdw all
+ $(MAKE) -C contrib/file_fdw all
$(MAKE) -C contrib/formatter all
# $(MAKE) -C contrib/formatter_fixedwidth all
# $(MAKE) -C contrib/fuzzystrmatch all
@@ -60,7 +60,7 @@ html man:
install:
# $(MAKE) -C contrib/auto_explain $@
$(MAKE) -C contrib/citext $@
-# $(MAKE) -C contrib/file_fdw $@
+ $(MAKE) -C contrib/file_fdw $@
$(MAKE) -C contrib/formatter $@
# $(MAKE) -C contrib/formatter_fixedwidth $@
# $(MAKE) -C contrib/fuzzystrmatch $@
diff --git a/src/test/regress/expected/bb_mpph.out
b/src/test/regress/expected/bb_mpph.out
index e9722666563..1cafa5dada5 100644
--- a/src/test/regress/expected/bb_mpph.out
+++ b/src/test/regress/expected/bb_mpph.out
@@ -83,16 +83,27 @@ CREATE TABLE heap_supplier (
s_comment character varying(101) NOT NULL
)
WITH (appendonly=false) DISTRIBUTED BY (s_suppkey);
-\copy heap_customer
(C_CUSTKEY,C_NAME,C_ADDRESS,C_NATIONKEY,C_PHONE,C_ACCTBAL,C_MKTSEGMENT,C_COMMENT)
from '@abs_srcdir@/data/customer.csv' with delimiter '|';
-\copy heap_lineitem ( L_ORDERKEY, L_PARTKEY,
L_SUPPKEY,L_LINENUMBER,L_QUANTITY,
L_EXTENDEDPRICE,L_DISCOUNT,L_TAX,L_RETURNFLAG,L_LINESTATUS,L_SHIPDATE,L_COMMITDATE,L_RECEIPTDATE,L_SHIPINSTRUCT,L_SHIPMODE,L_COMMENT)
from '@abs_srcdir@/data/lineitem_small.csv' with delimiter '|';
-\copy heap_lineitem ( L_ORDERKEY, L_PARTKEY,
L_SUPPKEY,L_LINENUMBER,L_QUANTITY,
L_EXTENDEDPRICE,L_DISCOUNT,L_TAX,L_RETURNFLAG,L_LINESTATUS,L_SHIPDATE,L_COMMITDATE,L_RECEIPTDATE,L_SHIPINSTRUCT,L_SHIPMODE,L_COMMENT)
from '@abs_srcdir@/data/lineitem.csv' with delimiter '|';
-\copy heap_nation (N_NATIONKEY ,N_NAME, N_REGIONKEY,N_COMMENT) from
'@abs_srcdir@/data/nation.csv' with delimiter '|';
-\copy heap_orders (
O_ORDERKEY,O_CUSTKEY,O_ORDERSTATUS,O_TOTALPRICE,O_ORDERDATE,O_ORDERPRIORITY,O_CLERK,O_SHIPPRIORITY,O_COMMENT)
from '@abs_srcdir@/data/order_small.csv' with delimiter '|';
-\copy heap_orders (
O_ORDERKEY,O_CUSTKEY,O_ORDERSTATUS,O_TOTALPRICE,O_ORDERDATE,O_ORDERPRIORITY,O_CLERK,O_SHIPPRIORITY,O_COMMENT)
from '@abs_srcdir@/data/order.csv' with delimiter '|';
-\copy heap_part
(P_PARTKEY,P_NAME,P_MFGR,P_BRAND,P_TYPE,P_SIZE,P_CONTAINER,P_RETAILPRICE,P_COMMENT)from
'@abs_srcdir@/data/part.csv' with delimiter '|';
-\copy heap_partsupp
(PS_PARTKEY,PS_SUPPKEY,PS_AVAILQTY,PS_SUPPLYCOST,PS_COMMENT ) from
'@abs_srcdir@/data/partsupp.csv' with delimiter '|';
-\copy heap_region ( R_REGIONKEY,R_NAME,R_COMMENT) from
'@abs_srcdir@/data/region.csv' with delimiter '|';
-\copy heap_supplier
(S_SUPPKEY,S_NAME,S_ADDRESS,S_NATIONKEY,S_PHONE,S_ACCTBAL,S_COMMENT) from
'@abs_srcdir@/data/supplier.csv' with delimiter '|';
+\getenv abs_srcdir PG_ABS_SRCDIR
+\set customer_file :abs_srcdir '/data/customer.csv'
+\set lineitem_small_file :abs_srcdir '/data/lineitem_small.csv'
+\set lineitem_file :abs_srcdir '/data/lineitem.csv'
+\set nation_file :abs_srcdir '/data/nation.csv'
+\set order_small_file :abs_srcdir '/data/order_small.csv'
+\set order_file :abs_srcdir '/data/order.csv'
+\set part_file :abs_srcdir '/data/part.csv'
+\set partsupp_file :abs_srcdir '/data/partsupp.csv'
+\set region_file :abs_srcdir '/data/region.csv'
+\set supplier_file :abs_srcdir '/data/supplier.csv'
+copy heap_customer
(C_CUSTKEY,C_NAME,C_ADDRESS,C_NATIONKEY,C_PHONE,C_ACCTBAL,C_MKTSEGMENT,C_COMMENT)
from :'customer_file' with delimiter '|';
+copy heap_lineitem ( L_ORDERKEY, L_PARTKEY, L_SUPPKEY,L_LINENUMBER,L_QUANTITY,
L_EXTENDEDPRICE,L_DISCOUNT,L_TAX,L_RETURNFLAG,L_LINESTATUS,L_SHIPDATE,L_COMMITDATE,L_RECEIPTDATE,L_SHIPINSTRUCT,L_SHIPMODE,L_COMMENT)
from :'lineitem_small_file' with delimiter '|';
+copy heap_lineitem ( L_ORDERKEY, L_PARTKEY, L_SUPPKEY,L_LINENUMBER,L_QUANTITY,
L_EXTENDEDPRICE,L_DISCOUNT,L_TAX,L_RETURNFLAG,L_LINESTATUS,L_SHIPDATE,L_COMMITDATE,L_RECEIPTDATE,L_SHIPINSTRUCT,L_SHIPMODE,L_COMMENT)
from :'lineitem_file' with delimiter '|';
+copy heap_nation (N_NATIONKEY ,N_NAME, N_REGIONKEY,N_COMMENT) from
:'nation_file' with delimiter '|';
+copy heap_orders (
O_ORDERKEY,O_CUSTKEY,O_ORDERSTATUS,O_TOTALPRICE,O_ORDERDATE,O_ORDERPRIORITY,O_CLERK,O_SHIPPRIORITY,O_COMMENT)
from :'order_small_file' with delimiter '|';
+copy heap_orders (
O_ORDERKEY,O_CUSTKEY,O_ORDERSTATUS,O_TOTALPRICE,O_ORDERDATE,O_ORDERPRIORITY,O_CLERK,O_SHIPPRIORITY,O_COMMENT)
from :'order_file' with delimiter '|';
+copy heap_part
(P_PARTKEY,P_NAME,P_MFGR,P_BRAND,P_TYPE,P_SIZE,P_CONTAINER,P_RETAILPRICE,P_COMMENT)from
:'part_file' with delimiter '|';
+copy heap_partsupp (PS_PARTKEY,PS_SUPPKEY,PS_AVAILQTY,PS_SUPPLYCOST,PS_COMMENT
) from :'partsupp_file' with delimiter '|';
+copy heap_region ( R_REGIONKEY,R_NAME,R_COMMENT) from :'region_file' with
delimiter '|';
+copy heap_supplier
(S_SUPPKEY,S_NAME,S_ADDRESS,S_NATIONKEY,S_PHONE,S_ACCTBAL,S_COMMENT) from
:'supplier_file' with delimiter '|';
ANALYZE heap_customer;
ANALYZE heap_lineitem;
ANALYZE heap_nation;
@@ -186,16 +197,16 @@ CREATE TABLE ao_supplier (
s_comment character varying(101) NOT NULL
)
WITH (appendonly=true) DISTRIBUTED BY (s_suppkey);
-\copy ao_customer
(C_CUSTKEY,C_NAME,C_ADDRESS,C_NATIONKEY,C_PHONE,C_ACCTBAL,C_MKTSEGMENT,C_COMMENT)
from '@abs_srcdir@/data/customer.csv' with delimiter '|';
-\copy ao_lineitem ( L_ORDERKEY, L_PARTKEY, L_SUPPKEY,L_LINENUMBER,L_QUANTITY,
L_EXTENDEDPRICE,L_DISCOUNT,L_TAX,L_RETURNFLAG,L_LINESTATUS,L_SHIPDATE,L_COMMITDATE,L_RECEIPTDATE,L_SHIPINSTRUCT,L_SHIPMODE,L_COMMENT)
from '@abs_srcdir@/data/lineitem_small.csv' with delimiter '|';
-\copy ao_lineitem ( L_ORDERKEY, L_PARTKEY, L_SUPPKEY,L_LINENUMBER,L_QUANTITY,
L_EXTENDEDPRICE,L_DISCOUNT,L_TAX,L_RETURNFLAG,L_LINESTATUS,L_SHIPDATE,L_COMMITDATE,L_RECEIPTDATE,L_SHIPINSTRUCT,L_SHIPMODE,L_COMMENT)
from '@abs_srcdir@/data/lineitem.csv' with delimiter '|';
-\copy ao_nation (N_NATIONKEY ,N_NAME, N_REGIONKEY,N_COMMENT) from
'@abs_srcdir@/data/nation.csv' with delimiter '|';
-\copy ao_orders (
O_ORDERKEY,O_CUSTKEY,O_ORDERSTATUS,O_TOTALPRICE,O_ORDERDATE,O_ORDERPRIORITY,O_CLERK,O_SHIPPRIORITY,O_COMMENT)
from '@abs_srcdir@/data/order_small.csv' with delimiter '|';
-\copy ao_orders (
O_ORDERKEY,O_CUSTKEY,O_ORDERSTATUS,O_TOTALPRICE,O_ORDERDATE,O_ORDERPRIORITY,O_CLERK,O_SHIPPRIORITY,O_COMMENT)
from '@abs_srcdir@/data/order.csv' with delimiter '|';
-\copy ao_part
(P_PARTKEY,P_NAME,P_MFGR,P_BRAND,P_TYPE,P_SIZE,P_CONTAINER,P_RETAILPRICE,P_COMMENT)from
'@abs_srcdir@/data/part.csv' with delimiter '|';
-\copy ao_partsupp (PS_PARTKEY,PS_SUPPKEY,PS_AVAILQTY,PS_SUPPLYCOST,PS_COMMENT
) from '@abs_srcdir@/data/partsupp.csv' with delimiter '|';
-\copy ao_region ( R_REGIONKEY,R_NAME,R_COMMENT) from
'@abs_srcdir@/data/region.csv' with delimiter '|';
-\copy ao_supplier
(S_SUPPKEY,S_NAME,S_ADDRESS,S_NATIONKEY,S_PHONE,S_ACCTBAL,S_COMMENT) from
'@abs_srcdir@/data/supplier.csv' with delimiter '|';
+copy ao_customer
(C_CUSTKEY,C_NAME,C_ADDRESS,C_NATIONKEY,C_PHONE,C_ACCTBAL,C_MKTSEGMENT,C_COMMENT)
from :'customer_file' with delimiter '|';
+copy ao_lineitem ( L_ORDERKEY, L_PARTKEY, L_SUPPKEY,L_LINENUMBER,L_QUANTITY,
L_EXTENDEDPRICE,L_DISCOUNT,L_TAX,L_RETURNFLAG,L_LINESTATUS,L_SHIPDATE,L_COMMITDATE,L_RECEIPTDATE,L_SHIPINSTRUCT,L_SHIPMODE,L_COMMENT)
from :'lineitem_small_file' with delimiter '|';
+copy ao_lineitem ( L_ORDERKEY, L_PARTKEY, L_SUPPKEY,L_LINENUMBER,L_QUANTITY,
L_EXTENDEDPRICE,L_DISCOUNT,L_TAX,L_RETURNFLAG,L_LINESTATUS,L_SHIPDATE,L_COMMITDATE,L_RECEIPTDATE,L_SHIPINSTRUCT,L_SHIPMODE,L_COMMENT)
from :'lineitem_file' with delimiter '|';
+copy ao_nation (N_NATIONKEY ,N_NAME, N_REGIONKEY,N_COMMENT) from
:'nation_file' with delimiter '|';
+copy ao_orders (
O_ORDERKEY,O_CUSTKEY,O_ORDERSTATUS,O_TOTALPRICE,O_ORDERDATE,O_ORDERPRIORITY,O_CLERK,O_SHIPPRIORITY,O_COMMENT)
from :'order_small_file' with delimiter '|';
+copy ao_orders (
O_ORDERKEY,O_CUSTKEY,O_ORDERSTATUS,O_TOTALPRICE,O_ORDERDATE,O_ORDERPRIORITY,O_CLERK,O_SHIPPRIORITY,O_COMMENT)
from :'order_file' with delimiter '|';
+copy ao_part
(P_PARTKEY,P_NAME,P_MFGR,P_BRAND,P_TYPE,P_SIZE,P_CONTAINER,P_RETAILPRICE,P_COMMENT)from
:'part_file' with delimiter '|';
+copy ao_partsupp (PS_PARTKEY,PS_SUPPKEY,PS_AVAILQTY,PS_SUPPLYCOST,PS_COMMENT )
from :'partsupp_file' with delimiter '|';
+copy ao_region ( R_REGIONKEY,R_NAME,R_COMMENT) from :'region_file' with
delimiter '|';
+copy ao_supplier
(S_SUPPKEY,S_NAME,S_ADDRESS,S_NATIONKEY,S_PHONE,S_ACCTBAL,S_COMMENT) from
:'supplier_file' with delimiter '|';
ANALYZE ao_customer;
ANALYZE ao_lineitem;
ANALYZE ao_nation;
@@ -289,16 +300,16 @@ CREATE TABLE co_supplier (
s_comment character varying(101) NOT NULL ENCODING
(compresstype=none,blocksize=32768,compresslevel=0)
)
WITH (appendonly=true, orientation=column) DISTRIBUTED BY (s_suppkey);
-\copy co_customer
(C_CUSTKEY,C_NAME,C_ADDRESS,C_NATIONKEY,C_PHONE,C_ACCTBAL,C_MKTSEGMENT,C_COMMENT)
from '@abs_srcdir@/data/customer.csv' with delimiter '|';
-\copy co_lineitem ( L_ORDERKEY, L_PARTKEY, L_SUPPKEY,L_LINENUMBER,L_QUANTITY,
L_EXTENDEDPRICE,L_DISCOUNT,L_TAX,L_RETURNFLAG,L_LINESTATUS,L_SHIPDATE,L_COMMITDATE,L_RECEIPTDATE,L_SHIPINSTRUCT,L_SHIPMODE,L_COMMENT)
from '@abs_srcdir@/data/lineitem_small.csv' with delimiter '|';
-\copy co_lineitem ( L_ORDERKEY, L_PARTKEY, L_SUPPKEY,L_LINENUMBER,L_QUANTITY,
L_EXTENDEDPRICE,L_DISCOUNT,L_TAX,L_RETURNFLAG,L_LINESTATUS,L_SHIPDATE,L_COMMITDATE,L_RECEIPTDATE,L_SHIPINSTRUCT,L_SHIPMODE,L_COMMENT)
from '@abs_srcdir@/data/lineitem.csv' with delimiter '|';
-\copy co_nation (N_NATIONKEY ,N_NAME, N_REGIONKEY,N_COMMENT) from
'@abs_srcdir@/data/nation.csv' with delimiter '|';
-\copy co_orders (
O_ORDERKEY,O_CUSTKEY,O_ORDERSTATUS,O_TOTALPRICE,O_ORDERDATE,O_ORDERPRIORITY,O_CLERK,O_SHIPPRIORITY,O_COMMENT)
from '@abs_srcdir@/data/order_small.csv' with delimiter '|';
-\copy co_orders (
O_ORDERKEY,O_CUSTKEY,O_ORDERSTATUS,O_TOTALPRICE,O_ORDERDATE,O_ORDERPRIORITY,O_CLERK,O_SHIPPRIORITY,O_COMMENT)
from '@abs_srcdir@/data/order.csv' with delimiter '|';
-\copy co_part
(P_PARTKEY,P_NAME,P_MFGR,P_BRAND,P_TYPE,P_SIZE,P_CONTAINER,P_RETAILPRICE,P_COMMENT)
from '@abs_srcdir@/data/part.csv' with delimiter '|';
-\copy co_partsupp (PS_PARTKEY,PS_SUPPKEY,PS_AVAILQTY,PS_SUPPLYCOST,PS_COMMENT
) from '@abs_srcdir@/data/partsupp.csv' with delimiter '|';
-\copy co_region ( R_REGIONKEY,R_NAME,R_COMMENT) from
'@abs_srcdir@/data/region.csv' with delimiter '|';
-\copy co_supplier
(S_SUPPKEY,S_NAME,S_ADDRESS,S_NATIONKEY,S_PHONE,S_ACCTBAL,S_COMMENT) from
'@abs_srcdir@/data/supplier.csv' with delimiter '|';
+copy co_customer
(C_CUSTKEY,C_NAME,C_ADDRESS,C_NATIONKEY,C_PHONE,C_ACCTBAL,C_MKTSEGMENT,C_COMMENT)
from :'customer_file' with delimiter '|';
+copy co_lineitem ( L_ORDERKEY, L_PARTKEY, L_SUPPKEY,L_LINENUMBER,L_QUANTITY,
L_EXTENDEDPRICE,L_DISCOUNT,L_TAX,L_RETURNFLAG,L_LINESTATUS,L_SHIPDATE,L_COMMITDATE,L_RECEIPTDATE,L_SHIPINSTRUCT,L_SHIPMODE,L_COMMENT)
from :'lineitem_small_file' with delimiter '|';
+copy co_lineitem ( L_ORDERKEY, L_PARTKEY, L_SUPPKEY,L_LINENUMBER,L_QUANTITY,
L_EXTENDEDPRICE,L_DISCOUNT,L_TAX,L_RETURNFLAG,L_LINESTATUS,L_SHIPDATE,L_COMMITDATE,L_RECEIPTDATE,L_SHIPINSTRUCT,L_SHIPMODE,L_COMMENT)
from :'lineitem_file' with delimiter '|';
+copy co_nation (N_NATIONKEY ,N_NAME, N_REGIONKEY,N_COMMENT) from
:'nation_file' with delimiter '|';
+copy co_orders (
O_ORDERKEY,O_CUSTKEY,O_ORDERSTATUS,O_TOTALPRICE,O_ORDERDATE,O_ORDERPRIORITY,O_CLERK,O_SHIPPRIORITY,O_COMMENT)
from :'order_small_file' with delimiter '|';
+copy co_orders (
O_ORDERKEY,O_CUSTKEY,O_ORDERSTATUS,O_TOTALPRICE,O_ORDERDATE,O_ORDERPRIORITY,O_CLERK,O_SHIPPRIORITY,O_COMMENT)
from :'order_file' with delimiter '|';
+copy co_part
(P_PARTKEY,P_NAME,P_MFGR,P_BRAND,P_TYPE,P_SIZE,P_CONTAINER,P_RETAILPRICE,P_COMMENT)
from :'part_file' with delimiter '|';
+copy co_partsupp (PS_PARTKEY,PS_SUPPKEY,PS_AVAILQTY,PS_SUPPLYCOST,PS_COMMENT )
from :'partsupp_file' with delimiter '|';
+copy co_region ( R_REGIONKEY,R_NAME,R_COMMENT) from :'region_file' with
delimiter '|';
+copy co_supplier
(S_SUPPKEY,S_NAME,S_ADDRESS,S_NATIONKEY,S_PHONE,S_ACCTBAL,S_COMMENT) from
:'supplier_file' with delimiter '|';
ANALYZE co_customer;
ANALYZE co_lineitem;
ANALYZE co_nation;
diff --git a/src/test/regress/sql/bb_mpph.sql b/src/test/regress/sql/bb_mpph.sql
index bd8f95f1747..2caa05c7977 100644
--- a/src/test/regress/sql/bb_mpph.sql
+++ b/src/test/regress/sql/bb_mpph.sql
@@ -91,16 +91,28 @@ CREATE TABLE heap_supplier (
)
WITH (appendonly=false) DISTRIBUTED BY (s_suppkey);
-\copy heap_customer
(C_CUSTKEY,C_NAME,C_ADDRESS,C_NATIONKEY,C_PHONE,C_ACCTBAL,C_MKTSEGMENT,C_COMMENT)
from '@abs_srcdir@/data/customer.csv' with delimiter '|';
-\copy heap_lineitem ( L_ORDERKEY, L_PARTKEY,
L_SUPPKEY,L_LINENUMBER,L_QUANTITY,
L_EXTENDEDPRICE,L_DISCOUNT,L_TAX,L_RETURNFLAG,L_LINESTATUS,L_SHIPDATE,L_COMMITDATE,L_RECEIPTDATE,L_SHIPINSTRUCT,L_SHIPMODE,L_COMMENT)
from '@abs_srcdir@/data/lineitem_small.csv' with delimiter '|';
-\copy heap_lineitem ( L_ORDERKEY, L_PARTKEY,
L_SUPPKEY,L_LINENUMBER,L_QUANTITY,
L_EXTENDEDPRICE,L_DISCOUNT,L_TAX,L_RETURNFLAG,L_LINESTATUS,L_SHIPDATE,L_COMMITDATE,L_RECEIPTDATE,L_SHIPINSTRUCT,L_SHIPMODE,L_COMMENT)
from '@abs_srcdir@/data/lineitem.csv' with delimiter '|';
-\copy heap_nation (N_NATIONKEY ,N_NAME, N_REGIONKEY,N_COMMENT) from
'@abs_srcdir@/data/nation.csv' with delimiter '|';
-\copy heap_orders (
O_ORDERKEY,O_CUSTKEY,O_ORDERSTATUS,O_TOTALPRICE,O_ORDERDATE,O_ORDERPRIORITY,O_CLERK,O_SHIPPRIORITY,O_COMMENT)
from '@abs_srcdir@/data/order_small.csv' with delimiter '|';
-\copy heap_orders (
O_ORDERKEY,O_CUSTKEY,O_ORDERSTATUS,O_TOTALPRICE,O_ORDERDATE,O_ORDERPRIORITY,O_CLERK,O_SHIPPRIORITY,O_COMMENT)
from '@abs_srcdir@/data/order.csv' with delimiter '|';
-\copy heap_part
(P_PARTKEY,P_NAME,P_MFGR,P_BRAND,P_TYPE,P_SIZE,P_CONTAINER,P_RETAILPRICE,P_COMMENT)from
'@abs_srcdir@/data/part.csv' with delimiter '|';
-\copy heap_partsupp
(PS_PARTKEY,PS_SUPPKEY,PS_AVAILQTY,PS_SUPPLYCOST,PS_COMMENT ) from
'@abs_srcdir@/data/partsupp.csv' with delimiter '|';
-\copy heap_region ( R_REGIONKEY,R_NAME,R_COMMENT) from
'@abs_srcdir@/data/region.csv' with delimiter '|';
-\copy heap_supplier
(S_SUPPKEY,S_NAME,S_ADDRESS,S_NATIONKEY,S_PHONE,S_ACCTBAL,S_COMMENT) from
'@abs_srcdir@/data/supplier.csv' with delimiter '|';
+\getenv abs_srcdir PG_ABS_SRCDIR
+\set customer_file :abs_srcdir '/data/customer.csv'
+\set lineitem_small_file :abs_srcdir '/data/lineitem_small.csv'
+\set lineitem_file :abs_srcdir '/data/lineitem.csv'
+\set nation_file :abs_srcdir '/data/nation.csv'
+\set order_small_file :abs_srcdir '/data/order_small.csv'
+\set order_file :abs_srcdir '/data/order.csv'
+\set part_file :abs_srcdir '/data/part.csv'
+\set partsupp_file :abs_srcdir '/data/partsupp.csv'
+\set region_file :abs_srcdir '/data/region.csv'
+\set supplier_file :abs_srcdir '/data/supplier.csv'
+
+copy heap_customer
(C_CUSTKEY,C_NAME,C_ADDRESS,C_NATIONKEY,C_PHONE,C_ACCTBAL,C_MKTSEGMENT,C_COMMENT)
from :'customer_file' with delimiter '|';
+copy heap_lineitem ( L_ORDERKEY, L_PARTKEY, L_SUPPKEY,L_LINENUMBER,L_QUANTITY,
L_EXTENDEDPRICE,L_DISCOUNT,L_TAX,L_RETURNFLAG,L_LINESTATUS,L_SHIPDATE,L_COMMITDATE,L_RECEIPTDATE,L_SHIPINSTRUCT,L_SHIPMODE,L_COMMENT)
from :'lineitem_small_file' with delimiter '|';
+copy heap_lineitem ( L_ORDERKEY, L_PARTKEY, L_SUPPKEY,L_LINENUMBER,L_QUANTITY,
L_EXTENDEDPRICE,L_DISCOUNT,L_TAX,L_RETURNFLAG,L_LINESTATUS,L_SHIPDATE,L_COMMITDATE,L_RECEIPTDATE,L_SHIPINSTRUCT,L_SHIPMODE,L_COMMENT)
from :'lineitem_file' with delimiter '|';
+copy heap_nation (N_NATIONKEY ,N_NAME, N_REGIONKEY,N_COMMENT) from
:'nation_file' with delimiter '|';
+copy heap_orders (
O_ORDERKEY,O_CUSTKEY,O_ORDERSTATUS,O_TOTALPRICE,O_ORDERDATE,O_ORDERPRIORITY,O_CLERK,O_SHIPPRIORITY,O_COMMENT)
from :'order_small_file' with delimiter '|';
+copy heap_orders (
O_ORDERKEY,O_CUSTKEY,O_ORDERSTATUS,O_TOTALPRICE,O_ORDERDATE,O_ORDERPRIORITY,O_CLERK,O_SHIPPRIORITY,O_COMMENT)
from :'order_file' with delimiter '|';
+copy heap_part
(P_PARTKEY,P_NAME,P_MFGR,P_BRAND,P_TYPE,P_SIZE,P_CONTAINER,P_RETAILPRICE,P_COMMENT)from
:'part_file' with delimiter '|';
+copy heap_partsupp (PS_PARTKEY,PS_SUPPKEY,PS_AVAILQTY,PS_SUPPLYCOST,PS_COMMENT
) from :'partsupp_file' with delimiter '|';
+copy heap_region ( R_REGIONKEY,R_NAME,R_COMMENT) from :'region_file' with
delimiter '|';
+copy heap_supplier
(S_SUPPKEY,S_NAME,S_ADDRESS,S_NATIONKEY,S_PHONE,S_ACCTBAL,S_COMMENT) from
:'supplier_file' with delimiter '|';
ANALYZE heap_customer;
ANALYZE heap_lineitem;
@@ -204,16 +216,16 @@ CREATE TABLE ao_supplier (
)
WITH (appendonly=true) DISTRIBUTED BY (s_suppkey);
-\copy ao_customer
(C_CUSTKEY,C_NAME,C_ADDRESS,C_NATIONKEY,C_PHONE,C_ACCTBAL,C_MKTSEGMENT,C_COMMENT)
from '@abs_srcdir@/data/customer.csv' with delimiter '|';
-\copy ao_lineitem ( L_ORDERKEY, L_PARTKEY, L_SUPPKEY,L_LINENUMBER,L_QUANTITY,
L_EXTENDEDPRICE,L_DISCOUNT,L_TAX,L_RETURNFLAG,L_LINESTATUS,L_SHIPDATE,L_COMMITDATE,L_RECEIPTDATE,L_SHIPINSTRUCT,L_SHIPMODE,L_COMMENT)
from '@abs_srcdir@/data/lineitem_small.csv' with delimiter '|';
-\copy ao_lineitem ( L_ORDERKEY, L_PARTKEY, L_SUPPKEY,L_LINENUMBER,L_QUANTITY,
L_EXTENDEDPRICE,L_DISCOUNT,L_TAX,L_RETURNFLAG,L_LINESTATUS,L_SHIPDATE,L_COMMITDATE,L_RECEIPTDATE,L_SHIPINSTRUCT,L_SHIPMODE,L_COMMENT)
from '@abs_srcdir@/data/lineitem.csv' with delimiter '|';
-\copy ao_nation (N_NATIONKEY ,N_NAME, N_REGIONKEY,N_COMMENT) from
'@abs_srcdir@/data/nation.csv' with delimiter '|';
-\copy ao_orders (
O_ORDERKEY,O_CUSTKEY,O_ORDERSTATUS,O_TOTALPRICE,O_ORDERDATE,O_ORDERPRIORITY,O_CLERK,O_SHIPPRIORITY,O_COMMENT)
from '@abs_srcdir@/data/order_small.csv' with delimiter '|';
-\copy ao_orders (
O_ORDERKEY,O_CUSTKEY,O_ORDERSTATUS,O_TOTALPRICE,O_ORDERDATE,O_ORDERPRIORITY,O_CLERK,O_SHIPPRIORITY,O_COMMENT)
from '@abs_srcdir@/data/order.csv' with delimiter '|';
-\copy ao_part
(P_PARTKEY,P_NAME,P_MFGR,P_BRAND,P_TYPE,P_SIZE,P_CONTAINER,P_RETAILPRICE,P_COMMENT)from
'@abs_srcdir@/data/part.csv' with delimiter '|';
-\copy ao_partsupp (PS_PARTKEY,PS_SUPPKEY,PS_AVAILQTY,PS_SUPPLYCOST,PS_COMMENT
) from '@abs_srcdir@/data/partsupp.csv' with delimiter '|';
-\copy ao_region ( R_REGIONKEY,R_NAME,R_COMMENT) from
'@abs_srcdir@/data/region.csv' with delimiter '|';
-\copy ao_supplier
(S_SUPPKEY,S_NAME,S_ADDRESS,S_NATIONKEY,S_PHONE,S_ACCTBAL,S_COMMENT) from
'@abs_srcdir@/data/supplier.csv' with delimiter '|';
+copy ao_customer
(C_CUSTKEY,C_NAME,C_ADDRESS,C_NATIONKEY,C_PHONE,C_ACCTBAL,C_MKTSEGMENT,C_COMMENT)
from :'customer_file' with delimiter '|';
+copy ao_lineitem ( L_ORDERKEY, L_PARTKEY, L_SUPPKEY,L_LINENUMBER,L_QUANTITY,
L_EXTENDEDPRICE,L_DISCOUNT,L_TAX,L_RETURNFLAG,L_LINESTATUS,L_SHIPDATE,L_COMMITDATE,L_RECEIPTDATE,L_SHIPINSTRUCT,L_SHIPMODE,L_COMMENT)
from :'lineitem_small_file' with delimiter '|';
+copy ao_lineitem ( L_ORDERKEY, L_PARTKEY, L_SUPPKEY,L_LINENUMBER,L_QUANTITY,
L_EXTENDEDPRICE,L_DISCOUNT,L_TAX,L_RETURNFLAG,L_LINESTATUS,L_SHIPDATE,L_COMMITDATE,L_RECEIPTDATE,L_SHIPINSTRUCT,L_SHIPMODE,L_COMMENT)
from :'lineitem_file' with delimiter '|';
+copy ao_nation (N_NATIONKEY ,N_NAME, N_REGIONKEY,N_COMMENT) from
:'nation_file' with delimiter '|';
+copy ao_orders (
O_ORDERKEY,O_CUSTKEY,O_ORDERSTATUS,O_TOTALPRICE,O_ORDERDATE,O_ORDERPRIORITY,O_CLERK,O_SHIPPRIORITY,O_COMMENT)
from :'order_small_file' with delimiter '|';
+copy ao_orders (
O_ORDERKEY,O_CUSTKEY,O_ORDERSTATUS,O_TOTALPRICE,O_ORDERDATE,O_ORDERPRIORITY,O_CLERK,O_SHIPPRIORITY,O_COMMENT)
from :'order_file' with delimiter '|';
+copy ao_part
(P_PARTKEY,P_NAME,P_MFGR,P_BRAND,P_TYPE,P_SIZE,P_CONTAINER,P_RETAILPRICE,P_COMMENT)from
:'part_file' with delimiter '|';
+copy ao_partsupp (PS_PARTKEY,PS_SUPPKEY,PS_AVAILQTY,PS_SUPPLYCOST,PS_COMMENT )
from :'partsupp_file' with delimiter '|';
+copy ao_region ( R_REGIONKEY,R_NAME,R_COMMENT) from :'region_file' with
delimiter '|';
+copy ao_supplier
(S_SUPPKEY,S_NAME,S_ADDRESS,S_NATIONKEY,S_PHONE,S_ACCTBAL,S_COMMENT) from
:'supplier_file' with delimiter '|';
ANALYZE ao_customer;
ANALYZE ao_lineitem;
@@ -317,16 +329,16 @@ CREATE TABLE co_supplier (
)
WITH (appendonly=true, orientation=column) DISTRIBUTED BY (s_suppkey);
-\copy co_customer
(C_CUSTKEY,C_NAME,C_ADDRESS,C_NATIONKEY,C_PHONE,C_ACCTBAL,C_MKTSEGMENT,C_COMMENT)
from '@abs_srcdir@/data/customer.csv' with delimiter '|';
-\copy co_lineitem ( L_ORDERKEY, L_PARTKEY, L_SUPPKEY,L_LINENUMBER,L_QUANTITY,
L_EXTENDEDPRICE,L_DISCOUNT,L_TAX,L_RETURNFLAG,L_LINESTATUS,L_SHIPDATE,L_COMMITDATE,L_RECEIPTDATE,L_SHIPINSTRUCT,L_SHIPMODE,L_COMMENT)
from '@abs_srcdir@/data/lineitem_small.csv' with delimiter '|';
-\copy co_lineitem ( L_ORDERKEY, L_PARTKEY, L_SUPPKEY,L_LINENUMBER,L_QUANTITY,
L_EXTENDEDPRICE,L_DISCOUNT,L_TAX,L_RETURNFLAG,L_LINESTATUS,L_SHIPDATE,L_COMMITDATE,L_RECEIPTDATE,L_SHIPINSTRUCT,L_SHIPMODE,L_COMMENT)
from '@abs_srcdir@/data/lineitem.csv' with delimiter '|';
-\copy co_nation (N_NATIONKEY ,N_NAME, N_REGIONKEY,N_COMMENT) from
'@abs_srcdir@/data/nation.csv' with delimiter '|';
-\copy co_orders (
O_ORDERKEY,O_CUSTKEY,O_ORDERSTATUS,O_TOTALPRICE,O_ORDERDATE,O_ORDERPRIORITY,O_CLERK,O_SHIPPRIORITY,O_COMMENT)
from '@abs_srcdir@/data/order_small.csv' with delimiter '|';
-\copy co_orders (
O_ORDERKEY,O_CUSTKEY,O_ORDERSTATUS,O_TOTALPRICE,O_ORDERDATE,O_ORDERPRIORITY,O_CLERK,O_SHIPPRIORITY,O_COMMENT)
from '@abs_srcdir@/data/order.csv' with delimiter '|';
-\copy co_part
(P_PARTKEY,P_NAME,P_MFGR,P_BRAND,P_TYPE,P_SIZE,P_CONTAINER,P_RETAILPRICE,P_COMMENT)
from '@abs_srcdir@/data/part.csv' with delimiter '|';
-\copy co_partsupp (PS_PARTKEY,PS_SUPPKEY,PS_AVAILQTY,PS_SUPPLYCOST,PS_COMMENT
) from '@abs_srcdir@/data/partsupp.csv' with delimiter '|';
-\copy co_region ( R_REGIONKEY,R_NAME,R_COMMENT) from
'@abs_srcdir@/data/region.csv' with delimiter '|';
-\copy co_supplier
(S_SUPPKEY,S_NAME,S_ADDRESS,S_NATIONKEY,S_PHONE,S_ACCTBAL,S_COMMENT) from
'@abs_srcdir@/data/supplier.csv' with delimiter '|';
+copy co_customer
(C_CUSTKEY,C_NAME,C_ADDRESS,C_NATIONKEY,C_PHONE,C_ACCTBAL,C_MKTSEGMENT,C_COMMENT)
from :'customer_file' with delimiter '|';
+copy co_lineitem ( L_ORDERKEY, L_PARTKEY, L_SUPPKEY,L_LINENUMBER,L_QUANTITY,
L_EXTENDEDPRICE,L_DISCOUNT,L_TAX,L_RETURNFLAG,L_LINESTATUS,L_SHIPDATE,L_COMMITDATE,L_RECEIPTDATE,L_SHIPINSTRUCT,L_SHIPMODE,L_COMMENT)
from :'lineitem_small_file' with delimiter '|';
+copy co_lineitem ( L_ORDERKEY, L_PARTKEY, L_SUPPKEY,L_LINENUMBER,L_QUANTITY,
L_EXTENDEDPRICE,L_DISCOUNT,L_TAX,L_RETURNFLAG,L_LINESTATUS,L_SHIPDATE,L_COMMITDATE,L_RECEIPTDATE,L_SHIPINSTRUCT,L_SHIPMODE,L_COMMENT)
from :'lineitem_file' with delimiter '|';
+copy co_nation (N_NATIONKEY ,N_NAME, N_REGIONKEY,N_COMMENT) from
:'nation_file' with delimiter '|';
+copy co_orders (
O_ORDERKEY,O_CUSTKEY,O_ORDERSTATUS,O_TOTALPRICE,O_ORDERDATE,O_ORDERPRIORITY,O_CLERK,O_SHIPPRIORITY,O_COMMENT)
from :'order_small_file' with delimiter '|';
+copy co_orders (
O_ORDERKEY,O_CUSTKEY,O_ORDERSTATUS,O_TOTALPRICE,O_ORDERDATE,O_ORDERPRIORITY,O_CLERK,O_SHIPPRIORITY,O_COMMENT)
from :'order_file' with delimiter '|';
+copy co_part
(P_PARTKEY,P_NAME,P_MFGR,P_BRAND,P_TYPE,P_SIZE,P_CONTAINER,P_RETAILPRICE,P_COMMENT)
from :'part_file' with delimiter '|';
+copy co_partsupp (PS_PARTKEY,PS_SUPPKEY,PS_AVAILQTY,PS_SUPPLYCOST,PS_COMMENT )
from :'partsupp_file' with delimiter '|';
+copy co_region ( R_REGIONKEY,R_NAME,R_COMMENT) from :'region_file' with
delimiter '|';
+copy co_supplier
(S_SUPPKEY,S_NAME,S_ADDRESS,S_NATIONKEY,S_PHONE,S_ACCTBAL,S_COMMENT) from
:'supplier_file' with delimiter '|';
ANALYZE co_customer;
ANALYZE co_lineitem;
diff --git a/src/test/regress/sql/part_external_table.sql
b/src/test/regress/sql/part_external_table.sql
index 577cdd2a1ea..3c80981ed83 100644
--- a/src/test/regress/sql/part_external_table.sql
+++ b/src/test/regress/sql/part_external_table.sql
@@ -29,9 +29,13 @@ set optimizer_trace_fallback=on;
create schema part_external_table;
set search_path=part_external_table;
+\getenv hostname PG_HOSTNAME
+\getenv abs_srcdir PG_ABS_SRCDIR
+\set part1_file 'file://' :hostname :abs_srcdir '/data/part1.csv'
+\set part2_file 'file://' :hostname :abs_srcdir '/data/part2.csv'
create table part (a int, b int) partition by range (b);
-create external table p1_e (a int, b int) location
('file://@hostname@@abs_srcdir@/data/part1.csv') format 'csv';
-create external table p2_e (a int, b int) location
('file://@hostname@@abs_srcdir@/data/part2.csv') format 'csv';
+create external table p1_e (a int, b int) location (:'part1_file') format
'csv';
+create external table p2_e (a int, b int) location (:'part2_file') format
'csv';
alter table part attach partition p1_e for values from (0) to (10);
alter table part attach partition p2_e for values from (10) to (19);
analyze part;
@@ -137,8 +141,9 @@ alter table part add partition exch1 start(60) end (70);
alter table part add partition exch2 start(70) end (80);
-- exchange with external tables
-create external web table p3_e (a int, b int) execute 'cat >
@abs_srcdir@/data/part-ext.csv' format 'csv' (delimiter as '|' null as 'null'
escape as ' ');
-create writable external web table p4_e (a int, b int) execute 'cat >
@abs_srcdir@/data/part-ext.csv' format 'csv' (delimiter as '|' null as 'null'
escape as ' ');
+\set part-ext_file 'cat > ' :abs_srcdir '/data/part-ext.csv'
+create external web table p3_e (a int, b int) execute :'part-ext_file' format
'csv' (delimiter as '|' null as 'null' escape as ' ');
+create writable external web table p4_e (a int, b int) execute
:'part-ext_file' format 'csv' (delimiter as '|' null as 'null' escape as ' ');
-- allow exchange readable external table
alter table part exchange partition exch1 with table p3_e;
@@ -158,8 +163,8 @@ OPTIONS ( filename '/does/not/exist.csv', format 'csv');
alter table part exchange partition exch2 with table ft3;
-- same tests for attach partition
-create external web table p5_e (a int, b int) execute 'cat >
@abs_srcdir@/data/part-ext.csv' format 'csv' (delimiter as '|' null as 'null'
escape as ' ');
-create writable external web table p6_e (a int, b int) execute 'cat >
@abs_srcdir@/data/part-ext.csv' format 'csv' (delimiter as '|' null as 'null'
escape as ' ');
+create external web table p5_e (a int, b int) execute :'part-ext_file' format
'csv' (delimiter as '|' null as 'null' escape as ' ');
+create writable external web table p6_e (a int, b int) execute
:'part-ext_file' format 'csv' (delimiter as '|' null as 'null' escape as ' ');
-- allow attach readable external table
alter table part attach partition p5_e for values from (80) to (90);
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
