Skip to content

Commit cee6ce5

Browse files
baobao0206oppenheimer01
authored andcommitted
Remove guc lc_ctype
1 parent c44d8f2 commit cee6ce5

9 files changed

Lines changed: 29 additions & 26 deletions

File tree

gpMgmt/bin/Makefile

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,19 @@ download-python-deps:
111111
else \
112112
echo "PyGreSQL-$(PYGRESQL_VERSION).tar.gz already exists, skipping download"; \
113113
fi
114-
# Install wheel and cython for PyYAML building
115-
pip3 install --user wheel "cython<3.0.0"
114+
# Install wheel and cython for PyYAML building (only if not exists)
115+
@if python3 -c "import wheel" >/dev/null 2>&1; then \
116+
echo "wheel already exists, skipping installation"; \
117+
else \
118+
echo "Installing wheel..."; \
119+
pip3 install --user wheel 2>/dev/null || pip3 install --user --break-system-packages wheel; \
120+
fi
121+
@if python3 -c "import cython" >/dev/null 2>&1; then \
122+
echo "cython already exists, skipping installation"; \
123+
else \
124+
echo "Installing cython..."; \
125+
pip3 install --user "cython<3.0.0" 2>/dev/null || pip3 install --user --break-system-packages "cython<3.0.0"; \
126+
fi
116127

117128
#
118129
# PyGreSQL

src/backend/utils/misc/guc_tables.c

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4166,17 +4166,6 @@ struct config_string ConfigureNamesString[] =
41664166
NULL, NULL, NULL
41674167
},
41684168

4169-
{
4170-
{"lc_ctype", PGC_INTERNAL, PRESET_OPTIONS,
4171-
gettext_noop("Shows the character classification and case conversion locale."),
4172-
NULL,
4173-
GUC_NOT_IN_SAMPLE | GUC_DISALLOW_IN_FILE
4174-
},
4175-
&locale_ctype,
4176-
"C",
4177-
NULL, NULL, NULL
4178-
},
4179-
41804169
/* See main.c about why defaults for LC_foo are not all alike */
41814170

41824171
{

src/include/utils/unsync_guc_name.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -322,7 +322,6 @@
322322
"krb_caseins_users",
323323
"krb_server_keyfile",
324324
"lc_collate",
325-
"lc_ctype",
326325
"listen_addresses",
327326
"local_preload_libraries",
328327
"lo_compat_privileges",

src/test/regress/expected/cte_prune.out

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,7 @@ select t1.v1 from t1 where t1.v1 in (select item_sk from frequent_ss_items where
996996
Output: tpcds_item_1.i_item_desc, tpcds_item_1.i_item_sk
997997
Filter: (tpcds_item_1.i_item_sk > 0)
998998
Optimizer: Postgres query optimizer
999-
(88 rows)
999+
(89 rows)
10001000

10011001
-- sql 95
10021002
explain verbose with ws_wh as
@@ -1077,7 +1077,7 @@ select * from t1 where t1.v1 in (select ws_order_number from ws_wh where true) a
10771077
-> Seq Scan on cte_prune.t1 (cost=0.00..1.03 rows=3 width=12)
10781078
Output: t1.v1, t1.v2, t1.v3, RowIdExpr
10791079
Optimizer: Postgres query optimizer
1080-
(70 rows)
1080+
(71 rows)
10811081

10821082
explain verbose with ws_wh as
10831083
(select ws1.ws_order_number,ws1.ws_warehouse_sk wh1,ws2.ws_warehouse_sk wh2
@@ -1158,7 +1158,7 @@ select * from t1 where t1.v1 in (select wh1 from ws_wh where true) and t1.v1 in
11581158
-> Seq Scan on cte_prune.t1 (cost=0.00..1.03 rows=3 width=12)
11591159
Output: t1.v1, t1.v2, t1.v3, RowIdExpr
11601160
Optimizer: Postgres query optimizer
1161-
(71 rows)
1161+
(72 rows)
11621162

11631163
-- start_ignore
11641164
drop table tpcds_store_sales;
@@ -1269,7 +1269,7 @@ LIMIT 10;
12691269
-> Seq Scan on cte_prune.t4 t4_1 (cost=0.00..1.03 rows=3 width=8)
12701270
Output: t4_1.c, t4_1.d
12711271
Optimizer: Postgres query optimizer
1272-
(76 rows)
1272+
(77 rows)
12731273

12741274
WITH t(a,b,d) AS
12751275
(
@@ -1496,7 +1496,7 @@ where country.percentage = countrylanguage.percentage order by countrylanguage.C
14961496
Output: country_2.code, country_2.name, country_2.capital
14971497
Filter: (country_2.continent = 'Europe'::text)
14981498
Optimizer: Postgres query optimizer
1499-
(75 rows)
1499+
(76 rows)
15001500

15011501
-- CTE in the main query and subqueries within the main query
15021502
explain verbose with bad_headofstates as
@@ -1624,7 +1624,7 @@ order by OUTERMOST_FOO.region,bad_headofstates.headofstate LIMIT 40;
16241624
-> Seq Scan on cte_prune.city (cost=0.00..126.33 rows=9233 width=4)
16251625
Output: city.id
16261626
Optimizer: Postgres query optimizer
1627-
(104 rows)
1627+
(105 rows)
16281628

16291629
-- start_ignore
16301630
drop table city;

src/test/regress/expected/directory_table.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -788,7 +788,7 @@ ERROR: duplicate key value violates unique constraint "dir_table1_pkey"
788788
DETAIL: Key (relative_path)=(nation1) already exists.
789789
COPY BINARY dir_table1 FROM :'nation_file' 'nation2' 'nation2'; -- fail
790790
ERROR: syntax error at or near "'nation2'"
791-
LINE 1: ...berry/src/test/regress/data/nation.csv' 'nation2' 'nation2';
791+
LINE 1: ...rrydb/src/test/regress/data/nation.csv' 'nation2' 'nation2';
792792
^
793793
COPY BINARY dir_table1 FROM :'nation_file' 'nation2';
794794
NOTICE: dir_table1 INSERT AFTER ROW (seg2 127.0.1.1:7004 pid=900444)

src/test/regress/expected/external_table.out

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2804,7 +2804,7 @@ CREATE EXTERNAL TABLE ext_nation_on_coordinator ( N_NATIONKEY INTEGER ,
28042804
N_NAME CHAR(25) ,
28052805
N_REGIONKEY INTEGER ,
28062806
N_COMMENT VARCHAR(152))
2807-
location ('file://@hostname@@abs_srcdir@/data/nation.tbl' ) ON COORDINATOR
2807+
location (:'nation_tbl' ) ON COORDINATOR
28082808
FORMAT 'text' (delimiter '|');
28092809
SELECT gp_segment_id, * FROM ext_nation_on_coordinator ORDER BY N_NATIONKEY DESC LIMIT 5;
28102810
gp_segment_id | n_nationkey | n_name | n_regionkey | n_comment
@@ -5212,3 +5212,7 @@ SELECT logerrors, options from pg_exttable a, pg_class b where a.reloid = b.oid
52125212
DROP EXTERNAL TABLE ext_false;
52135213
DROP EXTERNAL TABLE ext_true;
52145214
DROP EXTERNAL TABLE ext_persistently;
5215+
CREATE EXTERNAL WEB TEMP TABLE test_program_not_exist(content text) EXECUTE '/bin/bash /xx/seq 1 5' ON MASTER FORMAT 'TEXT';
5216+
SELECT * FROM test_program_not_exist;
5217+
ERROR: external table test_program_not_exist command ended with error. /bin/bash: /xx/seq: No such file or directory
5218+
DETAIL: Command: execute:/bin/bash /xx/seq 1 5

src/test/regress/expected/gp_explain.out

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -608,7 +608,7 @@ SELECT * FROM y LIMIT 10;
608608
-> WorkTable Scan on y (never executed)
609609
-> Materialize (never executed)
610610
-> Gather Motion 3:1 (slice1; segments: 3) (never executed)
611-
-> Seq Scan on recursive_table_ic (actual rows=#### loops=1)
611+
-> Seq Scan on recursive_table_ic (actual rows=4049 loops=1)
612612
Optimizer: Postgres query optimizer
613613
(13 rows)
614614

src/test/regress/expected/partition_prune_append.out

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3953,7 +3953,7 @@ explain (costs off) update listp1 set a = 1 where a = 2;
39533953
-> Result
39543954
-> Redistribute Motion 3:3 (slice1; segments: 3)
39553955
Hash Key: a
3956-
-> Split
3956+
-> Split Update
39573957
-> Seq Scan on listp1
39583958
Filter: (a = 2)
39593959
Optimizer: Pivotal Optimizer (GPORCA)
@@ -3979,7 +3979,7 @@ explain (costs off) update listp1 set a = 1 where a = 2;
39793979
-> Result
39803980
-> Redistribute Motion 3:3 (slice1; segments: 3)
39813981
Hash Key: a
3982-
-> Split
3982+
-> Split Update
39833983
-> Seq Scan on listp1
39843984
Filter: (a = 2)
39853985
Optimizer: Pivotal Optimizer (GPORCA)

src/test/regress/sql/external_table.sql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1433,7 +1433,7 @@ CREATE EXTERNAL TABLE ext_nation_on_coordinator ( N_NATIONKEY INTEGER ,
14331433
N_NAME CHAR(25) ,
14341434
N_REGIONKEY INTEGER ,
14351435
N_COMMENT VARCHAR(152))
1436-
location ('file://@hostname@@abs_srcdir@/data/nation.tbl' ) ON COORDINATOR
1436+
location (:'nation_tbl' ) ON COORDINATOR
14371437
FORMAT 'text' (delimiter '|');
14381438
SELECT gp_segment_id, * FROM ext_nation_on_coordinator ORDER BY N_NATIONKEY DESC LIMIT 5;
14391439
DROP EXTERNAL TABLE IF EXISTS ext_nation_on_coordinator;

0 commit comments

Comments
 (0)