diff --git a/README.md b/README.md index ee0901af3f4..bd558742989 100644 --- a/README.md +++ b/README.md @@ -68,7 +68,7 @@ feedback, and chat: | Slack | [Click to Join](https://inviter.co/apache-cloudberry) the real-time chat on Slack for QA, Dev, Events, and more. Don't miss out! Check out the [Slack guide](https://cloudberry.apache.org/community/slack) to learn more. | | Q&A | Ask for help when running/developing Cloudberry, visit [GitHub Discussions - QA](https://github.com/apache/cloudberry/discussions/categories/q-a). | | New ideas / Feature Requests | Share ideas for new features, visit [GitHub Discussions - Ideas](https://github.com/apache/cloudberry/discussions/categories/ideas-feature-requests). | -| Report bugs | Problems and issues in Apache Cloudberry core. If you find bugs, welcome to submit them [here](https://github.com/apache/cloudberrydb/issues). | +| Report bugs | Problems and issues in Apache Cloudberry core. If you find bugs, welcome to submit them [here](https://github.com/apache/cloudberry/issues). | | Report a security vulnerability | View our [security policy](https://github.com/apache/cloudberry/security/policy) to learn how to report and contact us. | | Community events | Including meetups, webinars, conferences, and more events, visit the [Events page](https://cloudberry.apache.org/community/events) and subscribe events calendar. | | Documentation | [Official documentation](https://cloudberry.apache.org/docs/) for Cloudberry. You can explore it to discover more details about us. | @@ -91,7 +91,7 @@ with the contribution. ## Roadmap You can check our [Cloudberry Roadmap -2024](https://github.com/orgs/cloudberrydb/discussions/369) out to see the +2024](https://github.com/orgs/cloudberry/discussions/369) out to see the product plans and goals we want to achieve in 2024. Welcome to share your thoughts and ideas to join us in shaping the future of Apache Cloudberry (Incubating). (We will update the Roadmap after entering the Incubator.) diff --git a/config/programs.m4 b/config/programs.m4 index 234a0dd1e55..1c0bd634530 100644 --- a/config/programs.m4 +++ b/config/programs.m4 @@ -98,7 +98,7 @@ else break 2 else AC_MSG_WARN([ -*** The installed version of Flex, $pgac_candidate, is too old to use with Cloudberry DB. +*** The installed version of Flex, $pgac_candidate, is too old to use with Apache Cloudberry. *** Flex version 2.5.4 or later is required, but this is $pgac_flex_version.]) fi fi diff --git a/configure b/configure index 6276240f44c..2a40e9e72b4 100755 --- a/configure +++ b/configure @@ -11763,10 +11763,10 @@ else break 2 else { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: -*** The installed version of Flex, $pgac_candidate, is too old to use with Cloudberry DB. +*** The installed version of Flex, $pgac_candidate, is too old to use with Apache Cloudberry. *** Flex version 2.5.4 or later is required, but this is $pgac_flex_version." >&5 $as_echo "$as_me: WARNING: -*** The installed version of Flex, $pgac_candidate, is too old to use with Cloudberry DB. +*** The installed version of Flex, $pgac_candidate, is too old to use with Apache Cloudberry. *** Flex version 2.5.4 or later is required, but this is $pgac_flex_version." >&2;} fi fi diff --git a/contrib/Makefile b/contrib/Makefile index 84138c41c3d..d8283927496 100644 --- a/contrib/Makefile +++ b/contrib/Makefile @@ -4,7 +4,7 @@ subdir = contrib top_builddir = .. include $(top_builddir)/src/Makefile.global -# Cloudberry Database specific changes to the targetlist: +# Apache Cloudberry specific changes to the targetlist: # tsearch2 and postgres_fdw are currently disabled due to test failures. # cube and the related earthdistance are disabled since GPDB define CUBE # as a keyword. lo is disabled since large objects aren't supported. @@ -55,7 +55,7 @@ SUBDIRS = \ unaccent \ vacuumlo -# CloudberryDB-specific additions (to ease merge pain). +# Cloudberry-specific additions (to ease merge pain). SUBDIRS += \ formatter \ formatter_fixedwidth \ diff --git a/contrib/auto_explain/expected/auto_explain.out b/contrib/auto_explain/expected/auto_explain.out index b62a99c8ddd..d82e10b38b3 100644 --- a/contrib/auto_explain/expected/auto_explain.out +++ b/contrib/auto_explain/expected/auto_explain.out @@ -4,12 +4,12 @@ -- end_matchsubs CREATE SCHEMA auto_explain_test; CREATE TABLE auto_explain_test.t1(a int); -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. INSERT INTO auto_explain_test.t1 VALUES(generate_series(0, 1000)); ANALYZE auto_explain_test.t1; CREATE TABLE auto_explain_test.t2(b int); -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'b' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'b' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. INSERT INTO auto_explain_test.t2 VALUES(generate_series(0, 1000)); ANALYZE auto_explain_test.t2; diff --git a/contrib/auto_explain/expected/auto_explain_optimizer.out b/contrib/auto_explain/expected/auto_explain_optimizer.out index e17f09665ab..3588c830195 100644 --- a/contrib/auto_explain/expected/auto_explain_optimizer.out +++ b/contrib/auto_explain/expected/auto_explain_optimizer.out @@ -4,12 +4,12 @@ -- end_matchsubs CREATE SCHEMA auto_explain_test; CREATE TABLE auto_explain_test.t1(a int); -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. INSERT INTO auto_explain_test.t1 VALUES(generate_series(0, 1000)); ANALYZE auto_explain_test.t1; CREATE TABLE auto_explain_test.t2(b int); -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'b' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'b' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. INSERT INTO auto_explain_test.t2 VALUES(generate_series(0, 1000)); ANALYZE auto_explain_test.t2; diff --git a/contrib/bloom/expected/bloom.out b/contrib/bloom/expected/bloom.out index 73c466c0107..b6a002ab232 100644 --- a/contrib/bloom/expected/bloom.out +++ b/contrib/bloom/expected/bloom.out @@ -3,7 +3,7 @@ CREATE TABLE tst ( i int4, t text ); -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. INSERT INTO tst SELECT i%10, substr(md5(i::text), 1, 1) FROM generate_series(1,2000) i; CREATE INDEX bloomidx ON tst USING bloom (i, t) WITH (col1 = 3); @@ -154,7 +154,7 @@ CREATE UNLOGGED TABLE tstu ( i int4, t text ); -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. INSERT INTO tstu SELECT i%10, substr(md5(i::text), 1, 1) FROM generate_series(1,2000) i; CREATE INDEX bloomidxu ON tstu USING bloom (i, t) WITH (col2 = 4); diff --git a/contrib/bloom/expected/bloom_optimizer.out b/contrib/bloom/expected/bloom_optimizer.out index 28155dceb42..46c353bb3fc 100644 --- a/contrib/bloom/expected/bloom_optimizer.out +++ b/contrib/bloom/expected/bloom_optimizer.out @@ -3,7 +3,7 @@ CREATE TABLE tst ( i int4, t text ); -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. INSERT INTO tst SELECT i%10, substr(md5(i::text), 1, 1) FROM generate_series(1,2000) i; CREATE INDEX bloomidx ON tst USING bloom (i, t) WITH (col1 = 3); @@ -146,7 +146,7 @@ CREATE UNLOGGED TABLE tstu ( i int4, t text ); -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'i' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. INSERT INTO tstu SELECT i%10, substr(md5(i::text), 1, 1) FROM generate_series(1,2000) i; CREATE INDEX bloomidxu ON tstu USING bloom (i, t) WITH (col2 = 4); diff --git a/contrib/btree_gist/init_file b/contrib/btree_gist/init_file index 154f40371c5..3eebd6df1f6 100644 --- a/contrib/btree_gist/init_file +++ b/contrib/btree_gist/init_file @@ -7,7 +7,7 @@ # modify the corresponding expected output. Hence we want to ignore these. # Some of the messages include: # -# NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named '' as the Cloudberry Database data distribution key for this table. +# NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named '' as the Apache Cloudberry data distribution key for this table. # NOTICE: Table doesn't have 'DISTRIBUTED BY' clause, defaulting to distribution columns from LIKE table # HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. # diff --git a/contrib/file_fdw/init_file b/contrib/file_fdw/init_file index c691fa91aaa..d01f0120beb 100644 --- a/contrib/file_fdw/init_file +++ b/contrib/file_fdw/init_file @@ -12,7 +12,7 @@ m/^ Settings:.*/ # modify the corresponding expected output. Hence we want to ignore these. # Some of the messages include: # -# NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named '' as the Cloudberry Database data distribution key for this table. +# NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named '' as the Apache Cloudberry data distribution key for this table. # NOTICE: Table doesn't have 'DISTRIBUTED BY' clause, defaulting to distribution columns from LIKE table # HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. # diff --git a/contrib/file_fdw/input/gp_file_fdw.source b/contrib/file_fdw/input/gp_file_fdw.source index 5f7b234fe93..9ef92e97955 100644 --- a/contrib/file_fdw/input/gp_file_fdw.source +++ b/contrib/file_fdw/input/gp_file_fdw.source @@ -1,5 +1,5 @@ -- --- Test foreign-data wrapper file_fdw. Cloudberry Database MPP specific +-- Test foreign-data wrapper file_fdw. Apache Cloudberry MPP specific -- -- Clean up in case a prior regression run failed diff --git a/contrib/file_fdw/output/gp_file_fdw.source b/contrib/file_fdw/output/gp_file_fdw.source index 3b2369fa32b..023bfde1b66 100644 --- a/contrib/file_fdw/output/gp_file_fdw.source +++ b/contrib/file_fdw/output/gp_file_fdw.source @@ -1,5 +1,5 @@ -- --- Test foreign-data wrapper file_fdw. Cloudberry Database MPP specific +-- Test foreign-data wrapper file_fdw. Apache Cloudberry MPP specific -- -- Clean up in case a prior regression run failed SET client_min_messages TO 'error'; diff --git a/contrib/formatter_fixedwidth/output/readable_query10.source b/contrib/formatter_fixedwidth/output/readable_query10.source index ee52c6b9810..ce68fa90fab 100644 --- a/contrib/formatter_fixedwidth/output/readable_query10.source +++ b/contrib/formatter_fixedwidth/output/readable_query10.source @@ -21,7 +21,7 @@ NOTICE: table "heap_col_null" does not exist, skipping CREATE TABLE heap_col_null ( s1 char(10), s2 varchar(10), s3 text, col_empty character(5),col_null character varying(5) default 'NULL' ); -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. \d heap_col_null Table "public.heap_col_null" diff --git a/contrib/hstore/expected/hstore.out b/contrib/hstore/expected/hstore.out index 49f9141f2e1..6c75f0241d3 100644 --- a/contrib/hstore/expected/hstore.out +++ b/contrib/hstore/expected/hstore.out @@ -922,10 +922,10 @@ select hstore(v) from (values (1, 'foo', 1.2, 3::float8)) v(a,b,c,d); create domain hstestdom1 as integer not null default 0; create table testhstore0 (a integer, b text, c numeric, d float8); -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. create table testhstore1 (a integer, b text, c numeric, d float8, e hstestdom1); -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. insert into testhstore0 values (1, 'foo', 1.2, 3::float8); insert into testhstore1 values (1, 'foo', 1.2, 3::float8); @@ -1273,7 +1273,7 @@ select 'a=>b, b=>1, c=>NULL'::hstore @> 'a=>b, c=>q'; (1 row) CREATE TABLE testhstore (h hstore); -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'h' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'h' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. \copy testhstore from 'data/hstore.data' select count(*) from testhstore where h @> 'wait=>NULL'; diff --git a/contrib/hstore_plperl/expected/create_transform.out b/contrib/hstore_plperl/expected/create_transform.out index 4b399c6b019..40ddd1fdf23 100644 --- a/contrib/hstore_plperl/expected/create_transform.out +++ b/contrib/hstore_plperl/expected/create_transform.out @@ -42,7 +42,7 @@ NOTICE: transform for type hstore language "plperl" does not exist, skipping -- test pg_stat_last_operation CREATE TRANSFORM FOR hstore LANGUAGE plperl (FROM SQL WITH FUNCTION hstore_to_plperl(internal), TO SQL WITH FUNCTION plperl_to_hstore(internal)); SELECT oid INTO temp transform_oid FROM pg_transform WHERE trfFROMsql='hstore_to_plperl'::regproc AND trftosql='plperl_to_hstore'::regproc; -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column(s) named 'oid' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column(s) named 'oid' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. SELECT COUNT(*) = 1 FROM pg_stat_last_operation WHERE classid='pg_transform'::regclass AND objid=(SELECT oid FROM transform_oid limit 1); ?column? diff --git a/contrib/indexscan/expected/read_ao_index.out b/contrib/indexscan/expected/read_ao_index.out index 559e05cb51d..be775d74c18 100644 --- a/contrib/indexscan/expected/read_ao_index.out +++ b/contrib/indexscan/expected/read_ao_index.out @@ -1,7 +1,7 @@ drop table if exists ao_t1; drop index if exists ao_i1; create table ao_t1 (a integer, b integer) with (appendonly=true); -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. insert into ao_t1 select 1 as a, * from generate_series(1, 1000) as b; create index ao_i1 on ao_t1(b); diff --git a/contrib/indexscan/expected/read_co_index.out b/contrib/indexscan/expected/read_co_index.out index 1479e8236b0..d9c14b74ccc 100644 --- a/contrib/indexscan/expected/read_co_index.out +++ b/contrib/indexscan/expected/read_co_index.out @@ -1,7 +1,7 @@ drop table if exists co_t1; drop index if exists co_i1; create table co_t1 (a integer, b integer) with (appendonly=true, orientation=column); -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. insert into co_t1 select 1 as a, * from generate_series(1, 1000) as b; create index co_i1 on co_t1(b); diff --git a/contrib/indexscan/expected/read_heap_index.out b/contrib/indexscan/expected/read_heap_index.out index 297281daaf0..375b2231d77 100644 --- a/contrib/indexscan/expected/read_heap_index.out +++ b/contrib/indexscan/expected/read_heap_index.out @@ -1,7 +1,7 @@ drop table if exists heap_t1; drop index if exists heap_i1; create table heap_t1 (a integer, b integer); -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. insert into heap_t1 select 1 as a, * from generate_series(1, 1000) as b; create index heap_i1 on heap_t1(b); diff --git a/contrib/intarray/expected/_int.out b/contrib/intarray/expected/_int.out index 24ab1a348c8..1c3618dbca9 100644 --- a/contrib/intarray/expected/_int.out +++ b/contrib/intarray/expected/_int.out @@ -399,7 +399,7 @@ SELECT '1&(2&(4&(5|!6)))'::query_int; (1 row) CREATE TABLE test__int( a int[] ); -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. \copy test__int from 'data/test__int.data' ANALYZE test__int; diff --git a/contrib/intarray/package/gppkg_spec.yml.in b/contrib/intarray/package/gppkg_spec.yml.in index 1a652b7b178..43208d1fc0e 100644 --- a/contrib/intarray/package/gppkg_spec.yml.in +++ b/contrib/intarray/package/gppkg_spec.yml.in @@ -3,6 +3,6 @@ Architecture: #arch Version: ossv1.1_pv1.2_gpdb4.3orca OS: #os GPDBVersion: 4.3 -Description: Intarray provides functionality and GiST indexing capabilities for integer arrays in the Cloudberry Database. +Description: Intarray provides functionality and GiST indexing capabilities for integer arrays in the Apache Cloudberry. PostInstall: - Master: "echo 'Please run psql -d mydatabase -f $GPHOME/share/postgresql/contrib/_int.sql to enable the package.'" diff --git a/contrib/intarray/package/intarray.spec b/contrib/intarray/package/intarray.spec index f57c3015ba8..afa453f0f2c 100644 --- a/contrib/intarray/package/intarray.spec +++ b/contrib/intarray/package/intarray.spec @@ -10,7 +10,7 @@ AutoProv: no Provides: intarray = %{intarray_ver} %description -The intarray package provides integer array functions and GiST index support for Cloudberry Database +The intarray package provides integer array functions and GiST index support for Apache Cloudberry %install mkdir -p %{buildroot}/temp diff --git a/contrib/oid2name/oid2name.c b/contrib/oid2name/oid2name.c index 4803fec9302..cb194fd2c21 100644 --- a/contrib/oid2name/oid2name.c +++ b/contrib/oid2name/oid2name.c @@ -110,7 +110,7 @@ get_opts(int argc, char **argv, struct options *my_opts) } if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0) { - puts("oid2name (Cloudberry Database) " PG_VERSION); + puts("oid2name (Apache Cloudberry) " PG_VERSION); exit(0); } } diff --git a/contrib/pg_standby/pg_standby.c b/contrib/pg_standby/pg_standby.c index bbb347f9b15..ad18e0d8832 100644 --- a/contrib/pg_standby/pg_standby.c +++ b/contrib/pg_standby/pg_standby.c @@ -652,7 +652,7 @@ main(int argc, char **argv) } if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0) { - puts("pg_standby (Cloudberry Database) " PG_VERSION); + puts("pg_standby (Apache Cloudberry) " PG_VERSION); exit(0); } } diff --git a/contrib/pgcrypto/package/gppkg_spec.yml.in b/contrib/pgcrypto/package/gppkg_spec.yml.in index 511c148fbe6..8a543f48dc5 100644 --- a/contrib/pgcrypto/package/gppkg_spec.yml.in +++ b/contrib/pgcrypto/package/gppkg_spec.yml.in @@ -3,6 +3,6 @@ Architecture: #arch Version: ossv1.1_pv1.2_gpdb4.3orca OS: #os GPDBVersion: 4.3 -Description: Pgcrypto provides cryptographic functions for the Cloudberry Database. +Description: Pgcrypto provides cryptographic functions for the Apache Cloudberry. PostInstall: - Master: "echo 'Please run psql -d mydatabase -f $GPHOME/share/postgresql/contrib/pgcrypto.sql to enable the package.'" diff --git a/contrib/pgcrypto/package/pgcrypto.spec b/contrib/pgcrypto/package/pgcrypto.spec index facb6d347ef..f257055237b 100644 --- a/contrib/pgcrypto/package/pgcrypto.spec +++ b/contrib/pgcrypto/package/pgcrypto.spec @@ -1,4 +1,4 @@ -Summary: Cryptographic functions for Cloudberry Database +Summary: Cryptographic functions for Apache Cloudberry License: PostgreSQL License Name: pgcrypto Version: %{pgcrypto_ver} @@ -10,7 +10,7 @@ AutoProv: no Provides: pgcrypto = %{pgcrypto_ver} %description -The Pgcrypto package provides cryptographic functions for the Cloudberry Database. +The Pgcrypto package provides cryptographic functions for the Apache Cloudberry. %install mkdir -p %{buildroot}/temp diff --git a/contrib/postgres_fdw/expected/gp_postgres_fdw.out b/contrib/postgres_fdw/expected/gp_postgres_fdw.out index b87509a350a..97aed11c890 100644 --- a/contrib/postgres_fdw/expected/gp_postgres_fdw.out +++ b/contrib/postgres_fdw/expected/gp_postgres_fdw.out @@ -83,7 +83,7 @@ CREATE TABLE "S 1"."GP 1" ( f2 text, f3 text ); -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'f1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'f1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. -- =================================================================== -- create foreign tables diff --git a/contrib/postgres_fdw/expected/mpp_postgres_fdw.out b/contrib/postgres_fdw/expected/mpp_postgres_fdw.out index 2d437c71782..301168c4c1d 100644 --- a/contrib/postgres_fdw/expected/mpp_postgres_fdw.out +++ b/contrib/postgres_fdw/expected/mpp_postgres_fdw.out @@ -29,28 +29,28 @@ CREATE DATABASE fdw2; CREATE DATABASE fdw3; \c fdw1 create table t1(a int, b text); -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. create table t2(a int, b text); -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. insert into t1 values(1, 'fdw1'); insert into t2 values(1, 'fdw1'); \c fdw2 create table t1(a int, b text); -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. create table t2(a int, b text); -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. insert into t1 values(1, 'fdw2'); insert into t2 values(1, 'fdw2'); \c fdw3 create table t1(a int, b text); -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. create table t2(a int, b text); -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'a' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. insert into t1 values(1, 'fdw3'); insert into t2 values(1, 'fdw3'); diff --git a/contrib/postgres_fdw/expected/postgres_fdw.out b/contrib/postgres_fdw/expected/postgres_fdw.out index 5257c366aba..2bd4a30ee34 100644 --- a/contrib/postgres_fdw/expected/postgres_fdw.out +++ b/contrib/postgres_fdw/expected/postgres_fdw.out @@ -9578,7 +9578,7 @@ SELECT count(*) FROM ft1; -- error here PREPARE TRANSACTION 'fdw_tpc'; -ERROR: PREPARE TRANSACTION is not yet supported in Cloudberry Database +ERROR: PREPARE TRANSACTION is not yet supported in Apache Cloudberry ROLLBACK; WARNING: there is no transaction in progress -- =================================================================== diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c index b68868d5472..9d8bd84a6f6 100644 --- a/contrib/postgres_fdw/postgres_fdw.c +++ b/contrib/postgres_fdw/postgres_fdw.c @@ -7627,7 +7627,7 @@ greenplumCheckIsCloudberry(UserMapping *user) if (PQntuples(res) == 0) pgfdw_report_error(ERROR, res, conn, true, query); - ret = strstr(PQgetvalue(res, 0, 0), "Cloudberry Database") ? 1 : 0; + ret = strstr(PQgetvalue(res, 0, 0), "Apache Cloudberry") ? 1 : 0; PQclear(res); ReleaseConnection(conn); diff --git a/contrib/vacuumlo/vacuumlo.c b/contrib/vacuumlo/vacuumlo.c index ef6d77937cf..64c869e35e1 100644 --- a/contrib/vacuumlo/vacuumlo.c +++ b/contrib/vacuumlo/vacuumlo.c @@ -483,7 +483,7 @@ main(int argc, char **argv) } if (strcmp(argv[1], "--version") == 0 || strcmp(argv[1], "-V") == 0) { - puts("vacuumlo (Cloudberry Database) " PG_VERSION); + puts("vacuumlo (Apache Cloudberry) " PG_VERSION); exit(0); } } diff --git a/deploy/README.md b/deploy/README.md index af356902a28..1c3170c44a1 100644 --- a/deploy/README.md +++ b/deploy/README.md @@ -20,7 +20,7 @@ Before you begin your automation build, make sure the following preparation work 1. Download the Cloudberry Database source code into your local machine: ```bash - git clone git@github.com:cloudberrydb/cloudberrydb.git + git clone https://github.com/apache/cloudberry.git ``` 2. Install the required [Vagrant](https://developer.hashicorp.com/vagrant/docs/installation) or [Docker](https://docs.docker.com/desktop/install/mac-install/) in your local environment, depending on your deployment preference. @@ -32,7 +32,7 @@ Before you begin your automation build, make sure the following preparation work 2. Start the automatic compilation and deployment process. ``` - $ cd /cloudberrydb/deploy/vagrant + $ cd /cloudberry/deploy/vagrant $ vagrant up ``` diff --git a/deploy/build/README.Linux.md b/deploy/build/README.Linux.md index e0406c7344c..55f34949107 100644 --- a/deploy/build/README.Linux.md +++ b/deploy/build/README.Linux.md @@ -12,10 +12,10 @@ Take the following steps to set up the development environments: ## Step 1. Clone the GitHub repo -Clone the GitHub repository `cloudberrydb/cloudberrydb` to the target machine: +Clone the GitHub repository `apache/cloudberry` to the target machine: ```shell -git clone https://github.com/cloudberrydb/cloudberrydb.git +git clone https://github.com/apache/cloudberry.git ``` ## Step 2. Install dependencies @@ -33,10 +33,10 @@ Enter the repository and install dependencies according to your operating system The following steps work on CentOS 7. For other CentOS versions, these steps might work but are not guaranteed to work. -1. Run the bash script `README.CentOS.bash` in the `deploy/build` directory of the `cloudberrydb/cloudberrydb` repository. To run this script, password is required. Then, some required dependencies will be automatically downloaded. +1. Run the bash script `README.CentOS.bash` in the `deploy/build` directory of the `apache/cloudberry` repository. To run this script, password is required. Then, some required dependencies will be automatically downloaded. ```bash - cd cloudberrydb/deploy/build + cd cloudberry/deploy/build ./README.CentOS.bash ``` @@ -84,7 +84,7 @@ The following steps work on CentOS 7. For other CentOS versions, these steps mig 3. Install more dependencies by running the `README.Rhel-Rocky.bash` script. ```bash - ~/cloudberrydb/deploy/build/README.Rhel-Rocky.bash + ~/cloudberry/deploy/build/README.Rhel-Rocky.bash ``` ### For Ubuntu 18.04 or later @@ -93,7 +93,7 @@ The following steps work on CentOS 7. For other CentOS versions, these steps mig ```shell # You need to enter your password to run. - sudo ~/cloudberrydb/deploy/build/README.Ubuntu.bash + sudo ~/cloudberry/deploy/build/README.Ubuntu.bash ``` > [!Note] @@ -149,18 +149,18 @@ After you have installed all the dependencies for your operating system, it is t After you have installed all the dependencies and performed the prerequisite platform tasks, you can start to build Apache Cloudberry. Run the following commands in sequence. -1. Configure the build environment. Enter the `cloudberrydb` directory and run the `configure` script. +1. Configure the build environment. Enter the `cloudberry` directory and run the `configure` script. ```bash - cd cloudberrydb - ./configure --with-perl --with-python --with-libxml --with-gssapi --prefix=/usr/local/cloudberrydb + cd cloudberry + ./configure --with-perl --with-python --with-libxml --with-gssapi --prefix=/usr/local/cloudberry ``` > [!Note] - > CloudberryDB is built with GPORCA by default. If you want to build CBDB without GPORCA, add the `--disable-orca` flag in the `./configure` command. + > Cloudberry is built with GPORCA by default. If you want to build CBDB without GPORCA, add the `--disable-orca` flag in the `./configure` command. > > ```bash - > ./configure --disable-orca --with-perl --with-python --with-libxml --prefix=/usr/local/cloudberrydb + > ./configure --disable-orca --with-perl --with-python --with-libxml --prefix=/usr/local/cloudberry > ``` 2. Compile the code and install the database. @@ -174,12 +174,12 @@ After you have installed all the dependencies and performed the prerequisite pla ```bash cd .. - cp -r cloudberrydb/ /home/gpadmin/ + cp -r cloudberry/ /home/gpadmin/ cd /home/gpadmin/ - chown -R gpadmin:gpadmin cloudberrydb/ + chown -R gpadmin:gpadmin cloudberry/ su - gpadmin - cd cloudberrydb/ - source /usr/local/cloudberrydb/greenplum_path.sh + cd cloudberry/ + source /usr/local/cloudberry/greenplum_path.sh ``` 4. Start the demo cluster. @@ -230,13 +230,13 @@ After you have installed all the dependencies and performed the prerequisite pla postgres=# select * from gp_segment_configuration; dbid | content | role | preferred_role | mode | status | port | hostname | address | datadir | warehouseid ------+---------+------+----------------+------+--------+------+------------+------------+------------------------------------------------------------------------------+------------- - 1 | -1 | p | p | n | u | 7000 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberrydb/gpAux/gpdemo/datadirs/qddir/demoDataDir-1 | 0 - 8 | -1 | m | m | s | u | 7001 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberrydb/gpAux/gpdemo/datadirs/standby | 0 - 3 | 1 | p | p | s | u | 7003 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberrydb/gpAux/gpdemo/datadirs/dbfast2/demoDataDir1 | 0 - 6 | 1 | m | m | s | u | 7006 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberrydb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1 | 0 - 2 | 0 | p | p | s | u | 7002 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberrydb/gpAux/gpdemo/datadirs/dbfast1/demoDataDir0 | 0 - 5 | 0 | m | m | s | u | 7005 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberrydb/gpAux/gpdemo/datadirs/dbfast_mirror1/demoDataDir0 | 0 - 4 | 2 | p | p | s | u | 7004 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberrydb/gpAux/gpdemo/datadirs/dbfast3/demoDataDir2 | 0 - 7 | 2 | m | m | s | u | 7007 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberrydb/gpAux/gpdemo/datadirs/dbfast_mirror3/demoDataDir2 | 0 + 1 | -1 | p | p | n | u | 7000 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberry/gpAux/gpdemo/datadirs/qddir/demoDataDir-1 | 0 + 8 | -1 | m | m | s | u | 7001 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberry/gpAux/gpdemo/datadirs/standby | 0 + 3 | 1 | p | p | s | u | 7003 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberry/gpAux/gpdemo/datadirs/dbfast2/demoDataDir1 | 0 + 6 | 1 | m | m | s | u | 7006 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberry/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1 | 0 + 2 | 0 | p | p | s | u | 7002 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberry/gpAux/gpdemo/datadirs/dbfast1/demoDataDir0 | 0 + 5 | 0 | m | m | s | u | 7005 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberry/gpAux/gpdemo/datadirs/dbfast_mirror1/demoDataDir0 | 0 + 4 | 2 | p | p | s | u | 7004 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberry/gpAux/gpdemo/datadirs/dbfast3/demoDataDir2 | 0 + 7 | 2 | m | m | s | u | 7007 | i-6wvpa9wt | i-6wvpa9wt | /home/gpadmin/cloudberry/gpAux/gpdemo/datadirs/dbfast_mirror3/demoDataDir2 | 0 (8 rows) ``` diff --git a/deploy/build/README.macOS.md b/deploy/build/README.macOS.md index b23a21a2f9e..58a9ff86178 100644 --- a/deploy/build/README.macOS.md +++ b/deploy/build/README.macOS.md @@ -50,7 +50,7 @@ source deploy/build/README.macOS.bash ## Step 3. Configure, compile, and install ```bash -# Run the following commands under the `cloudberrydb/` dir. +# Run the following commands under the `cloudberry/` dir. # 1. Configure the build environment. BREWPREFIX=$(brew --prefix); export PATH="$BREWPREFIX/opt/gnu-sed/libexec/gnubin:$BREWPREFIX/opt/apr/bin:$PATH"; CXXFLAGS="-I $BREWPREFIX/include" CFLAGS="-ggdb -Og -g3 -fno-omit-frame-pointer -I $BREWPREFIX/include" LDFLAGS="-L $BREWPREFIX/lib" CC=$(which gcc-13) CXX=$(which g++-13) ./configure --enable-debug --prefix=$(cd ~; pwd)/install/cbdb; @@ -108,14 +108,14 @@ source gpAux/gpdemo/gpdemo-env.sh postgres=# select * from gp_segment_configuration; dbid | content | role | preferred_role | mode | status | port | hostname | address | datadir | warehouseid ------+---------+------+----------------+------+--------+------+-----------------------------+-----------------------------+----------------------------------------------------------------------------------------------------------+------------- - 1 | -1 | p | p | n | u | 8000 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberrydb/gpAux/gpdemo/datadirs/qddir/demoDataDir-1 | 0 - 8 | -1 | m | m | s | u | 8001 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberrydb/gpAux/gpdemo/datadirs/standby | 0 - 3 | 1 | p | p | s | u | 8003 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberrydb/gpAux/gpdemo/datadirs/dbfast2/demoDataDir1 | 0 - 6 | 1 | m | m | s | u | 8006 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberrydb/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1 | 0 - 2 | 0 | p | p | s | u | 8002 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberrydb/gpAux/gpdemo/datadirs/dbfast1/demoDataDir0 | 0 - 5 | 0 | m | m | s | u | 8005 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberrydb/gpAux/gpdemo/datadirs/dbfast_mirror1/demoDataDir0 | 0 - 4 | 2 | p | p | s | u | 8004 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberrydb/gpAux/gpdemo/datadirs/dbfast3/demoDataDir2 | 0 - 7 | 2 | m | m | s | u | 8007 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberrydb/gpAux/gpdemo/datadirs/dbfast_mirror3/demoDataDir2 | 0 + 1 | -1 | p | p | n | u | 8000 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberry/gpAux/gpdemo/datadirs/qddir/demoDataDir-1 | 0 + 8 | -1 | m | m | s | u | 8001 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberry/gpAux/gpdemo/datadirs/standby | 0 + 3 | 1 | p | p | s | u | 8003 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberry/gpAux/gpdemo/datadirs/dbfast2/demoDataDir1 | 0 + 6 | 1 | m | m | s | u | 8006 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberry/gpAux/gpdemo/datadirs/dbfast_mirror2/demoDataDir1 | 0 + 2 | 0 | p | p | s | u | 8002 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberry/gpAux/gpdemo/datadirs/dbfast1/demoDataDir0 | 0 + 5 | 0 | m | m | s | u | 8005 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberry/gpAux/gpdemo/datadirs/dbfast_mirror1/demoDataDir0 | 0 + 4 | 2 | p | p | s | u | 8004 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberry/gpAux/gpdemo/datadirs/dbfast3/demoDataDir2 | 0 + 7 | 2 | m | m | s | u | 8007 | hashdatas-MacBook-Pro.local | hashdatas-MacBook-Pro.local | /Users/hashdata/Documents/GitHub/upstream/cloudberry/gpAux/gpdemo/datadirs/dbfast_mirror3/demoDataDir2 | 0 (8 rows) postgres=# @@ -128,5 +128,5 @@ source gpAux/gpdemo/gpdemo-env.sh make installcheck-world ``` -Congratulations 🎉! You've successfully installed and created a CloudberryDB cluster. Happy Hacking! 😉 +Congratulations 🎉! You've successfully installed and created a Cloudberry cluster. Happy Hacking! 😉 diff --git a/deploy/build/README.md b/deploy/build/README.md index 527548a0262..e47026826fd 100644 --- a/deploy/build/README.md +++ b/deploy/build/README.md @@ -11,15 +11,15 @@ This guides describes how to build Apache Cloudberry from source code. ## Build the database ``` -# Configure build environment to install at /usr/local/cloudberrydb -./configure --with-perl --with-python --with-libxml --with-gssapi --prefix=/usr/local/cloudberrydb +# Configure build environment to install at /usr/local/cloudberry +./configure --with-perl --with-python --with-libxml --with-gssapi --prefix=/usr/local/cloudberry # Compile and install make -j8 make -j8 install # Bring in greenplum environment for CBDB into your running shell -source /usr/local/cloudberrydb/greenplum_path.sh +source /usr/local/cloudberry/greenplum_path.sh # Start demo cluster make create-demo-cluster @@ -90,8 +90,8 @@ without GPORCA, configure requires `--disable-orca` flag to be set. # Clean environment make distclean -# Configure build environment to install at /usr/local/cloudberrydb -./configure --disable-orca --with-perl --with-python --with-libxml --prefix=/usr/local/cloudberrydb +# Configure build environment to install at /usr/local/cloudberry +./configure --disable-orca --with-perl --with-python --with-libxml --prefix=/usr/local/cloudberry ``` ## Building Apache Cloudberry with PXF diff --git a/doc/src/sgml/ref/alter_resource_queue.sgml b/doc/src/sgml/ref/alter_resource_queue.sgml index 1eab2d9bdf3..26a9751baea 100755 --- a/doc/src/sgml/ref/alter_resource_queue.sgml +++ b/doc/src/sgml/ref/alter_resource_queue.sgml @@ -245,7 +245,7 @@ ALTER RESOURCE QUEUE myqueue WITHOUT (MAX_COST, MEMORY_LIMIT); There is no ALTER RESOURCE QUEUE in the SQL standard. - Resource scheduling is a feature of Cloudberry Database. + Resource scheduling is a feature of Apache Cloudberry. diff --git a/doc/src/sgml/ref/alter_table.sgml b/doc/src/sgml/ref/alter_table.sgml index 1bb9514804c..3cda3010c4c 100644 --- a/doc/src/sgml/ref/alter_table.sgml +++ b/doc/src/sgml/ref/alter_table.sgml @@ -1138,7 +1138,7 @@ Where column_reference_storage_directive is: has subpartition encodings, the new partition inherits the storage directives for the subpartitions. For more information, search for "Precedence of Compression Settings" - in the Cloudberry Database Administrator Guide. + in the Apache Cloudberry Administrator Guide. diff --git a/doc/src/sgml/ref/create_external_table.sgml b/doc/src/sgml/ref/create_external_table.sgml index e958372b1ec..798b9a077cd 100755 --- a/doc/src/sgml/ref/create_external_table.sgml +++ b/doc/src/sgml/ref/create_external_table.sgml @@ -138,15 +138,15 @@ CREATE WRITABLE EXTERNAL WEB [TEMPORARY | TEMP] TABLE table_name SQL query against external data without requiring that data to first be loaded into the database. External tables provide an easy way to perform basic extraction, transformation, and loading (ETL) tasks that are common in data warehousing. - External table files are read in parallel by the Cloudberry Database segment instances, + External table files are read in parallel by the Apache Cloudberry segment instances, so they also provide a means for fast data loading. External tables should not be used for frequently queried tables. You may specify multiple external data sources or URIs (uniform resource identifiers) - with the LOCATION clause — up to the number of primary segment instances - in your Cloudberry Database array. Each URI points to an external data file or other data + with the LOCATION clause — up to the number of primary segment instances + in your Apache Cloudberry array. Each URI points to an external data file or other data source. These URIs do not need to exist prior to defining an external table (CREATE EXTERNAL TABLE does not validate the URIs specified). However you will get an error if they cannot be found when querying the external table. @@ -159,21 +159,21 @@ CREATE WRITABLE EXTERNAL WEB [TEMPORARY | TEMP] TABLE table_name - gpfdist — If using the gpfdist:// protocol, you must have the + gpfdist — If using the gpfdist:// protocol, you must have the Cloudberry file distribution program (gpfdist) running on the host where the external data files reside. This program points to a given directory on the file host and - serves external data files to all Cloudberry Database segments in parallel. + serves external data files to all Apache Cloudberry segments in parallel. All primary segments access the external file(s) in parallel regardless of how many URIs you specify when defining the external table. gpfdist - is located in $GPHOME/bin on your Cloudberry Database master host. + is located in $GPHOME/bin on your Apache Cloudberry master host. - file — If using the file:// protocol the external data file(s) + file — If using the file:// protocol the external data file(s) must reside on a segment host in a location accessible by the Cloudberry super user (gpadmin). The number of URIs specified corresponds to the number of segment instances that will work in parallel to access the external table. So for - example, if you have a Cloudberry Database system with 8 primary segments and + example, if you have a Apache Cloudberry system with 8 primary segments and you specify 2 external files, only 2 of the 8 segments will access the external table in parallel at query time. The number of external files per segment host cannot exceed the number of primary segment instances on that host. For example, @@ -184,11 +184,11 @@ CREATE WRITABLE EXTERNAL WEB [TEMPORARY | TEMP] TABLE table_name - http — If using the http:// protocol the external data file(s) + http — If using the http:// protocol the external data file(s) must reside on a web server that is accessible by the Cloudberry segment hosts. The number of URIs specified corresponds to the number of segment instances that will work in parallel to access the external table. So for example, - if you have a Cloudberry Database system with 8 primary segments and you specify 2 + if you have a Apache Cloudberry system with 8 primary segments and you specify 2 external files, only 2 of the 8 segments will access the external table in parallel at query time. @@ -199,7 +199,7 @@ CREATE WRITABLE EXTERNAL WEB [TEMPORARY | TEMP] TABLE table_name or comma separated values (CSV) format. If the data in the file does not use the default column delimiter, escape character, null string and so on, you must specify the additional formatting options so that the data in - the external file is read correctly by Cloudberry Database. + the external file is read correctly by Apache Cloudberry. @@ -418,7 +418,7 @@ CREATE WRITABLE EXTERNAL WEB [TEMPORARY | TEMP] TABLE table_name Compatibility - The CREATE EXTERNAL TABLE is a Cloudberry Database extension. + The CREATE EXTERNAL TABLE is a Apache Cloudberry extension. The SQL standard makes no provisions for external tables. diff --git a/doc/src/sgml/ref/create_resource_queue.sgml b/doc/src/sgml/ref/create_resource_queue.sgml index afd57fdf731..7e53ad7dae3 100755 --- a/doc/src/sgml/ref/create_resource_queue.sgml +++ b/doc/src/sgml/ref/create_resource_queue.sgml @@ -43,7 +43,7 @@ where queue_attribute is: CREATE RESOURCE QUEUE create a new resource queue - for Cloudberry Database workload management. A resource queue must have + for Apache Cloudberry workload management. A resource queue must have either an ACTIVE_STATEMENTS or a MAX_COST value (or it can have both). Only a superuser can create a resource queue. @@ -60,7 +60,7 @@ where queue_attribute is: Resource queues with a MAX_COST threshold set a maximum limit on the total cost of queries that can be executed by roles assigned to that queue. Cost is measured in the estimated total cost for the query as determined by the - Cloudberry Database query planner (as shown in the EXPLAIN output for a query). + Apache Cloudberry query planner (as shown in the EXPLAIN output for a query). Therefore, an administrator must be familiar with the queries typically executed on the system in order to set an appropriate cost threshold for a queue. Cost is measured in units of disk page fetches; 1.0 equals one sequential disk page read. @@ -275,7 +275,7 @@ CREATE RESOURCE QUEUE myqueue WITH (ACTIVE_STATEMENTS=30, MAX_COST=5000.00); There is no CREATE RESOURCE QUEUE in the SQL standard. - Resource scheduling is a feature of Cloudberry Database. + Resource scheduling is a feature of Apache Cloudberry. diff --git a/doc/src/sgml/ref/create_table.sgml b/doc/src/sgml/ref/create_table.sgml index 6213eb4c47a..aa0dc14c6e6 100644 --- a/doc/src/sgml/ref/create_table.sgml +++ b/doc/src/sgml/ref/create_table.sgml @@ -227,7 +227,7 @@ Where column_reference_storage_directive is: a column constraint is only a notational convenience for use when the constraint only affects one column. For more information, search for - "Column-level Compression" in the Cloudberry Database Administrator Guide. + "Column-level Compression" in the Apache Cloudberry Administrator Guide. diff --git a/doc/src/sgml/ref/create_trigger.sgml b/doc/src/sgml/ref/create_trigger.sgml index c90a9e1b20d..67a8f9ae3b1 100644 --- a/doc/src/sgml/ref/create_trigger.sgml +++ b/doc/src/sgml/ref/create_trigger.sgml @@ -21,7 +21,7 @@ PostgreSQL documentation CREATE TRIGGER - define a new trigger (user-defined triggers are not fully supported in Cloudberry Database) + define a new trigger (user-defined triggers are not fully supported in Apache Cloudberry) diff --git a/doc/src/sgml/ref/drop_resource_queue.sgml b/doc/src/sgml/ref/drop_resource_queue.sgml index 4d5ec8f68fc..4bd0c9b1089 100755 --- a/doc/src/sgml/ref/drop_resource_queue.sgml +++ b/doc/src/sgml/ref/drop_resource_queue.sgml @@ -97,7 +97,7 @@ ALTER ROLE RESOURCE QUEUE none; There is no DROP RESOURCE QUEUE in the SQL standard. - Resource scheduling is a feature of Cloudberry Database. + Resource scheduling is a feature of Apache Cloudberry. diff --git a/gpAux/BUILD_INSTRUCTIONS b/gpAux/BUILD_INSTRUCTIONS index 19ab2fa2d02..8b3a382b7dd 100644 --- a/gpAux/BUILD_INSTRUCTIONS +++ b/gpAux/BUILD_INSTRUCTIONS @@ -4,7 +4,7 @@ ## |_____| |_____] |_____/ |_____] ## ## ---------------------------------------------------------------------- -## Instruction for Building the Cloudberry Database, Clients, +## Instruction for Building the Apache Cloudberry, Clients, ## Loaders, Connectivity and GPPkgs ## ====================================================================== @@ -23,7 +23,7 @@ You will need the following tools: perl 5.8.8 tar (GNU) 1.14 -To build the Cloudberry Database, run GNU make with the following options: +To build the Apache Cloudberry, run GNU make with the following options: ## -------------------- ## For a debug build: diff --git a/gpAux/Makefile b/gpAux/Makefile index a1965612b25..6502cffd0c4 100644 --- a/gpAux/Makefile +++ b/gpAux/Makefile @@ -1,5 +1,5 @@ #--------------------------------------------------------------------- -# Makefile for Cloudberry Database +# Makefile for Apache Cloudberry #--------------------------------------------------------------------- # keep the default target above any targets from included makefiles diff --git a/gpAux/Makefile.thirdparty b/gpAux/Makefile.thirdparty index 517d5465b5e..7579e4d32b9 100644 --- a/gpAux/Makefile.thirdparty +++ b/gpAux/Makefile.thirdparty @@ -1,5 +1,5 @@ # ---------------------------------------------------------------------- -# Cloudberry Database ThirdParty Library Makefile +# Apache Cloudberry ThirdParty Library Makefile # # This file controls which thirdparty libraries are made available to # the build of our product(s). diff --git a/gpAux/client/install/src/windows/greenplum-clients.wxs b/gpAux/client/install/src/windows/greenplum-clients.wxs index 5e2b44fe190..c61fb54d2c8 100755 --- a/gpAux/client/install/src/windows/greenplum-clients.wxs +++ b/gpAux/client/install/src/windows/greenplum-clients.wxs @@ -1174,9 +1174,9 @@ If you want to review or change any of your installation settings, click Back. C - + - + diff --git a/gpAux/gpdemo/Makefile b/gpAux/gpdemo/Makefile index fb3be19f7bc..b6e794e57ab 100644 --- a/gpAux/gpdemo/Makefile +++ b/gpAux/gpdemo/Makefile @@ -1,5 +1,5 @@ # ---------------------------------------------------------------------- -# Makefile for Cloudberry Database Demo +# Makefile for Apache Cloudberry Demo # ---------------------------------------------------------------------- # diff --git a/gpAux/gpdemo/README b/gpAux/gpdemo/README index 01ac455df00..6af14b441de 100644 --- a/gpAux/gpdemo/README +++ b/gpAux/gpdemo/README @@ -2,11 +2,11 @@ ABOUT GP DEMO ****************************************************************** -The GP demo program will setup a virtual Cloudberry Database system +The GP demo program will setup a virtual Apache Cloudberry system on a single host. It creates and starts a GP coordinator instance and three segment instances (three primary and three mirror segments) within the same directory. Running GP demo is a good way to test -your initial installation before deploying the Cloudberry Database +your initial installation before deploying the Apache Cloudberry software on a multi-host array. It is also a good way to become familiar with the system without investing the time involved in a multi-host setup. @@ -20,7 +20,7 @@ space, and have the TCP ports defined in gpAux/gpdemo/Makefile free. * Verify that your $USER environment variable is set. -* Cloudberry Database recommends using the bash shell to run the +* Apache Cloudberry recommends using the bash shell to run the GP demo programs. ****************************************************************** @@ -61,8 +61,8 @@ RUNNING GP DEMO \q -7. See the Cloudberry Database User Guide for more information on - using your Cloudberry Database system. +7. See the Apache Cloudberry User Guide for more information on + using your Apache Cloudberry system. ****************************************************************** @@ -73,7 +73,7 @@ REMOVING GP DEMO gpdemo -d -2. This will stop all Cloudberry Database demo server processes +2. This will stop all Apache Cloudberry demo server processes and remove all files and directories created by the GP demo program. diff --git a/gpAux/gpdemo/demo_cluster.sh b/gpAux/gpdemo/demo_cluster.sh index d036b725a0d..067cfd5bc78 100755 --- a/gpAux/gpdemo/demo_cluster.sh +++ b/gpAux/gpdemo/demo_cluster.sh @@ -182,7 +182,7 @@ if [ -z "${GPHOME}" ]; then echo "FATAL: The GPHOME environment variable is not set." echo "" echo " You can set it by sourcing the greenplum_path.sh" - echo " file in your CloudberryDB installation directory." + echo " file in your Cloudberry installation directory." echo "" exit 1 fi @@ -202,13 +202,13 @@ EOF if [ "${WITH_MIRRORS}" == "true" ]; then cat <<-EOF - This is a MIRRORED demo of the Cloudberry Database system. We will create + This is a MIRRORED demo of the Apache Cloudberry system. We will create a cluster installation with coordinator and `expr 2 \* ${NUM_PRIMARY_MIRROR_PAIRS}` segment instances (${NUM_PRIMARY_MIRROR_PAIRS} primary & ${NUM_PRIMARY_MIRROR_PAIRS} mirror). EOF elif [ "${WITH_MIRRORS}" == "false" ]; then cat <<-EOF - This is a MIRRORLESS demo of the Cloudberry Database system. We will create + This is a MIRRORLESS demo of the Apache Cloudberry system. We will create a cluster installation with coordinator and ${NUM_PRIMARY_MIRROR_PAIRS} segment instances. EOF fi @@ -235,17 +235,17 @@ GPPATH=`find -H $GPHOME -name gpstart| tail -1` RETVAL=$? if [ "$RETVAL" -ne 0 ]; then - echo "Error attempting to find CloudberryDB executables in $GPHOME" + echo "Error attempting to find Cloudberry executables in $GPHOME" exit 1 fi if [ ! -x "$GPPATH" ]; then - echo "No executables found for CloudberryDB installation in $GPHOME" + echo "No executables found for Cloudberry installation in $GPHOME" exit 1 fi GPPATH=`dirname $GPPATH` if [ ! -x $GPPATH/gpinitsystem ]; then - echo "No mgmt executables(gpinitsystem) found for CloudberryDB installation in $GPPATH" + echo "No mgmt executables(gpinitsystem) found for Cloudberry installation in $GPPATH" exit 1 fi @@ -297,7 +297,7 @@ cat >> $CLUSTER_CONFIG <<-EOF # This names the data directories for the Segment Instances and the Entry Postmaster SEG_PREFIX=$SEG_PREFIX - # This is the port at which to contact the resulting Cloudberry database, e.g. + # This is the port at which to contact the resulting Apache Cloudberry, e.g. # psql -p \$PORT_BASE -d template1 PORT_BASE=${DEMO_PORT_BASE} diff --git a/gpAux/gpdemo/probe_config.sh b/gpAux/gpdemo/probe_config.sh index 5a5fee2710f..02332374a43 100755 --- a/gpAux/gpdemo/probe_config.sh +++ b/gpAux/gpdemo/probe_config.sh @@ -1,12 +1,12 @@ #!/usr/bin/env bash #*********************************************************** -# Look for Cloudberry Database executables to find path +# Look for Apache Cloudberry executables to find path #*********************************************************** if [ x"$GPHOME" = x ]; then if [ x"$BIZHOME" = x ]; then echo "Neither GPHOME or BIZHOME are set. Set one of these variables to point to the location" - echo "of the Cloudberry Database installation directory." + echo "of the Apache Cloudberry installation directory." echo "" exit 1 else @@ -20,12 +20,12 @@ GPPATH=`find $GPSEARCH -name gpstart | tail -1` RETVAL=$? if [ "$RETVAL" -ne 0 ]; then - echo "Error attempting to find Cloudberry Database executables in $GPSEARCH" + echo "Error attempting to find Apache Cloudberry executables in $GPSEARCH" exit 1 fi if [ ! -x "$GPPATH" ]; then - echo "No executables found for Cloudberry Database installation in $GPSEARCH" + echo "No executables found for Apache Cloudberry installation in $GPSEARCH" exit 1 fi GPPATH=`dirname $GPPATH` diff --git a/gpMgmt/bin/README.gpexpand.md b/gpMgmt/bin/README.gpexpand.md index 1a652420db8..186d66b67c6 100644 --- a/gpMgmt/bin/README.gpexpand.md +++ b/gpMgmt/bin/README.gpexpand.md @@ -1,7 +1,7 @@ -# gpexpand for Cloudberry Database +# gpexpand for Apache Cloudberry gpexpand is one Greenplum cluster expansion tool for Cloudberry -Database which expands an existing Greenplum/Cloudberry Database by +Database which expands an existing Greenplum/Apache Cloudberry by adding new hosts to the cluster. gpexpand has two phases: diff --git a/gpMgmt/bin/README.md b/gpMgmt/bin/README.md index a1600a9d662..e28809bd86e 100644 --- a/gpMgmt/bin/README.md +++ b/gpMgmt/bin/README.md @@ -28,20 +28,20 @@ Where Things Go List of Management Scripts Written in Bash ------------------------------------------ -bin/gpinitsystem - Creates a new Cloudberry Database +bin/gpinitsystem - Creates a new Apache Cloudberry bin/gpload - Sets env variables and calls gpload.py List of Management Scripts Written in Python (no libraries) ----------------------------------------------------------- -bin/gpload.py - Loads data into a Cloudberry Database +bin/gpload.py - Loads data into a Apache Cloudberry List of Management Scripts Written in Python (gpmlib - old libraries) --------------------------------------------------------------------- bin/gpaddmirrors - Adds mirrors to an array (needs rewrite) bin/gprecoverseg - Recovers a failed segment (needs rewrite) -bin/gpcheckperf - Checks the hardware for Cloudberry Database +bin/gpcheckperf - Checks the hardware for Apache Cloudberry bin/gpsync - Copies files to many hosts bin/gpssh - Remote shell to many hosts bin/gpssh-exkeys - Exchange ssh keys between many hosts @@ -51,12 +51,12 @@ List of Management Scripts Written in Python (gppylib - current libraries) -------------------------------------------------------------------------- bin/gpactivatestandby - Activates the Standby Coordinator bin/gpconfig_helper - Edits postgresql.conf file for all segments -bin/gpdeletesystem - Deletes a Cloudberry Database -bin/gpexpand - Adds additional segments to a Cloudberry Database +bin/gpdeletesystem - Deletes a Apache Cloudberry +bin/gpexpand - Adds additional segments to a Apache Cloudberry bin/gpinitstandby - Initializes standby coordinator bin/gplogfilter - Filters log files -bin/gpstart - Start a Cloudberry Database -bin/gpstop - Stop a Cloudberry Database +bin/gpstart - Start a Apache Cloudberry +bin/gpstop - Stop a Apache Cloudberry sbin/gpconfig_helper.py - Helper script for gpconfig sbin/gpsegcopy - Helper script for gpexpand @@ -76,7 +76,7 @@ gparray.py +- SegmentPair - Configuration information for a single content id | \- Contains multiple Segment objects | - +- GpArray - Configuration information for a Cloudberry Database + +- GpArray - Configuration information for a Apache Cloudberry \- Contains multiple SegmentPair objects gplog.py - Utility functions to assist in Cloudberry standard logging diff --git a/gpMgmt/bin/gpactivatestandby b/gpMgmt/bin/gpactivatestandby index 813d6cd3f75..53f2f925f94 100755 --- a/gpMgmt/bin/gpactivatestandby +++ b/gpMgmt/bin/gpactivatestandby @@ -157,7 +157,7 @@ def print_results(array, hostname, options): logger.info('to set this value.') logger.info('COORDINATOR_PORT is now %d, if this has changed, you' % array.coordinator.getSegmentPort()) logger.info('may need to make additional configuration changes to allow access') - logger.info('to the CloudberryDB instance.') + logger.info('to the Cloudberry instance.') logger.info('Refer to the Administrator Guide for instructions on how to re-activate') logger.info('the coordinator to its previous state once it becomes available.') logger.info('Query planner statistics must be updated on all databases') diff --git a/gpMgmt/bin/gpcheckcat b/gpMgmt/bin/gpcheckcat index 4150acbae4e..a617438c913 100755 --- a/gpMgmt/bin/gpcheckcat +++ b/gpMgmt/bin/gpcheckcat @@ -204,7 +204,7 @@ def getversion(): db = connect() curs = db.query(''' select regexp_replace(version(), - E'.*PostgreSQL [^ ]+ .Cloudberry Database ([1-9]+.[0-9]+|main).*', + E'.*PostgreSQL [^ ]+ .Apache Cloudberry ([1-9]+.[0-9]+|main).*', E'\\\\1') as ver;''') row = curs.getresult()[0] @@ -3352,7 +3352,7 @@ def main(): GV.version = getversion() # Our current implementation does always support gpcheckcat #if GV.version < "4.0": - # myprint("Error: only Cloudberry database version >= 4.0 are supported\n") + # myprint("Error: only Apache Cloudberry version >= 4.0 are supported\n") # sys.exit(GV.retcode) check_test_subset_parameter_count() diff --git a/gpMgmt/bin/gpcheckperf b/gpMgmt/bin/gpcheckperf index c4b61b0f399..6048d7f08c0 100755 --- a/gpMgmt/bin/gpcheckperf +++ b/gpMgmt/bin/gpcheckperf @@ -1,6 +1,6 @@ #!/usr/bin/env python3 """ -gpcheckperf -- Check the hardware for Cloudberry Database +gpcheckperf -- Check the hardware for Apache Cloudberry Usage: gpcheckperf diff --git a/gpMgmt/bin/gpdeletesystem b/gpMgmt/bin/gpdeletesystem index e7832518f18..8299d86d820 100755 --- a/gpMgmt/bin/gpdeletesystem +++ b/gpMgmt/bin/gpdeletesystem @@ -149,19 +149,19 @@ def parseargs(): # ------------------------------------------------------------------------- def display_params(options, dburl, standby, segments, dumpDirsExist): global g_warnings_generated - logger.info('CloudberryDB Instance Deletion Parameters') + logger.info('Cloudberry Instance Deletion Parameters') logger.info('--------------------------------------') - logger.info('CloudberryDB Coordinator hostname = %s' % dburl.pghost) - logger.info('CloudberryDB Coordinator data directory = %s' % options.coordinator_data_dir) - logger.info('CloudberryDB Coordinator port = %s' % dburl.pgport) + logger.info('Cloudberry Coordinator hostname = %s' % dburl.pghost) + logger.info('Cloudberry Coordinator data directory = %s' % options.coordinator_data_dir) + logger.info('Cloudberry Coordinator port = %s' % dburl.pgport) if standby: - logger.info('CloudberryDB Coordinator standby host = %s' % standby.getSegmentHostName()) - logger.info('CloudberryDB Coordinator standby data directory = %s' % standby.getSegmentDataDirectory()) - logger.info('CloudberryDB Coordinator standby port = %s' % standby.getSegmentPort()) + logger.info('Cloudberry Coordinator standby host = %s' % standby.getSegmentHostName()) + logger.info('Cloudberry Coordinator standby data directory = %s' % standby.getSegmentDataDirectory()) + logger.info('Cloudberry Coordinator standby port = %s' % standby.getSegmentPort()) if options.force: - logger.info('CloudberryDB Force delete of dump files = ON') + logger.info('Cloudberry Force delete of dump files = ON') else: - logger.info('CloudberryDB Force delete of dump files = OFF') + logger.info('Cloudberry Force delete of dump files = OFF') logger.info('Batch size = %s' % options.batch_size) logger.info('--------------------------------------') logger.info(' Segment Instance List ') @@ -173,14 +173,14 @@ def display_params(options, dburl, standby, segments, dumpDirsExist): port = segdb.getSegmentPort() logger.info('%s:%s:%s' % (host, datadir, port)) - yn = ask_yesno('', 'Continue with CloudberryDB instance deletion?', 'N') + yn = ask_yesno('', 'Continue with Cloudberry instance deletion?', 'N') if yn: - logger.info('FINAL WARNING, you are about to delete the CloudberryDB instance') + logger.info('FINAL WARNING, you are about to delete the Cloudberry instance') logger.info('on coordinator host %s.' % dburl.pghost) if dumpDirsExist and options.force: logger.warn('There are database dump files, these will be DELETED if you continue!') g_warnings_generated = True - yn = ask_yesno('', 'Continue with CloudberryDB instance deletion?', 'N') + yn = ask_yesno('', 'Continue with Cloudberry instance deletion?', 'N') if not yn: raise GpDeleteSystemException('User canceled') else: diff --git a/gpMgmt/bin/gpdemo b/gpMgmt/bin/gpdemo index 502fa3004aa..0717136d20a 100755 --- a/gpMgmt/bin/gpdemo +++ b/gpMgmt/bin/gpdemo @@ -46,7 +46,7 @@ for filename in "${CHECK_FILENAME[@]}"; do echo "Missing $checking" echo "" echo "This may be caused by incomplete installation or packaging error." - echo "Try to re-install CloudBerryDB. If it doesn't help, contact support." + echo "Try to re-install Cloudberry. If it doesn't help, contact support." exit 1 fi done diff --git a/gpMgmt/bin/gpdirtableload b/gpMgmt/bin/gpdirtableload index 8e56f601d91..75e30a35136 100755 --- a/gpMgmt/bin/gpdirtableload +++ b/gpMgmt/bin/gpdirtableload @@ -324,7 +324,7 @@ class gpdirtableload: self.setup_connection(recurse) else: self.log(self.ERROR, "could not connect to database: %s. Is " \ - "the Cloudberry Database running on port %i?" % (errorMessage, + "the Apache Cloudberry running on port %i?" % (errorMessage, self.options.port)) def isDirectoryMode(self): diff --git a/gpMgmt/bin/gpexpand b/gpMgmt/bin/gpexpand index 7f65ce0946c..864d746d2af 100755 --- a/gpMgmt/bin/gpexpand +++ b/gpMgmt/bin/gpexpand @@ -652,7 +652,7 @@ class SegmentTemplate: self.conn.close() - # pg_basebackup in CloudberryDB need a parameter 'target_gp_dbid' + # pg_basebackup in Cloudberry need a parameter 'target_gp_dbid' # it uses it to create tablespace-related data dirs in corresponding # tablespace locations. Here we are using pg_basebackup to create # a template for gpexpand so we can just provide a dummyDBID @@ -679,7 +679,7 @@ class SegmentTemplate: def _handle_tablespace_template(self, dummyDBID, newTableSpaceInfo): """ - If there are user-created tablespaces in CloudberryDB cluster, we + If there are user-created tablespaces in Cloudberry cluster, we have to pack them into the template. The logic here contains two steps: 1. move the tablespace files generated by pg_basebackup into the @@ -1207,7 +1207,7 @@ class gpexpand: def read_tablespace_file(self): """ - If there are user-created tablespaces in CloudberryDB cluster, + If there are user-created tablespaces in Cloudberry cluster, it returns a python dict, otherwise returns None. The python dict is like: newTableSpaceInfo is a python dict, its type spec is: @@ -1900,7 +1900,7 @@ WHERE synchronization of packages. We should *not* disturb the user's attempts to expand. """ try: - logger.info('Syncing Cloudberry Database extensions') + logger.info('Syncing Apache Cloudberry extensions') new_segment_list = self.gparray.getExpansionSegDbList() new_host_set = set([h.getSegmentHostName() for h in new_segment_list]) operations = [SyncPackages(host) for host in new_host_set] @@ -1909,7 +1909,7 @@ WHERE for operation in operations: operation.get_ret() except Exception: - logger.exception('Syncing of Cloudberry Database extensions has failed.') + logger.exception('Syncing of Apache Cloudberry extensions has failed.') logger.warning('Please run gppkg --clean after successful expansion.') def validate_heap_checksums(self): @@ -2430,7 +2430,7 @@ def main(options, args, parser): gparray = GpArray.initFromCatalog(dburl, utility=True) except DatabaseError as ex: logger.error('Failed to connect to database. Make sure the') - logger.error('CloudberryDB instance you wish to expand is running') + logger.error('Cloudberry instance you wish to expand is running') logger.error('and that your environment is correct, then rerun') logger.error('gexpand ' + ' '.join(sys.argv[1:])) sys.exit(1) @@ -2537,7 +2537,7 @@ def main(options, args, parser): sys.exit(0) except ValidationError: - logger.info('Bringing Cloudberry Database back online...') + logger.info('Bringing Apache Cloudberry back online...') if _gp_expand is not None: _gp_expand.shutdown() sys.exit() diff --git a/gpMgmt/bin/gpinitstandby b/gpMgmt/bin/gpinitstandby index 380a288e841..3e0ee7516bf 100755 --- a/gpMgmt/bin/gpinitstandby +++ b/gpMgmt/bin/gpinitstandby @@ -44,19 +44,19 @@ DEFAULT_BATCH_SIZE=16 PG_HBA_BACKUP = 'pg_hba.conf.gpinitstandby.bak' _description = """The gpinitstandby utility adds a backup coordinator host to your -Cloudberry Database system. If your system has an existing backup +Apache Cloudberry system. If your system has an existing backup coordinator host configured, use the -r option to remove it before adding the new standby coordinator host. Before running this utility, make sure -that the Cloudberry Database software is installed on the backup coordinator +that the Apache Cloudberry software is installed on the backup coordinator host and that you have exchanged SSH keys between hosts. This utility should be run on the currently active primary coordinator host. The utility will perform the following steps: -* Update the Cloudberry Database system catalog to remove the +* Update the Apache Cloudberry system catalog to remove the existing backup coordinator host information (if the -r option is supplied) -* Update the Cloudberry Database system catalog to add the new backup +* Update the Apache Cloudberry system catalog to add the new backup coordinator host information (use the -n option to skip this step) * Edit the pg_hba.conf files of the segment instances to allow access from the newly added standby coordinator. @@ -193,19 +193,19 @@ def print_summary(options, array, standby_datadir, unreachable_hosts=[]): if options.remove: logger.info('Warm coordinator standby removal parameters') else: - logger.info('CloudberryDB standby coordinator initialization parameters') + logger.info('Cloudberry standby coordinator initialization parameters') logger.info('-----------------------------------------------------') - logger.info('CloudberryDB coordinator hostname = %s' \ + logger.info('Cloudberry coordinator hostname = %s' \ % array.coordinator.getSegmentHostName()) - logger.info('CloudberryDB coordinator data directory = %s' \ + logger.info('Cloudberry coordinator data directory = %s' \ % array.coordinator.getSegmentDataDirectory()) - logger.info('CloudberryDB coordinator port = %s' \ + logger.info('Cloudberry coordinator port = %s' \ % array.coordinator.getSegmentPort()) if options.remove: - logger.info('CloudberryDB standby coordinator hostname = %s' \ + logger.info('Cloudberry standby coordinator hostname = %s' \ % array.standbyCoordinator.getSegmentHostName()) else: - logger.info('CloudberryDB standby coordinator hostname = %s' \ + logger.info('Cloudberry standby coordinator hostname = %s' \ % options.standby_host) if array.standbyCoordinator: @@ -215,22 +215,22 @@ def print_summary(options, array, standby_datadir, unreachable_hosts=[]): else: standby_port = array.coordinator.getSegmentPort() - logger.info('CloudberryDB standby coordinator port = %d' \ + logger.info('Cloudberry standby coordinator port = %d' \ % standby_port) if array.standbyCoordinator: - logger.info('CloudberryDB standby coordinator data directory = %s' \ + logger.info('Cloudberry standby coordinator data directory = %s' \ % array.standbyCoordinator.getSegmentDataDirectory()) else: if standby_datadir: - logger.info('CloudberryDB standby coordinator data directory = %s' % standby_datadir) + logger.info('Cloudberry standby coordinator data directory = %s' % standby_datadir) else: raise GpInitStandbyException('No data directory specified for standby coordinator') if not options.remove and options.no_update: - logger.info('CloudberryDB update system catalog = Off') + logger.info('Cloudberry update system catalog = Off') elif not options.remove: - logger.info('CloudberryDB update system catalog = On') + logger.info('Cloudberry update system catalog = On') # Confirm the action if options.confirm: @@ -391,10 +391,10 @@ def create_standby(options): # synchronization of packages. We should *not* disturb the user's attempts # initialize a standby. try: - logger.info('Syncing Cloudberry Database extensions to standby') + logger.info('Syncing Apache Cloudberry extensions to standby') SyncPackages(options.standby_host).run() except Exception as e: - logger.warning('Syncing of Cloudberry Database extensions has failed.') + logger.warning('Syncing of Apache Cloudberry extensions has failed.') logger.warning('Please run gppkg --clean after successful standby initialization.') # Disable Ctrl-C diff --git a/gpMgmt/bin/gpinitsystem b/gpMgmt/bin/gpinitsystem index 81bad01cbef..471a9622dd5 100755 --- a/gpMgmt/bin/gpinitsystem +++ b/gpMgmt/bin/gpinitsystem @@ -48,7 +48,7 @@ VERBOSE=1 INTERACTIVE=1 MIRRORING=0 INST_COUNT=0 -# Cloudberry database specific parameters +# Apache Cloudberry specific parameters GP_USER=$USER_NAME # System table names GP_TBL=gp_id @@ -120,7 +120,7 @@ USAGE () { $ECHO $ECHO " `basename $0` -c gp_config_file [OPTIONS]" $ECHO - $ECHO " Creates a new Cloudberry Database instance on a Coordinator host and a number of" + $ECHO " Creates a new Apache Cloudberry instance on a Coordinator host and a number of" $ECHO " segment instance hosts." $ECHO $ECHO " General options:" @@ -140,19 +140,19 @@ USAGE () { $ECHO " Applies to coordinator and all segments." $ECHO " -B, run this batch of create segment processes in parallel [default $BATCH_DEFAULT]" $ECHO " -c, gp_config_file [mandatory]" - $ECHO " Supplies all CloudberryDB configuration information required by this utility." + $ECHO " Supplies all Cloudberry configuration information required by this utility." $ECHO " Full description of all parameters contained within the example file" $ECHO " supplied with this distribution." $ECHO " Also see gpinitsystem_INSTRUCTIONS file for greater detail on" $ECHO " the operation and configuration of this script" - $ECHO " -e, , password to set for CloudberryDB superuser in database [default $GP_PASSWD]" + $ECHO " -e, , password to set for Cloudberry superuser in database [default $GP_PASSWD]" $ECHO " -S, standby_datadir [optional]" $ECHO " -h, gp_hostlist_file [optional]" $ECHO " Contains a list of all segment instance hostnames required to participate in" - $ECHO " the new CloudberryDB instance. Normally set in gp_config_file." + $ECHO " the new Cloudberry instance. Normally set in gp_config_file." $ECHO " -I, " $ECHO " The full path and filename of an input configuration file, which defines the" - $ECHO " Cloudberry Database members and segments using the QD_PRIMARY_ARRAY and" + $ECHO " Apache Cloudberry members and segments using the QD_PRIMARY_ARRAY and" $ECHO " PRIMARY_ARRAY parameters. The input configuration file is typically created by" $ECHO " using gpinitsystem with the -O option. You must" $ECHO " provide either the -c option or the -I" @@ -160,15 +160,15 @@ USAGE () { $ECHO " -m, maximum number of connections for coordinator instance [default ${DEFAULT_QD_MAX_CONNECT}]" $ECHO " -n, , setting for locale to be set when database initialized [defaults to system locale]" $ECHO " -O, " - $ECHO " When used with the -O option, gpinitsystem does not create a new CloudberryDB" + $ECHO " When used with the -O option, gpinitsystem does not create a new Cloudberry" $ECHO " Database cluster but instead writes the supplied cluster configuration" $ECHO " information to the specified output_configuration_file. This file defines" - $ECHO " Cloudberry Database members and segments using the QD_PRIMARY_ARRAY and" + $ECHO " Apache Cloudberry members and segments using the QD_PRIMARY_ARRAY and" $ECHO " PRIMARY_ARRAY parameters, and can be later used with -I" $ECHO " to initialize a new cluster." $ECHO " -p, postgresql_conf_gp_additions [optional]" $ECHO " List of additional PostgreSQL parameters to be applied to each Coordinator/Segment" - $ECHO " postgresql.conf file during Cloudberry Database initialization." + $ECHO " postgresql.conf file during Apache Cloudberry initialization." $ECHO " -P, standby_port [optional]" $ECHO " -s, standby_hostname [optional]" $ECHO " -U, Use external FTS, default false" @@ -268,7 +268,7 @@ CHK_PARAMS () { $CAT $CLUSTER_CONFIG|$GREP -v "^\s*\(#.*\)\?$" >> $LOG_FILE LOG_MSG "[INFO]:-Completed $CLUSTER_CONFIG dump to logfile" # Source the cluster configuration file - LOG_MSG "[INFO]:-Reading CloudberryDB configuration file $CLUSTER_CONFIG" 1 + LOG_MSG "[INFO]:-Reading Cloudberry configuration file $CLUSTER_CONFIG" 1 . $CLUSTER_CONFIG ASSIGN_COORDINATOR_VARS @@ -285,7 +285,7 @@ CHK_PARAMS () { fi else - LOG_MSG "[INFO]:-Reading CloudberryDB input configuration file $INPUT_CONFIG" + LOG_MSG "[INFO]:-Reading Cloudberry input configuration file $INPUT_CONFIG" READ_INPUT_CONFIG fi @@ -1112,7 +1112,7 @@ DISPLAY_CONFIG () { export QD_DIR=$GP_DIR if [ x"" != x"$INTERACTIVE" ];then SET_VAR $QD_PRIMARY_ARRAY - LOG_MSG "[INFO]:-Cloudberry Database Creation Parameters" 1 + LOG_MSG "[INFO]:-Apache Cloudberry Creation Parameters" 1 LOG_MSG "[INFO]:---------------------------------------" 1 LOG_MSG "[INFO]:-Coordinator Configuration" 1 LOG_MSG "[INFO]:---------------------------------------" 1 @@ -1120,7 +1120,7 @@ DISPLAY_CONFIG () { LOG_MSG "[INFO]:-Coordinator port = $COORDINATOR_PORT" 1 LOG_MSG "[INFO]:-Coordinator instance dir = $GP_DIR" 1 LOG_MSG "[INFO]:-Coordinator LOCALE = $LOCALE_SETTING" 1 - LOG_MSG "[INFO]:-CloudberryDB segment prefix = $SEG_PREFIX" 1 + LOG_MSG "[INFO]:-Cloudberry segment prefix = $SEG_PREFIX" 1 LOG_MSG "[INFO]:-Coordinator Database = $DATABASE_NAME" 1 LOG_MSG "[INFO]:-Coordinator connections = $COORDINATOR_MAX_CONNECT" 1 LOG_MSG "[INFO]:-Coordinator buffers = $COORDINATOR_SHARED_BUFFERS" 1 @@ -1183,7 +1183,7 @@ DISPLAY_CONFIG () { LOG_MSG "[INFO]:-Mirroring config = OFF" 1 fi LOG_MSG "[INFO]:----------------------------------------" 1 - LOG_MSG "[INFO]:-CloudberryDB Primary Segment Configuration" 1 + LOG_MSG "[INFO]:-Cloudberry Primary Segment Configuration" 1 LOG_MSG "[INFO]:----------------------------------------" 1 for I in "${QE_PRIMARY_ARRAY[@]}" do @@ -1192,7 +1192,7 @@ DISPLAY_CONFIG () { done if [ $MIRRORING -ne 0 ]; then LOG_MSG "[INFO]:---------------------------------------" 1 - LOG_MSG "[INFO]:-CloudberryDB Mirror Segment Configuration" 1 + LOG_MSG "[INFO]:-Cloudberry Mirror Segment Configuration" 1 LOG_MSG "[INFO]:---------------------------------------" 1 for I in "${QE_MIRROR_ARRAY[@]}" do @@ -1201,7 +1201,7 @@ DISPLAY_CONFIG () { done fi - GET_REPLY "Continue with CloudberryDB creation" + GET_REPLY "Continue with Cloudberry creation" fi LOG_MSG "[INFO]:-End Function $FUNCNAME" } @@ -1309,7 +1309,7 @@ CREATE_QD_DB () { BACKOUT_COMMAND "if [ -d $GP_DIR ]; then $RM -Rf $GP_DIR; fi" BACKOUT_COMMAND "$ECHO Removing Coordinator data directory files" LOG_MSG "[INFO]:-Completed Coordinator instance initialization" - $ECHO "#CloudberryDB specific configuration parameters for Coordinator instance database" >> ${GP_DIR}/$PG_CONF + $ECHO "#Cloudberry specific configuration parameters for Coordinator instance database" >> ${GP_DIR}/$PG_CONF $ECHO "#------------------------------------------------------------------------" >> ${GP_DIR}/$PG_CONF LOG_MSG "[INFO]:-Setting the Coordinator port to $GP_PORT" SED_PG_CONF ${GP_DIR}/$PG_CONF "$PORT_TXT" port=$GP_PORT 0 @@ -1523,16 +1523,16 @@ REGISTER_MIRRORS () { STOP_QD_PRODUCTION () { LOG_MSG "[INFO]:-Start Function $FUNCNAME" - LOG_MSG "[INFO]:-Restarting the CloudberryDB instance in production mode" 1 + LOG_MSG "[INFO]:-Restarting the Cloudberry instance in production mode" 1 if [ -f $GPSTOP ]; then GPSTOP_OPTS=$(OUTPUT_LEVEL_OPTS) export COORDINATOR_DATA_DIRECTORY=${COORDINATOR_DIRECTORY}/${SEG_PREFIX}-1 $GPSTOP -a -l $LOG_DIR -m -d $COORDINATOR_DATA_DIRECTORY $GPSTOP_OPTS RETVAL=$? if [ $RETVAL -eq 0 ]; then - LOG_MSG "[INFO]:-Successfully shutdown the new CloudberryDB instance" + LOG_MSG "[INFO]:-Successfully shutdown the new Cloudberry instance" else - ERROR_EXIT "[FATAL]:-Error from CloudberryDB instance shutdown, check log files" + ERROR_EXIT "[FATAL]:-Error from Cloudberry instance shutdown, check log files" fi else ERROR_EXIT "[FATAL]:-$GPSTOP not located" @@ -1584,12 +1584,12 @@ START_QD_PRODUCTION () { $GPSTART -a -l $LOG_DIR -d $COORDINATOR_DATA_DIRECTORY $GPSTART_OPTS if [ $? -eq 0 ];then - LOG_MSG "[INFO]:-Successfully started new CloudberryDB instance" + LOG_MSG "[INFO]:-Successfully started new Cloudberry instance" else # this text is duplicated below LOG_MSG "[WARN]:" 1 - LOG_MSG "[WARN]:-Failed to start CloudberryDB instance; review gpstart output to" 1 + LOG_MSG "[WARN]:-Failed to start Cloudberry instance; review gpstart output to" 1 LOG_MSG "[WARN]:- determine why gpstart failed and reinitialize cluster after resolving" 1 LOG_MSG "[WARN]:- issues. Not all initialization tasks have completed so the cluster" 1 LOG_MSG "[WARN]:- should not be used." 1 @@ -1603,9 +1603,9 @@ START_QD_PRODUCTION () { RETVAL=$? if [ $RETVAL -eq 0 ]; then - LOG_MSG "[INFO]:-Successfully shutdown the CloudberryDB instance" 1 + LOG_MSG "[INFO]:-Successfully shutdown the Cloudberry instance" 1 else - ERROR_EXIT "[FATAL]:-Error from CloudberryDB instance shutdown, check log files" + ERROR_EXIT "[FATAL]:-Error from Cloudberry instance shutdown, check log files" fi else LOG_MSG "[WARN]:-$GPSTOP not located" 1 @@ -1613,7 +1613,7 @@ START_QD_PRODUCTION () { # this text is duplicated above LOG_MSG "[WARN]:" 1 - LOG_MSG "[WARN]:-Failed to start CloudberryDB instance; review gpstart output to" 1 + LOG_MSG "[WARN]:-Failed to start Cloudberry instance; review gpstart output to" 1 LOG_MSG "[WARN]:- determine why gpstart failed and reinitialize cluster after resolving" 1 LOG_MSG "[WARN]:- issues. Not all initialization tasks have completed so the cluster" 1 LOG_MSG "[WARN]:- should not be used." 1 @@ -1623,7 +1623,7 @@ START_QD_PRODUCTION () { else ERROR_EXIT "[FATAL]:-$GPSTART not located" fi - LOG_MSG "[INFO]:-Completed restart of CloudberryDB instance in production mode" 1 + LOG_MSG "[INFO]:-Completed restart of Cloudberry instance in production mode" 1 LOG_MSG "[INFO]:-End Function $FUNCNAME" } @@ -1657,7 +1657,7 @@ FORCE_FTS_PROBE () { $PSQL -p $GP_PORT -d "$DEFAULTDB" -A -t -c "select * from gp_segment_configuration where (mode = 'n' or status = 'd') and content != -1;" >> $LOG_FILE 2>&1 $PSQL -p $GP_PORT -d "$DEFAULTDB" -A -t -c "select * from gp_stat_replication where sync_error != 'none' or sync_state != 'sync';" >> $LOG_FILE 2>&1 LOG_MSG "[WARN]:" 1 - LOG_MSG "[WARN]:-Failed to start CloudberryDB instance; please review gpinitsystem log to determine failure." 1 + LOG_MSG "[WARN]:-Failed to start Cloudberry instance; please review gpinitsystem log to determine failure." 1 # FTS_TODO: should support notify fts, then re-enable this function # ERROR_EXIT "[FATAL]:-Some primary/mirror segment pairs were found to be not in sync" break; @@ -1793,7 +1793,7 @@ READ_INPUT_CONFIG () { $CAT $INPUT_CONFIG|$GREP -v "^\s*\(#.*\)\?$" >> $LOG_FILE LOG_MSG "[INFO]:-Completed $INPUT_CONFIG dump to logfile" # Source the cluster configuration file - LOG_MSG "[INFO]:-Reading CloudberryDB configuration file $INPUT_CONFIG" + LOG_MSG "[INFO]:-Reading Cloudberry configuration file $INPUT_CONFIG" . $INPUT_CONFIG SET_VAR $QD_PRIMARY_ARRAY @@ -2045,7 +2045,7 @@ CREATE_ETCD() { if [ x"$CLUSTER_BOOT_MODE" = x"PRODUCTION" ];then ETCD_CONFIG_FILE_PATH=`readlink -f $PG_CONF_ADD_FILE` if [ ! -x ${GPHOME}/bin/etcd ];then - ERROR_EXIT "[FATAL]: No mgmt executables(etcd) found for CloudberryDB installation in ${GPHOME}/bin" + ERROR_EXIT "[FATAL]: No mgmt executables(etcd) found for Cloudberry installation in ${GPHOME}/bin" fi fi local etcd_url=`GENERATE_ETCD_URL 2380` @@ -2079,7 +2079,7 @@ CREATE_ETCD() { CREATE_FTS() { if [ ! -x ${GPHOME}/bin/gpfts ]; then - ERROR_EXIT "[FATAL]: No mgmt executables(gpfts) found for CloudberryDB installation in ${GPHOME}/bin" + ERROR_EXIT "[FATAL]: No mgmt executables(gpfts) found for Cloudberry installation in ${GPHOME}/bin" fi for fts in ${FTS_HOST_MACHINE_LIST[*]} do @@ -2293,14 +2293,14 @@ if [ x"" != x"$STANDBY_HOSTNAME" ];then fi SCAN_LOG -LOG_MSG "[INFO]:-Cloudberry Database instance successfully created" 1 +LOG_MSG "[INFO]:-Apache Cloudberry instance successfully created" 1 LOG_MSG "[INFO]:-------------------------------------------------------" 1 LOG_MSG "[INFO]:-To complete the environment configuration, please " 1 LOG_MSG "[INFO]:-update $USER_NAME .bashrc file with the following" 1 LOG_MSG "[INFO]:-1. Ensure that the greenplum_path.sh file is sourced" 1 LOG_MSG "[INFO]:-2. Add \"export COORDINATOR_DATA_DIRECTORY=${COORDINATOR_DIRECTORY}/${SEG_PREFIX}-1\"" 1 -LOG_MSG "[INFO]:- to access the CloudberryDB scripts for this instance:" 1 -LOG_MSG "[INFO]:- or, use -d ${COORDINATOR_DIRECTORY}/${SEG_PREFIX}-1 option for the CloudberryDB scripts" 1 +LOG_MSG "[INFO]:- to access the Cloudberry scripts for this instance:" 1 +LOG_MSG "[INFO]:- or, use -d ${COORDINATOR_DIRECTORY}/${SEG_PREFIX}-1 option for the Cloudberry scripts" 1 LOG_MSG "[INFO]:- Example gpstate -d ${COORDINATOR_DIRECTORY}/${SEG_PREFIX}-1" 1 LOG_MSG "[INFO]:-Script log file = $LOG_FILE" 1 LOG_MSG "[INFO]:-To remove instance, run gpdeletesystem utility" 1 @@ -2314,7 +2314,7 @@ if [ x"" != x"$STANDBY_HOSTNAME" ];then *) LOG_MSG "[WARN]:-Standby Coordinator failed to initialize" 1 esac else - LOG_MSG "[INFO]:-To initialize a Standby Coordinator Segment for this CloudberryDB instance" 1 + LOG_MSG "[INFO]:-To initialize a Standby Coordinator Segment for this Cloudberry instance" 1 LOG_MSG "[INFO]:-Review options for gpinitstandby" 1 fi diff --git a/gpMgmt/bin/gpload.py b/gpMgmt/bin/gpload.py index c33ca308197..7e6b7716108 100755 --- a/gpMgmt/bin/gpload.py +++ b/gpMgmt/bin/gpload.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -*- coding: utf-8 -*- -# gpload - load file(s) into Greenplum Database & CloudberryDB +# gpload - load file(s) into Greenplum Database & Cloudberry # Copyright Greenplum 2008 '''gpload [options] -f configuration file @@ -1891,7 +1891,7 @@ def setup_connection(self, recurse = 0): self.setup_connection(recurse) else: self.log(self.ERROR, "could not connect to database: %s. Is " \ - "the Cloudberry Database running on port %i?" % (errorMessage, + "the Apache Cloudberry running on port %i?" % (errorMessage, self.options.p)) @@ -2550,7 +2550,7 @@ def create_staging_table(self): resultList = self.db.query(sql).getresult() if len(resultList) > 0: self.log(self.WARN, """Old style, reusable tables named "temp_gpload_reusable_*" from a previous versions were found. - CloudberryDB recommends running "DROP TABLE temp_gpload_reusable_..." on each table. This only needs to be done once.""") + Cloudberry recommends running "DROP TABLE temp_gpload_reusable_..." on each table. This only needs to be done once.""") # If the 'reuse tables' option was specified we now try to find an # already existing staging table in the catalog which will match diff --git a/gpMgmt/bin/gpload_test/gpload/init_file b/gpMgmt/bin/gpload_test/gpload/init_file index 9f0d7f1357b..63387e47a91 100644 --- a/gpMgmt/bin/gpload_test/gpload/init_file +++ b/gpMgmt/bin/gpload_test/gpload/init_file @@ -68,8 +68,8 @@ s/\(*[\d+\.\d+\.\d+\.\d+\.\/\d+]*\)//g -- s/(trying to run gpfdist.*)/GP_IGNORE: $1/ -- m/ / -- s/failed to start gpfdist.*/FAILED_GPFDIST/ --- m/Is the Cloudberry Database running on port / --- s/Is the Cloudberry Database running on port.+/Is the Cloudberry Database running on port PORT_NUMBER?/ +-- m/Is the Apache Cloudberry running on port / +-- s/Is the Apache Cloudberry running on port.+/Is the Apache Cloudberry running on port PORT_NUMBER?/ -- m/ / -- s/\w+\.c:\d+\]/FILE:LINE]/ -- m/temp_staging_gpload/ diff --git a/gpMgmt/bin/gpload_test/gpload2/query37.ans b/gpMgmt/bin/gpload_test/gpload2/query37.ans index efee4ab3555..c51d7cdcd7d 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query37.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query37.ans @@ -1,4 +1,4 @@ -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-11-29 11:57:32|INFO|gpload session started 2021-11-29 11:57:32 2021-11-29 11:57:32|INFO|setting schema 'public' for table 'texttable' @@ -11,7 +11,7 @@ HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sur 2021-11-29 11:57:32|INFO|rows Updated = 0 2021-11-29 11:57:32|INFO|data formatting errors = 0 2021-11-29 11:57:32|INFO|gpload failed -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-11-29 11:57:32|INFO|gpload session started 2021-11-29 11:57:32 2021-11-29 11:57:32|INFO|setting schema 'public' for table 'texttable' diff --git a/gpMgmt/bin/gpload_test/gpload2/query41.ans b/gpMgmt/bin/gpload_test/gpload2/query41.ans index fed9fe43c20..acd3400e83a 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query41.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query41.ans @@ -16,7 +16,7 @@ 2020-09-07 20:06:20|INFO|rows Updated = 0 2020-09-07 20:06:20|INFO|data formatting errors = 0 2020-09-07 20:06:20|INFO|gpload succeeded -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'Field1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'Field1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2020-09-07 20:06:21|INFO|gpload session started 2020-09-07 20:06:21 2020-09-07 20:06:21|INFO|setting schema 'public' for table 'testspecialchar' diff --git a/gpMgmt/bin/gpload_test/gpload2/query42.ans b/gpMgmt/bin/gpload_test/gpload2/query42.ans index d67f258c092..750e014cff6 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query42.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query42.ans @@ -7,7 +7,7 @@ 2020-10-19 10:58:33|INFO|rows Updated = 0 2020-10-19 10:58:33|INFO|data formatting errors = 0 2020-10-19 10:58:33|INFO|gpload succeeded -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2020-10-19 10:58:33|INFO|gpload session started 2020-10-19 10:58:33 2020-10-19 10:58:33|INFO|setting schema 'public' for table 'texttable' diff --git a/gpMgmt/bin/gpload_test/gpload2/query46.ans b/gpMgmt/bin/gpload_test/gpload2/query46.ans index f98474925e4..c76071fb53a 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query46.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query46.ans @@ -1,7 +1,7 @@ 2020-12-01 15:47:53|INFO|gpload session started 2020-12-01 15:47:53 2020-12-01 15:47:53|ERROR|could not connect to database: Connection refused Is the server running on that host and accepting TCP/IP connections? -. Is the Cloudberry Database running on port 9999? +. Is the Apache Cloudberry running on port 9999? 2020-12-01 15:47:53|INFO|rows Inserted = 0 2020-12-01 15:47:53|INFO|rows Updated = 0 2020-12-01 15:47:53|INFO|data formatting errors = 0 @@ -9,7 +9,7 @@ 2020-12-01 15:47:53|INFO|gpload session started 2020-12-01 15:47:53 2020-12-01 15:47:53|ERROR|could not connect to database: Connection refused Is the server running on that host and accepting TCP/IP connections? -. Is the Cloudberry Database running on port 9999? +. Is the Apache Cloudberry running on port 9999? 2020-12-01 15:47:53|INFO|rows Inserted = 0 2020-12-01 15:47:53|INFO|rows Updated = 0 2020-12-01 15:47:53|INFO|data formatting errors = 0 diff --git a/gpMgmt/bin/gpload_test/gpload2/query47.ans b/gpMgmt/bin/gpload_test/gpload2/query47.ans index cc0b8a0e65b..5a698169fb7 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query47.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query47.ans @@ -2,7 +2,7 @@ 2020-12-01 16:29:16|ERROR|could not connect to database: could not connect to server: Connection timed out Is the server running on host "1.2.3.4" and accepting TCP/IP connections on port 7000? -. Is the Cloudberry Database running on port 7000? +. Is the Apache Cloudberry running on port 7000? 2020-12-01 16:29:16|INFO|rows Inserted = 0 2020-12-01 16:29:16|INFO|rows Updated = 0 2020-12-01 16:29:16|INFO|data formatting errors = 0 @@ -11,7 +11,7 @@ 2020-12-01 16:31:24|ERROR|could not connect to database: could not connect to server: Connection timed out Is the server running on host "1.2.3.4" and accepting TCP/IP connections on port 7000? -. Is the Cloudberry Database running on port 7000? +. Is the Apache Cloudberry running on port 7000? 2020-12-01 16:31:24|INFO|rows Inserted = 0 2020-12-01 16:31:24|INFO|rows Updated = 0 2020-12-01 16:31:24|INFO|data formatting errors = 0 diff --git a/gpMgmt/bin/gpload_test/gpload2/query49.ans b/gpMgmt/bin/gpload_test/gpload2/query49.ans index c8788fab482..7c43be16b9a 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query49.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query49.ans @@ -1,13 +1,13 @@ 2020-12-02 15:03:39|INFO|gpload session started 2020-12-02 15:03:39 2020-12-02 15:03:39|ERROR|could not connect to database: FATAL: database "notexistdb" does not exist -. Is the Cloudberry Database running on port 7000? +. Is the Apache Cloudberry running on port 7000? 2020-12-02 15:03:39|INFO|rows Inserted = 0 2020-12-02 15:03:39|INFO|rows Updated = 0 2020-12-02 15:03:39|INFO|data formatting errors = 0 2020-12-02 15:03:39|INFO|gpload failed 2020-12-02 15:03:39|INFO|gpload session started 2020-12-02 15:03:39 2020-12-02 15:03:39|ERROR|could not connect to database: FATAL: database "notexistdb" does not exist -. Is the Cloudberry Database running on port 7000? +. Is the Apache Cloudberry running on port 7000? 2020-12-02 15:03:39|INFO|rows Inserted = 0 2020-12-02 15:03:39|INFO|rows Updated = 0 2020-12-02 15:03:39|INFO|data formatting errors = 0 diff --git a/gpMgmt/bin/gpload_test/gpload2/query491.ans b/gpMgmt/bin/gpload_test/gpload2/query491.ans index 0a05382448c..7c5577531b7 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query491.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query491.ans @@ -1,4 +1,4 @@ -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2020-12-18 15:54:47|INFO|gpload session started 2020-12-18 15:54:47 2020-12-18 15:54:47|INFO|setting schema 'public' for table 'texttable' diff --git a/gpMgmt/bin/gpload_test/gpload2/query492.ans b/gpMgmt/bin/gpload_test/gpload2/query492.ans index 3d7a37350b7..9801ab5161d 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query492.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query492.ans @@ -1,4 +1,4 @@ -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2020-12-18 17:10:18|INFO|gpload session started 2020-12-18 17:10:18 2020-12-18 17:10:18|INFO|setting schema 'public' for table 'texttable' diff --git a/gpMgmt/bin/gpload_test/gpload2/query493.ans b/gpMgmt/bin/gpload_test/gpload2/query493.ans index 842aa7476bd..4f2e9ceea17 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query493.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query493.ans @@ -8,7 +8,7 @@ TRUNCATE TABLE 2021-01-04 15:50:36|INFO|rows Updated = 0 2021-01-04 15:50:36|INFO|data formatting errors = 0 2021-01-04 15:50:36|INFO|gpload succeeded -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-04 15:50:36|INFO|gpload session started 2021-01-04 15:50:36 2021-01-04 15:50:36|INFO|setting schema 'public' for table 'texttable' @@ -35,7 +35,7 @@ TRUNCATE TABLE 2021-01-04 15:50:37|INFO|rows Updated = 0 2021-01-04 15:50:37|INFO|data formatting errors = 0 2021-01-04 15:50:37|INFO|gpload succeeded -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-04 15:50:37|INFO|gpload session started 2021-01-04 15:50:37 2021-01-04 15:50:37|INFO|setting schema 'public' for table 'texttable' @@ -62,7 +62,7 @@ TRUNCATE TABLE 2021-01-04 15:50:37|INFO|rows Updated = 0 2021-01-04 15:50:37|INFO|data formatting errors = 0 2021-01-04 15:50:37|INFO|gpload succeeded -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-04 16:04:50|INFO|gpload session started 2021-01-04 16:04:50 2021-01-04 16:04:50|INFO|setting schema 'public' for table 'texttable' @@ -89,7 +89,7 @@ TRUNCATE TABLE 2021-01-04 15:50:38|INFO|rows Updated = 0 2021-01-04 15:50:38|INFO|data formatting errors = 0 2021-01-04 15:50:38|INFO|gpload succeeded -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-04 15:50:38|INFO|gpload session started 2021-01-04 15:50:38 2021-01-04 15:50:38|INFO|setting schema 'public' for table 'texttable' @@ -116,7 +116,7 @@ TRUNCATE TABLE 2021-01-04 15:50:39|INFO|rows Updated = 0 2021-01-04 15:50:39|INFO|data formatting errors = 0 2021-01-04 15:50:39|INFO|gpload succeeded -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-04 15:50:39|INFO|gpload session started 2021-01-04 15:50:39 2021-01-04 15:50:39|INFO|setting schema 'public' for table 'texttable' @@ -143,7 +143,7 @@ TRUNCATE TABLE 2021-01-04 15:50:39|INFO|rows Updated = 0 2021-01-04 15:50:39|INFO|data formatting errors = 0 2021-01-04 15:50:39|INFO|gpload succeeded -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-04 15:50:39|INFO|gpload session started 2021-01-04 15:50:39 2021-01-04 15:50:40|INFO|setting schema 'public' for table 'texttable' @@ -170,7 +170,7 @@ TRUNCATE TABLE 2021-01-04 15:50:40|INFO|rows Updated = 0 2021-01-04 15:50:40|INFO|data formatting errors = 0 2021-01-04 15:50:40|INFO|gpload succeeded -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-04 15:50:40|INFO|gpload session started 2021-01-04 15:50:40 2021-01-04 15:50:40|INFO|setting schema 'public' for table 'texttable' @@ -197,7 +197,7 @@ TRUNCATE TABLE 2021-01-04 15:50:41|INFO|rows Updated = 0 2021-01-04 15:50:41|INFO|data formatting errors = 0 2021-01-04 15:50:41|INFO|gpload succeeded -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-04 15:50:41|INFO|gpload session started 2021-01-04 15:50:41 2021-01-04 15:50:41|INFO|setting schema 'public' for table 'texttable' diff --git a/gpMgmt/bin/gpload_test/gpload2/query494.ans b/gpMgmt/bin/gpload_test/gpload2/query494.ans index ef5bf8dcfab..0f47cc30aff 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query494.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query494.ans @@ -8,7 +8,7 @@ TRUNCATE TABLE 2021-01-04 16:24:29|INFO|rows Updated = 0 2021-01-04 16:24:29|INFO|data formatting errors = 0 2021-01-04 16:24:29|INFO|gpload succeeded -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-04 16:24:29|INFO|gpload session started 2021-01-04 16:24:29 2021-01-04 16:24:29|INFO|setting schema 'public' for table 'texttable' diff --git a/gpMgmt/bin/gpload_test/gpload2/query495.ans b/gpMgmt/bin/gpload_test/gpload2/query495.ans index 97d0c057aea..d6ed555b642 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query495.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query495.ans @@ -8,7 +8,7 @@ TRUNCATE TABLE 2021-01-04 16:37:58|INFO|rows Updated = 0 2021-01-04 16:37:58|INFO|data formatting errors = 0 2021-01-04 16:37:58|INFO|gpload succeeded -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-04 16:38:57|INFO|gpload session started 2021-01-04 16:38:57 2021-01-04 16:38:57|INFO|setting schema 'public' for table 'texttable' diff --git a/gpMgmt/bin/gpload_test/gpload2/query496.ans b/gpMgmt/bin/gpload_test/gpload2/query496.ans index 4c18a9b6745..23b869f263f 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query496.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query496.ans @@ -8,7 +8,7 @@ TRUNCATE TABLE 2021-01-04 16:53:32|INFO|rows Updated = 0 2021-01-04 16:53:32|INFO|data formatting errors = 0 2021-01-04 16:53:32|INFO|gpload succeeded -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-04 16:53:32|INFO|gpload session started 2021-01-04 16:53:32 2021-01-04 16:53:32|INFO|setting schema 'public' for table 'texttable' diff --git a/gpMgmt/bin/gpload_test/gpload2/query497.ans b/gpMgmt/bin/gpload_test/gpload2/query497.ans index ceb6082ef1d..8a9dd85417e 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query497.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query497.ans @@ -1,4 +1,4 @@ -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-04 16:55:52|INFO|gpload session started 2021-01-04 16:55:52 2021-01-04 16:55:52|INFO|setting schema 'public' for table 'texttable' diff --git a/gpMgmt/bin/gpload_test/gpload2/query500.ans b/gpMgmt/bin/gpload_test/gpload2/query500.ans index 0b267e45778..ba172043237 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query500.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query500.ans @@ -1,4 +1,4 @@ -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-05 17:17:32|INFO|gpload session started 2021-01-05 17:17:32 2021-01-05 17:17:32|INFO|setting schema 'public' for table 'texttable' diff --git a/gpMgmt/bin/gpload_test/gpload2/query502.ans b/gpMgmt/bin/gpload_test/gpload2/query502.ans index e8353b5bdb6..0b515f0888b 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query502.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query502.ans @@ -1,4 +1,4 @@ -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-05 17:18:37|INFO|gpload session started 2021-01-05 17:18:37 2021-01-05 17:18:37|INFO|setting schema 'public' for table 'texttable' diff --git a/gpMgmt/bin/gpload_test/gpload2/query504.ans b/gpMgmt/bin/gpload_test/gpload2/query504.ans index 0b9373081cb..eecc8533b90 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query504.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query504.ans @@ -5,7 +5,7 @@ CREATE TABLE merge_test(c1 text, c2 text, c3 text, c4 int) DISTRIBUTED BY(c4); CREATE TABLE INSERT INTO merge_test VALUES ('aaa', 'init', 'init', 0); INSERT 0 1 -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'c1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'c1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-07 18:23:57|INFO|gpload session started 2021-01-07 18:23:57 2021-01-07 18:23:57|INFO|setting schema 'public' for table 'merge_test' diff --git a/gpMgmt/bin/gpload_test/gpload2/query505.ans b/gpMgmt/bin/gpload_test/gpload2/query505.ans index 748d8f7238b..774b2412aa4 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query505.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query505.ans @@ -5,7 +5,7 @@ CREATE TABLE merge_test(c1 text, c2 text, c3 text, c4 int) DISTRIBUTED BY(c4); CREATE TABLE INSERT INTO merge_test VALUES ('aaa', 'init', 'init', 0); INSERT 0 1 -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'c1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'c1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-07 18:24:19|INFO|gpload session started 2021-01-07 18:24:19 2021-01-07 18:24:19|INFO|setting schema 'public' for table 'merge_test' diff --git a/gpMgmt/bin/gpload_test/gpload2/query508.ans b/gpMgmt/bin/gpload_test/gpload2/query508.ans index 2eb63d334da..91a73ba2b62 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query508.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query508.ans @@ -5,7 +5,7 @@ CREATE TABLE merge_test(c1 text, c2 text, c3 text, c4 int) DISTRIBUTED BY(c4); CREATE TABLE INSERT INTO merge_test VALUES ('aaa', 'init', 'init', 0); INSERT 0 1 -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'c1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'c1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-07 18:32:47|INFO|gpload session started 2021-01-07 18:32:47 2021-01-07 18:32:47|INFO|setting schema 'public' for table 'merge_test' diff --git a/gpMgmt/bin/gpload_test/gpload2/query509.ans b/gpMgmt/bin/gpload_test/gpload2/query509.ans index d161127c835..4a009b620db 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query509.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query509.ans @@ -5,7 +5,7 @@ CREATE TABLE merge_test(c1 text, c2 text, c3 text, c4 int) DISTRIBUTED BY(c4); CREATE TABLE INSERT INTO merge_test VALUES ('aaa', 'init', 'init', 0); INSERT 0 1 -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'c1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'c1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-07 18:33:08|INFO|gpload session started 2021-01-07 18:33:08 2021-01-07 18:33:08|INFO|setting schema 'public' for table 'merge_test' diff --git a/gpMgmt/bin/gpload_test/gpload2/query51.ans b/gpMgmt/bin/gpload_test/gpload2/query51.ans index e2a3850423e..d547a7a7195 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query51.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query51.ans @@ -1,13 +1,13 @@ 2020-12-01 17:16:29|INFO|gpload session started 2020-12-01 17:16:29 2020-12-01 17:16:29|ERROR|could not connect to database: FATAL: no pg_hba.conf entry for host "*", user "notexistusr", database "reuse_gptest", no encryption -. Is the Cloudberry Database running on port 7000? +. Is the Apache Cloudberry running on port 7000? 2020-12-01 17:16:29|INFO|rows Inserted = 0 2020-12-01 17:16:29|INFO|rows Updated = 0 2020-12-01 17:16:29|INFO|data formatting errors = 0 2020-12-01 17:16:29|INFO|gpload failed 2020-12-01 17:16:30|INFO|gpload session started 2020-12-01 17:16:30 2020-12-01 17:16:30|ERROR|could not connect to database: FATAL: no pg_hba.conf entry for host "*", user "notexistusr", database "reuse_gptest", no encryption -. Is the Cloudberry Database running on port 7000? +. Is the Apache Cloudberry running on port 7000? 2020-12-01 17:16:30|INFO|rows Inserted = 0 2020-12-01 17:16:30|INFO|rows Updated = 0 2020-12-01 17:16:30|INFO|data formatting errors = 0 diff --git a/gpMgmt/bin/gpload_test/gpload2/query530.ans b/gpMgmt/bin/gpload_test/gpload2/query530.ans index 34b307e66db..df9b8c380ec 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query530.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query530.ans @@ -5,7 +5,7 @@ CREATE TABLE mapping_test(s1 text, s2 text, s3 text, s4 int) DISTRIBUTED BY(s1); CREATE TABLE INSERT INTO mapping_test VALUES ('aaa', '', '', 0); INSERT 0 1 -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-07 17:37:36|INFO|gpload session started 2021-01-07 17:37:36 2021-01-07 17:37:36|INFO|setting schema 'public' for table 'mapping_test' diff --git a/gpMgmt/bin/gpload_test/gpload2/query531.ans b/gpMgmt/bin/gpload_test/gpload2/query531.ans index 3bfcacba05e..29359dd84ed 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query531.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query531.ans @@ -5,7 +5,7 @@ CREATE TABLE mapping_test(s1 text, s2 text, s3 text, s4 int) DISTRIBUTED BY(s1); CREATE TABLE INSERT INTO mapping_test VALUES ('aaa', '', '', 0); INSERT 0 1 -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-07 17:38:03|INFO|gpload session started 2021-01-07 17:38:03 2021-01-07 17:38:03|INFO|setting schema 'public' for table 'mapping_test' diff --git a/gpMgmt/bin/gpload_test/gpload2/query532.ans b/gpMgmt/bin/gpload_test/gpload2/query532.ans index 2f652dfdfe9..98d7ea1ee9a 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query532.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query532.ans @@ -5,7 +5,7 @@ CREATE TABLE mapping_test(s1 text, s2 text, s3 text, s4 int) DISTRIBUTED BY(s1); CREATE TABLE INSERT INTO mapping_test VALUES ('aaa', '', '', 0); INSERT 0 1 -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-07 17:38:14|INFO|gpload session started 2021-01-07 17:38:14 2021-01-07 17:38:14|INFO|setting schema 'public' for table 'mapping_test' diff --git a/gpMgmt/bin/gpload_test/gpload2/query533.ans b/gpMgmt/bin/gpload_test/gpload2/query533.ans index 6feabf4bbbe..809573e625a 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query533.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query533.ans @@ -5,7 +5,7 @@ CREATE TABLE mapping_test(s1 text, s2 text, s3 text, s4 int) DISTRIBUTED BY(s1); CREATE TABLE INSERT INTO mapping_test VALUES ('aaa', '', '', 0); INSERT 0 1 -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-07 17:38:26|INFO|gpload session started 2021-01-07 17:38:26 2021-01-07 17:38:26|INFO|setting schema 'public' for table 'mapping_test' diff --git a/gpMgmt/bin/gpload_test/gpload2/query534.ans b/gpMgmt/bin/gpload_test/gpload2/query534.ans index b0726086f76..12c1157e201 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query534.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query534.ans @@ -5,7 +5,7 @@ CREATE TABLE mapping_test(s1 text, s2 text, s3 text, s4 int) DISTRIBUTED BY(s1); CREATE TABLE INSERT INTO mapping_test VALUES ('aaa', '', '', 0); INSERT 0 1 -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-07 17:38:42|INFO|gpload session started 2021-01-07 17:38:42 2021-01-07 17:38:42|INFO|setting schema 'public' for table 'mapping_test' diff --git a/gpMgmt/bin/gpload_test/gpload2/query535.ans b/gpMgmt/bin/gpload_test/gpload2/query535.ans index 6d2f663231c..600b01fed25 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query535.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query535.ans @@ -5,7 +5,7 @@ CREATE TABLE mapping_test(s1 text, s2 text, s3 text, s4 int) DISTRIBUTED BY(s1); CREATE TABLE INSERT INTO mapping_test VALUES ('aaa', '', '', 0); INSERT 0 1 -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-07 17:44:23|INFO|gpload session started 2021-01-07 17:44:23 2021-01-07 17:44:23|INFO|setting schema 'public' for table 'mapping_test' diff --git a/gpMgmt/bin/gpload_test/gpload2/query540.ans b/gpMgmt/bin/gpload_test/gpload2/query540.ans index 59923f9c365..b85751c8a59 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query540.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query540.ans @@ -7,7 +7,7 @@ CREATE TABLE ; INSERT INTO update_column_special_char VALUES('a', 0); INSERT 0 1 -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'c1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'c1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-05 17:23:51|INFO|gpload session started 2021-01-05 17:23:51 2021-01-05 17:23:51|INFO|setting schema 'public' for table 'update_column_special_char' @@ -27,7 +27,7 @@ CREATE TABLE ; INSERT INTO update_column_special_char VALUES('a', 0); INSERT 0 1 -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'c1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'c1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-05 17:23:51|INFO|gpload session started 2021-01-05 17:23:51 2021-01-05 17:23:51|INFO|setting schema 'public' for table 'update_column_special_char' @@ -47,7 +47,7 @@ CREATE TABLE ; INSERT INTO update_column_special_char VALUES('a', 0); INSERT 0 1 -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'c1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'c1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-05 17:23:51|INFO|gpload session started 2021-01-05 17:23:51 2021-01-05 17:23:51|INFO|setting schema 'public' for table 'update_column_special_char' @@ -67,7 +67,7 @@ CREATE TABLE ; INSERT INTO update_column_special_char VALUES('a', 0); INSERT 0 1 -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'c1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'c1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-05 17:23:52|INFO|gpload session started 2021-01-05 17:23:52 2021-01-05 17:23:52|INFO|setting schema 'public' for table 'update_column_special_char' @@ -87,7 +87,7 @@ CREATE TABLE ; INSERT INTO update_column_special_char VALUES('a', 0); INSERT 0 1 -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'c1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'c1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-05 17:23:52|INFO|gpload session started 2021-01-05 17:23:52 2021-01-05 17:23:52|INFO|setting schema 'public' for table 'update_column_special_char' @@ -107,7 +107,7 @@ CREATE TABLE ; INSERT INTO update_column_special_char VALUES('a', 0); INSERT 0 1 -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'c1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'c1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-05 17:23:52|INFO|gpload session started 2021-01-05 17:23:52 2021-01-05 17:23:52|INFO|setting schema 'public' for table 'update_column_special_char' @@ -127,7 +127,7 @@ CREATE TABLE ; INSERT INTO update_column_special_char VALUES('a', 0); INSERT 0 1 -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'c1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'c1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-05 17:23:53|INFO|gpload session started 2021-01-05 17:23:53 2021-01-05 17:23:53|INFO|setting schema 'public' for table 'update_column_special_char' @@ -147,7 +147,7 @@ CREATE TABLE ; INSERT INTO update_column_special_char VALUES('a', 0); INSERT 0 1 -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'c1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'c1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-05 17:23:53|INFO|gpload session started 2021-01-05 17:23:53 2021-01-05 17:23:53|INFO|setting schema 'public' for table 'update_column_special_char' diff --git a/gpMgmt/bin/gpload_test/gpload2/query541.ans b/gpMgmt/bin/gpload_test/gpload2/query541.ans index c6049ddfe3d..552b4f14472 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query541.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query541.ans @@ -7,7 +7,7 @@ CREATE TABLE ; INSERT INTO match_column_special_char VALUES('a', 0); INSERT 0 1 -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's_\_c' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's_\_c' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-05 17:24:37|INFO|gpload session started 2021-01-05 17:24:37 2021-01-05 17:24:37|INFO|setting schema 'public' for table 'match_column_special_char' @@ -27,7 +27,7 @@ CREATE TABLE ; INSERT INTO match_column_special_char VALUES('a', 0); INSERT 0 1 -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's_$_c' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's_$_c' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-05 17:24:38|INFO|gpload session started 2021-01-05 17:24:38 2021-01-05 17:24:38|INFO|setting schema 'public' for table 'match_column_special_char' @@ -47,7 +47,7 @@ CREATE TABLE ; INSERT INTO match_column_special_char VALUES('a', 0); INSERT 0 1 -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's_#_c' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's_#_c' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-05 17:24:38|INFO|gpload session started 2021-01-05 17:24:38 2021-01-05 17:24:38|INFO|setting schema 'public' for table 'match_column_special_char' @@ -67,7 +67,7 @@ CREATE TABLE ; INSERT INTO match_column_special_char VALUES('a', 0); INSERT 0 1 -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's_,_c' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's_,_c' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-05 17:24:38|INFO|gpload session started 2021-01-05 17:24:38 2021-01-05 17:24:38|INFO|setting schema 'public' for table 'match_column_special_char' @@ -87,7 +87,7 @@ CREATE TABLE ; INSERT INTO match_column_special_char VALUES('a', 0); INSERT 0 1 -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's_(_c' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's_(_c' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-05 17:24:39|INFO|gpload session started 2021-01-05 17:24:39 2021-01-05 17:24:39|INFO|setting schema 'public' for table 'match_column_special_char' @@ -107,7 +107,7 @@ CREATE TABLE ; INSERT INTO match_column_special_char VALUES('a', 0); INSERT 0 1 -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's_._c' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's_._c' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-05 17:24:39|INFO|gpload session started 2021-01-05 17:24:39 2021-01-05 17:24:39|INFO|setting schema 'public' for table 'match_column_special_char' @@ -127,7 +127,7 @@ CREATE TABLE ; INSERT INTO match_column_special_char VALUES('a', 0); INSERT 0 1 -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's_/_c' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's_/_c' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-05 17:24:39|INFO|gpload session started 2021-01-05 17:24:39 2021-01-05 17:24:39|INFO|setting schema 'public' for table 'match_column_special_char' @@ -147,7 +147,7 @@ CREATE TABLE ; INSERT INTO match_column_special_char VALUES('a', 0); INSERT 0 1 -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's_'_c' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's_'_c' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-05 17:24:40|INFO|gpload session started 2021-01-05 17:24:40 2021-01-05 17:24:40|INFO|setting schema 'public' for table 'match_column_special_char' diff --git a/gpMgmt/bin/gpload_test/gpload2/query543.ans b/gpMgmt/bin/gpload_test/gpload2/query543.ans index f2855a7ed5c..ec0858c930b 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query543.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query543.ans @@ -7,7 +7,7 @@ 2021-02-03 15:31:33|INFO|rows Updated = 0 2021-02-03 15:31:33|INFO|data formatting errors = 0 2021-02-03 15:31:33|INFO|gpload succeeded -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-02-03 15:31:33|INFO|gpload session started 2021-02-03 15:31:33 2021-02-03 15:31:33|INFO|setting schema 'public' for table 'texttable' diff --git a/gpMgmt/bin/gpload_test/gpload2/query56.ans b/gpMgmt/bin/gpload_test/gpload2/query56.ans index 950406eac35..73623ac5c55 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query56.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query56.ans @@ -1,13 +1,13 @@ 2020-12-03 14:46:48|INFO|gpload session started 2020-12-03 14:46:48 2020-12-03 14:46:48|ERROR|could not connect to database: FATAL: database "notexist" does not exist -. Is the Cloudberry Database running on port 7000? +. Is the Apache Cloudberry running on port 7000? 2020-12-03 14:46:48|INFO|rows Inserted = 0 2020-12-03 14:46:48|INFO|rows Updated = 0 2020-12-03 14:46:48|INFO|data formatting errors = 0 2020-12-03 14:46:48|INFO|gpload failed 2020-12-03 14:46:48|INFO|gpload session started 2020-12-03 14:46:48 2020-12-03 14:46:48|ERROR|could not connect to database: FATAL: database "notexist" does not exist -. Is the Cloudberry Database running on port 7000? +. Is the Apache Cloudberry running on port 7000? 2020-12-03 14:46:48|INFO|rows Inserted = 0 2020-12-03 14:46:48|INFO|rows Updated = 0 2020-12-03 14:46:48|INFO|data formatting errors = 0 diff --git a/gpMgmt/bin/gpload_test/gpload2/query57.ans b/gpMgmt/bin/gpload_test/gpload2/query57.ans index af5571c0e1a..6d020c83e10 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query57.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query57.ans @@ -1,13 +1,13 @@ 2020-12-03 15:02:00|INFO|gpload session started 2020-12-03 15:02:00 2020-12-03 15:02:00|ERROR|could not connect to database: FATAL: no pg_hba.conf entry for host "*", user "notexist", database "reuse_gptest", no encryption -. Is the Cloudberry Database running on port 7000? +. Is the Apache Cloudberry running on port 7000? 2020-12-03 15:02:00|INFO|rows Inserted = 0 2020-12-03 15:02:00|INFO|rows Updated = 0 2020-12-03 15:02:00|INFO|data formatting errors = 0 2020-12-03 15:02:00|INFO|gpload failed 2020-12-03 15:02:00|INFO|gpload session started 2020-12-03 15:02:00 2020-12-03 15:02:00|ERROR|could not connect to database: FATAL: no pg_hba.conf entry for host "*", user "notexist", database "reuse_gptest", no encryption -. Is the Cloudberry Database running on port 7000? +. Is the Apache Cloudberry running on port 7000? 2020-12-03 15:02:00|INFO|rows Inserted = 0 2020-12-03 15:02:00|INFO|rows Updated = 0 2020-12-03 15:02:00|INFO|data formatting errors = 0 diff --git a/gpMgmt/bin/gpload_test/gpload2/query58.ans b/gpMgmt/bin/gpload_test/gpload2/query58.ans index c79150edde8..37cc0adf935 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query58.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query58.ans @@ -2,7 +2,7 @@ 2020-12-03 15:50:34|ERROR|could not connect to database: could not connect to server: Connection timed out Is the server running on host "1.2.3.4" and accepting TCP/IP connections on port 7000? -. Is the Cloudberry Database running on port 7000? +. Is the Apache Cloudberry running on port 7000? 2020-12-03 15:50:34|INFO|rows Inserted = 0 2020-12-03 15:50:34|INFO|rows Updated = 0 2020-12-03 15:50:34|INFO|data formatting errors = 0 @@ -11,7 +11,7 @@ 2020-12-03 15:52:41|ERROR|could not connect to database: could not connect to server: Connection timed out Is the server running on host "1.2.3.4" and accepting TCP/IP connections on port 7000? -. Is the Cloudberry Database running on port 7000? +. Is the Apache Cloudberry running on port 7000? 2020-12-03 15:52:41|INFO|rows Inserted = 0 2020-12-03 15:52:41|INFO|rows Updated = 0 2020-12-03 15:52:41|INFO|data formatting errors = 0 diff --git a/gpMgmt/bin/gpload_test/gpload2/query59.ans b/gpMgmt/bin/gpload_test/gpload2/query59.ans index 7d3cf9861c1..44455c8eb04 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query59.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query59.ans @@ -1,13 +1,13 @@ 2020-12-03 15:53:24|INFO|gpload session started 2020-12-03 15:53:24 2020-12-03 15:53:24|ERROR|could not connect to database: invalid port number: "111111" -. Is the Cloudberry Database running on port 111111? +. Is the Apache Cloudberry running on port 111111? 2020-12-03 15:53:24|INFO|rows Inserted = 0 2020-12-03 15:53:24|INFO|rows Updated = 0 2020-12-03 15:53:24|INFO|data formatting errors = 0 2020-12-03 15:53:24|INFO|gpload failed 2020-12-03 15:53:24|INFO|gpload session started 2020-12-03 15:53:24 2020-12-03 15:53:24|ERROR|could not connect to database: invalid port number: "111111" -. Is the Cloudberry Database running on port 111111? +. Is the Apache Cloudberry running on port 111111? 2020-12-03 15:53:24|INFO|rows Inserted = 0 2020-12-03 15:53:24|INFO|rows Updated = 0 2020-12-03 15:53:24|INFO|data formatting errors = 0 diff --git a/gpMgmt/bin/gpload_test/gpload2/query667.ans b/gpMgmt/bin/gpload_test/gpload2/query667.ans index 9e0e9214b10..89653613c34 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query667.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query667.ans @@ -1,4 +1,4 @@ -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 's1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-11 19:20:03|INFO|gpload session started 2021-01-11 19:20:03 2021-01-11 19:20:03|INFO|setting schema 'public' for table 'texttable_667' diff --git a/gpMgmt/bin/gpload_test/gpload2/query67.ans b/gpMgmt/bin/gpload_test/gpload2/query67.ans index f0d82b3c9fb..3008413b0fc 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query67.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query67.ans @@ -1,4 +1,4 @@ -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'Field1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'Field1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-08 16:05:21|INFO|gpload session started 2021-01-08 16:05:21 2021-01-08 16:05:21|INFO|setting schema 'public' for table 'testspecialchar' diff --git a/gpMgmt/bin/gpload_test/gpload2/query68.ans b/gpMgmt/bin/gpload_test/gpload2/query68.ans index e04689e1cea..808eff402fd 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query68.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query68.ans @@ -1,4 +1,4 @@ -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'Field1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'Field1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-08 16:05:22|INFO|gpload session started 2021-01-08 16:05:22 2021-01-08 16:05:22|INFO|setting schema 'public' for table 'testspecialchar' diff --git a/gpMgmt/bin/gpload_test/gpload2/query69.ans b/gpMgmt/bin/gpload_test/gpload2/query69.ans index 849eba66562..c157448556b 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query69.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query69.ans @@ -1,4 +1,4 @@ -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'Field1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'Field1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-08 16:28:20|INFO|gpload session started 2021-01-08 16:28:20 2021-01-08 16:28:20|INFO|setting schema 'public' for table 'testspecialchar' diff --git a/gpMgmt/bin/gpload_test/gpload2/query71.ans b/gpMgmt/bin/gpload_test/gpload2/query71.ans index 85b888a40f9..549c07e7349 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query71.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query71.ans @@ -1,4 +1,4 @@ -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named '列1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named '列1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-01-08 16:28:22|INFO|gpload session started 2021-01-08 16:28:22 2021-01-08 16:28:22|INFO|setting schema 'public' for table 'chinese表' diff --git a/gpMgmt/bin/gpload_test/gpload2/query75.ans b/gpMgmt/bin/gpload_test/gpload2/query75.ans index d1c93c795bb..dd5b01b3add 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query75.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query75.ans @@ -7,7 +7,7 @@ 2021-08-10 14:56:46|INFO|rows Updated = 0 2021-08-10 14:56:46|INFO|data formatting errors = 0 2021-08-10 14:56:46|INFO|gpload succeeded -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named '列1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named '列1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-08-10 14:56:46|INFO|gpload session started 2021-08-10 14:56:46 2021-08-10 14:56:46|INFO|setting schema 'public' for table 'chinese表' @@ -26,7 +26,7 @@ HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sur 2021-08-10 14:56:46|INFO|rows Updated = 0 2021-08-10 14:56:46|INFO|data formatting errors = 0 2021-08-10 14:56:46|INFO|gpload failed -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named '列1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named '列1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. 2021-08-10 14:56:46|INFO|gpload session started 2021-08-10 14:56:46 2021-08-10 14:56:46|INFO|setting schema 'public' for table 'chinese表' diff --git a/gpMgmt/bin/gpload_test/gpload2/query76.ans b/gpMgmt/bin/gpload_test/gpload2/query76.ans index d2d98fd9641..cb958591c94 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query76.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query76.ans @@ -30,7 +30,7 @@ LINE 1: ...'text' (delimiter ';' null '\N' escape '\' ) encoding'UTF8' 2021-11-29 15:29:04|INFO|rows Updated = 0 2021-11-29 15:29:04|INFO|data formatting errors = 0 2021-11-29 15:29:04|INFO|gpload failed -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named '列1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named '列1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. WARNING: nonstandard use of \\ in a string literal LINE 13: and pgext.fmtopts like '%delimiter '';'' nu... diff --git a/gpMgmt/bin/gpload_test/gpload2/query77.ans b/gpMgmt/bin/gpload_test/gpload2/query77.ans index 3fb2689717a..cfeacc66960 100644 --- a/gpMgmt/bin/gpload_test/gpload2/query77.ans +++ b/gpMgmt/bin/gpload_test/gpload2/query77.ans @@ -22,7 +22,7 @@ LINE 1: ...'text' (delimiter ';' null '\N' escape '\' ) encoding'UTF8' 2021-11-29 11:57:13|INFO|rows Updated = 0 2021-11-29 11:57:13|INFO|data formatting errors = 0 2021-11-29 11:57:13|INFO|gpload failed -NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'Field1' as the Cloudberry Database data distribution key for this table. +NOTICE: Table doesn't have 'DISTRIBUTED BY' clause -- Using column named 'Field1' as the Apache Cloudberry data distribution key for this table. HINT: The 'DISTRIBUTED BY' clause determines the distribution of data. Make sure column(s) chosen are the optimal data distribution key to minimize skew. WARNING: nonstandard use of \\ in a string literal LINE 13: and pgext.fmtopts like '%delimiter '';'' nu... diff --git a/gpMgmt/bin/gpmovemirrors b/gpMgmt/bin/gpmovemirrors index 7daae009cc1..7220a0f897e 100755 --- a/gpMgmt/bin/gpmovemirrors +++ b/gpMgmt/bin/gpmovemirrors @@ -338,7 +338,7 @@ try: gpArrayInstance = GpArray.initFromCatalog(dburl, utility=True) except DatabaseError as ex: logger.error('Failed to connect to database. Make sure the') - logger.error('CloudberryDB instance is running, and that') + logger.error('Cloudberry instance is running, and that') logger.error('your environment is correct, then rerun') logger.error('gpmovemirrors ' + ' '.join(sys.argv[1:])) sys.exit(1) diff --git a/gpMgmt/bin/gppylib/commands/gp.py b/gpMgmt/bin/gppylib/commands/gp.py index 3ec845203a8..9b3bb70c457 100644 --- a/gpMgmt/bin/gppylib/commands/gp.py +++ b/gpMgmt/bin/gppylib/commands/gp.py @@ -1208,7 +1208,7 @@ def get_coordinatorport(datadir): ###### def check_permissions(username): - logger.debug("--Checking that current user can use CloudberryDB binaries") + logger.debug("--Checking that current user can use Cloudberry binaries") chk_gpdb_id(username) @@ -1528,7 +1528,7 @@ def chk_gpdb_id(username): path="%s/bin/initdb" % GPHOME if not os.access(path,os.X_OK): raise GpError("File permission mismatch. The current user %s does not have sufficient" - " privileges to run the CloudberryDB binaries and management utilities." % username ) + " privileges to run the Cloudberry binaries and management utilities." % username ) def chk_local_db_running(datadir, port): @@ -1576,7 +1576,7 @@ def get_lockfile_name(port): def get_local_db_mode(coordinator_data_dir): - """ Gets the mode CloudberryDB is running in. + """ Gets the mode Cloudberry is running in. Possible return values are: 'NORMAL' 'RESTRICTED' @@ -1585,7 +1585,7 @@ def get_local_db_mode(coordinator_data_dir): mode = 'NORMAL' if not os.path.exists(coordinator_data_dir + '/postmaster.pid'): - raise Exception('Cloudberry database appears to be stopped') + raise Exception('Apache Cloudberry appears to be stopped') try: fp = open(coordinator_data_dir + '/postmaster.opts', 'r') @@ -1595,7 +1595,7 @@ def get_local_db_mode(coordinator_data_dir): elif optline.find('gp_role=utility') > 0: mode = 'UTILITY' except OSError: - raise Exception('Failed to open %s. Is Cloudberry Database running?' % coordinator_data_dir + '/postmaster.opts') + raise Exception('Failed to open %s. Is Apache Cloudberry running?' % coordinator_data_dir + '/postmaster.opts') except IOError: raise Exception('Failed to read options from %s' % coordinator_data_dir + '/postmaster.opts') finally: diff --git a/gpMgmt/bin/gppylib/gp_era.py b/gpMgmt/bin/gppylib/gp_era.py index 26391a2daa6..e8cf773a0ec 100644 --- a/gpMgmt/bin/gppylib/gp_era.py +++ b/gpMgmt/bin/gppylib/gp_era.py @@ -73,7 +73,7 @@ def format(self, f): """ Generate gp_era contents based on era value """ - f.write("# Cloudberry Database era.\n") + f.write("# Apache Cloudberry era.\n") f.write("# Do not change the contents of this file.\n") f.write('era = %s\n' % self.era) INFO('wrote era: %s' % self.era) diff --git a/gpMgmt/bin/gppylib/gparray.py b/gpMgmt/bin/gppylib/gparray.py index 83545fb82e8..904d72a648d 100755 --- a/gpMgmt/bin/gppylib/gparray.py +++ b/gpMgmt/bin/gppylib/gparray.py @@ -961,7 +961,7 @@ def initFromCatalog(dbURL, utility=False): version_str = dbconn.querySingleton(conn, "SELECT version()") version = GpVersion(version_str) if not version.isVersionCurrentRelease(): - raise Exception("Cannot connect to CloudberryDB version %s from installed version %s"%(version.getVersionRelease(), MAIN_VERSION[0])) + raise Exception("Cannot connect to Cloudberry version %s from installed version %s"%(version.getVersionRelease(), MAIN_VERSION[0])) # Get gp_internal_is_singlenode GUC is_singlenode = dbconn.querySingleton(conn, "SHOW gp_internal_is_singlenode") == "on" diff --git a/gpMgmt/bin/gppylib/gpversion.py b/gpMgmt/bin/gppylib/gpversion.py index 9d0a35e9f1a..a30aef28e3f 100644 --- a/gpMgmt/bin/gppylib/gpversion.py +++ b/gpMgmt/bin/gppylib/gpversion.py @@ -90,10 +90,10 @@ def __init__(self, version): # There are several version formats that we anticipate receiving: # # Versions from "postgres --gp-version": - # ".* (Cloudberry Database) build " + # ".* (Apache Cloudberry) build " # # Version from sql "select version()" - # ".* (Cloudberry Database build ) .*" + # ".* (Apache Cloudberry build ) .*" # # Versions from python code: # "" @@ -101,7 +101,7 @@ def __init__(self, version): # if isinstance(v, str): # See if it matches one of the two the long formats - regex = r"\(Cloudberry Database\)? ([^ ]+) build ([^ )]+)" + regex = r"\(Apache Cloudberry\)? ([^ ]+) build ([^ )]+)" m = re.search(regex, v) if m: (v, self.build) = m.groups() # (version, build) @@ -175,7 +175,7 @@ def __init__(self, version): # If part of the conversion process above failed, throw an error, except Exception as e: - raise Exception("Unrecognised CloudberryDB Version '%s' due to %s" % + raise Exception("Unrecognised Cloudberry Version '%s' due to %s" % (str(version), str(e))) #------------------------------------------------------------ diff --git a/gpMgmt/bin/gppylib/operations/package.py b/gpMgmt/bin/gppylib/operations/package.py index f1e73563846..93dfb22f8d0 100644 --- a/gpMgmt/bin/gppylib/operations/package.py +++ b/gpMgmt/bin/gppylib/operations/package.py @@ -146,7 +146,7 @@ def __init__(self, pkg, pkgname, main_rpm, version, architecture, os, gpdbversio version The version of the gppkg architecture The architecture for which the package is built os The operating system for which the package is built - gpdbversion The Cloudberry Database version for which package is built + gpdbversion The Apache Cloudberry version for which package is built description A short description for the package abspath This is the absolute path where the package sits on the host preinstall The cluster level preinstallation hooks @@ -405,15 +405,15 @@ def execute(self): gpdb_version = self._get_gpdb_version() required_gpdb_version = gppkg.gpdbversion - logger.debug('Cloudberry Database Version = %s' % gpdb_version) - logger.debug('Required Cloudberry Database version = %s' % required_gpdb_version) + logger.debug('Apache Cloudberry Version = %s' % gpdb_version) + logger.debug('Required Apache Cloudberry version = %s' % required_gpdb_version) if gpdb_version is None: - logger.error('Could not determine Cloudberry Database version') + logger.error('Could not determine Apache Cloudberry version') return False if not required_gpdb_version.isVersionRelease(gpdb_version): - logger.error('%s requires Cloudberry Database version %s' % (gppkg.pkgname, required_gpdb_version)) + logger.error('%s requires Apache Cloudberry version %s' % (gppkg.pkgname, required_gpdb_version)) return False return True diff --git a/gpMgmt/bin/gppylib/operations/test/regress/test_package/test_regress_simple_negative.py b/gpMgmt/bin/gppylib/operations/test/regress/test_package/test_regress_simple_negative.py index aa4a4ef5940..73eec7a5301 100755 --- a/gpMgmt/bin/gppylib/operations/test/regress/test_package/test_regress_simple_negative.py +++ b/gpMgmt/bin/gppylib/operations/test/regress/test_package/test_regress_simple_negative.py @@ -23,7 +23,7 @@ def test02_wrong_gpdbversion(self): alpha_spec = GppkgSpec("alpha", "1.0", gpdb_version) gppkg_file = self.build(alpha_spec, A_spec) - with self.assertRaisesRegex(ExecutionError, "requires Cloudberry Database version %s" % gpdb_version): + with self.assertRaisesRegex(ExecutionError, "requires Apache Cloudberry version %s" % gpdb_version): self.install(gppkg_file) def test03_install_twice(self): diff --git a/gpMgmt/bin/gppylib/operations/test/test_package.py b/gpMgmt/bin/gppylib/operations/test/test_package.py index 202a53db17c..648668c0045 100755 --- a/gpMgmt/bin/gppylib/operations/test/test_package.py +++ b/gpMgmt/bin/gppylib/operations/test/test_package.py @@ -443,7 +443,7 @@ def test02_wrong_gpdbversion(self): gppkg_spec = GppkgSpec("test", "1.0", gpdb_version) gppkg_file = self.build(gppkg_spec, rpm_spec) - with self.assertRaisesRegex(ExecutionError, "requires Cloudberry Database version %s" % gpdb_version): + with self.assertRaisesRegex(ExecutionError, "requires Apache Cloudberry version %s" % gpdb_version): self.install(gppkg_file) def test03_install_twice(self): diff --git a/gpMgmt/bin/gppylib/programs/clsAddMirrors.py b/gpMgmt/bin/gppylib/programs/clsAddMirrors.py index de67b18a941..4174d5e8088 100644 --- a/gpMgmt/bin/gppylib/programs/clsAddMirrors.py +++ b/gpMgmt/bin/gppylib/programs/clsAddMirrors.py @@ -422,10 +422,10 @@ def __getMirrorsToBuildBasedOnOptions(self, gpEnv, gpArray): return self.__generateMirrorsToBuild(gpEnv, gpArray) def __displayAddMirrors(self, gpEnv, mirrorBuilder, gpArray): - logger.info('CloudberryDB Add Mirrors Parameters') + logger.info('Cloudberry Add Mirrors Parameters') logger.info('--------------------------------------------') - logger.info('CloudberryDB coordinator data directory = %s' % gpEnv.getCoordinatorDataDir()) - logger.info('CloudberryDB coordinator port = %d' % gpEnv.getCoordinatorPort()) + logger.info('Cloudberry coordinator data directory = %s' % gpEnv.getCoordinatorDataDir()) + logger.info('Cloudberry coordinator port = %d' % gpEnv.getCoordinatorPort()) logger.info('Batch size = %d' % self.__options.batch_size) logger.info('Segment batch size = %d' % self.__options.segment_batch_size) diff --git a/gpMgmt/bin/gppylib/programs/clsRecoverSegment.py b/gpMgmt/bin/gppylib/programs/clsRecoverSegment.py index 34764d7d451..b7018bc8a3f 100644 --- a/gpMgmt/bin/gppylib/programs/clsRecoverSegment.py +++ b/gpMgmt/bin/gppylib/programs/clsRecoverSegment.py @@ -11,7 +11,7 @@ # -S "Primary segment dbid to force recovery": I think this is done now by bringing the primary down, waiting for # failover, and then doing recover full # -z "Primary segment data dir and host to force recovery" see removed -S option for comment -# -f : force Cloudberry Database instance shutdown and restart +# -f : force Apache Cloudberry instance shutdown and restart # -F (HAS BEEN CHANGED) -- used to mean "force recovery" and now means "full recovery) # # import mainUtils FIRST to get python version check @@ -137,18 +137,18 @@ def syncPackages(self, new_hosts): # The design decision here is to squash any exceptions resulting from the # synchronization of packages. We should *not* disturb the user's attempts to recover. try: - self.logger.info('Syncing Cloudberry Database extensions') + self.logger.info('Syncing Apache Cloudberry extensions') operations = [SyncPackages(host) for host in new_hosts] ParallelOperation(operations, self.__options.parallelDegree).run() # introspect outcomes for operation in operations: operation.get_ret() except: - self.logger.exception('Syncing of Cloudberry Database extensions has failed.') + self.logger.exception('Syncing of Apache Cloudberry extensions has failed.') self.logger.warning('Please run gppkg --clean after successful segment recovery.') def displayRecovery(self, mirrorBuilder, gpArray): - self.logger.info('CloudberryDB instance recovery parameters') + self.logger.info('Cloudberry instance recovery parameters') self.logger.info('---------------------------------------------------------') if self.__options.recoveryConfigFile: @@ -270,7 +270,7 @@ def run(self): if not gpArray.hasMirrors and not gpArray.standbyCoordinator: raise ExceptionNoStackTraceNeeded( - 'GPDB Mirroring replication is not configured for this Cloudberry Database instance.') + 'GPDB Mirroring replication is not configured for this Apache Cloudberry instance.') num_workers = min(len(gpArray.get_hostlist()), self.__options.parallelDegree) hosts = set(gpArray.get_hostlist(includeCoordinator=False)) diff --git a/gpMgmt/bin/gppylib/programs/clsSystemState.py b/gpMgmt/bin/gppylib/programs/clsSystemState.py index 05e5416254f..877a79b0b6c 100644 --- a/gpMgmt/bin/gppylib/programs/clsSystemState.py +++ b/gpMgmt/bin/gppylib/programs/clsSystemState.py @@ -473,7 +473,7 @@ def __showStatusStatistics(self, gpEnv, gpArray): """ hostNameToResults = self.__fetchAllSegmentData(gpArray) - logger.info("CloudberryDB instance status summary") + logger.info("Cloudberry instance status summary") # coordinator summary info tabLog = TableLogger().setWarnWithArrows(True) @@ -914,15 +914,15 @@ def __showStatus(self, gpEnv, gpArray): tabLog.info(["Coordinator port", "= %d" % coordinator.getSegmentPort()]) tabLog.info(["Coordinator current role", "= %s" % qdRole]) - tabLog.info(["CloudberryDB initsystem version", "= %s" % initDbVersion]) + tabLog.info(["Cloudberry initsystem version", "= %s" % initDbVersion]) if statusFetchWarning is None: if coordinatorData[gp.SEGMENT_STATUS__GET_VERSION] is None: - tabLog.warn(["CloudberryDB current version", "= Unknown"]) + tabLog.warn(["Cloudberry current version", "= Unknown"]) else: - tabLog.info(["CloudberryDB current version", "= %s" % coordinatorData[gp.SEGMENT_STATUS__GET_VERSION]]) + tabLog.info(["Cloudberry current version", "= %s" % coordinatorData[gp.SEGMENT_STATUS__GET_VERSION]]) else: - tabLog.warn(["CloudberryDB current version", "= Error fetching data: %s" % statusFetchWarning]) + tabLog.warn(["Cloudberry current version", "= Error fetching data: %s" % statusFetchWarning]) tabLog.info(["Postgres version", "= %s" % pgVersion]) self.__appendStandbySummary(hostNameToResults, gpArray.standbyCoordinator, tabLog) @@ -1299,7 +1299,7 @@ def __showQuickStatus(self, gpEnv, gpArray): exitCode = 0 - logger.info("-Quick Cloudberry Database status from Coordinator instance only") + logger.info("-Quick Apache Cloudberry status from Coordinator instance only") logger.info( "----------------------------------------------------------") segments = [seg for seg in gpArray.getDbList() if seg.isSegmentQE()] diff --git a/gpMgmt/bin/gppylib/programs/gppkg.py b/gpMgmt/bin/gppylib/programs/gppkg.py index b2ed2fdce9d..f784386ea5f 100755 --- a/gpMgmt/bin/gppylib/programs/gppkg.py +++ b/gpMgmt/bin/gppylib/programs/gppkg.py @@ -87,7 +87,7 @@ def __init__(self, options, args): @staticmethod def create_parser(): parser = OptParser(option_class=OptChecker, - description="CloudberryDB Package Manager", + description="Cloudberry Package Manager", version='%prog version $Revision: #1 $') parser.setHelp([]) diff --git a/gpMgmt/bin/gppylib/system/environment.py b/gpMgmt/bin/gppylib/system/environment.py index 04635aeab5f..e5871afc10a 100644 --- a/gpMgmt/bin/gppylib/system/environment.py +++ b/gpMgmt/bin/gppylib/system/environment.py @@ -42,7 +42,7 @@ def __init__(self, coordinatorDataDir, readFromCoordinatorCatalog, timeout=None, self.__gpVersion = gp.GpVersion.local('local DB software version check',self.__gpHome) if verbose: - logger.info("local CloudberryDB Version: '%s'" % self.__gpVersion) + logger.info("local Cloudberry Version: '%s'" % self.__gpVersion) # read collation settings from coordinator if readFromCoordinatorCatalog: @@ -51,7 +51,7 @@ def __init__(self, coordinatorDataDir, readFromCoordinatorCatalog, timeout=None, # MPP-13807, read/show the coordinator's database version too self.__pgVersion = dbconn.queryRow(conn, "select version();")[0] - logger.info("coordinator CloudberryDB Version: '%s'" % self.__pgVersion) + logger.info("coordinator Cloudberry Version: '%s'" % self.__pgVersion) conn.close() else: self.__pgVersion = None diff --git a/gpMgmt/bin/gppylib/test/unit/test_unit_gparray.py b/gpMgmt/bin/gppylib/test/unit/test_unit_gparray.py index d7d92ec036c..c1c3bf5fb08 100755 --- a/gpMgmt/bin/gppylib/test/unit/test_unit_gparray.py +++ b/gpMgmt/bin/gppylib/test/unit/test_unit_gparray.py @@ -229,7 +229,7 @@ def _validate_get_segment_list(self, gparray, hostlist, expansion_hosts, primary for i in range(len(expected)): self.assertEqual(expected[i], actual[i]) - @patch('gppylib.db.dbconn.querySingleton', return_value='PostgreSQL 8.3.23 (Cloudberry Database 5.0.0 build dev) on x86_64-pc-linux-gnu, compiled by GCC gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-17) compiled on Feb 9 2017 23:06:31') + @patch('gppylib.db.dbconn.querySingleton', return_value='PostgreSQL 8.3.23 (Apache Cloudberry 5.0.0 build dev) on x86_64-pc-linux-gnu, compiled by GCC gcc (GCC) 4.4.7 20120313 (Red Hat 4.4.7-17) compiled on Feb 9 2017 23:06:31') @patch('gppylib.db.dbconn.connect', autospec=True) def test_initFromCatalog_mismatched_versions(self, mock_connect, mock_query): with self.assertRaisesRegex(Exception, 'Cannot connect to GPDB version 5 from installed version 7'): diff --git a/gpMgmt/bin/gppylib/test/unit/test_unit_gpinitsystem.py b/gpMgmt/bin/gppylib/test/unit/test_unit_gpinitsystem.py index 56b79f63e10..a3fdad0e911 100644 --- a/gpMgmt/bin/gppylib/test/unit/test_unit_gpinitsystem.py +++ b/gpMgmt/bin/gppylib/test/unit/test_unit_gpinitsystem.py @@ -13,15 +13,15 @@ def test_option_cluster_configfile_and_input_configfile_should_error(self): p = Popen([self.gpinitsystem_path, '-c', 'cluster_configfile', '-I', 'input_configfile'], stdout=PIPE) output = p.stdout.read().decode() self.assertIn("[FATAL]:-Options [-c] and [-I] cannot be used at the same time.", output) - self.assertNotIn("Creates a new Cloudberry Database instance", output) - self.assertNotIn("Initializes a Cloudberry Database system by using configuration", output) + self.assertNotIn("Creates a new Apache Cloudberry instance", output) + self.assertNotIn("Initializes a Apache Cloudberry system by using configuration", output) def test_option_without_neither_cluster_configfile_and_input_configfile_should_error(self): p = Popen([self.gpinitsystem_path], stdout=PIPE) output = p.stdout.read().decode() self.assertIn("[FATAL]:-At least one of two options, [-c] or [-I], is required", output) - self.assertNotIn("Creates a new Cloudberry Database instance", output) - self.assertNotIn("Initializes a Cloudberry Database system by using configuration", output) + self.assertNotIn("Creates a new Apache Cloudberry instance", output) + self.assertNotIn("Initializes a Apache Cloudberry system by using configuration", output) def test_option_with_input_configfile_should_work(self): p = Popen([self.gpinitsystem_path, '-I', 'input_configfile'], stdout=PIPE) @@ -36,15 +36,15 @@ def test_option_with_cluster_configfile_should_work(self): def test_option_help_prints_docs_usage(self): p = Popen([self.gpinitsystem_path, '--help'], stdout=PIPE) output = p.stdout.read().decode() - self.assertIn("Initializes a Cloudberry Database system by using configuration", output) - self.assertNotIn("Creates a new Cloudberry Database instance", output) + self.assertIn("Initializes a Apache Cloudberry system by using configuration", output) + self.assertNotIn("Creates a new Apache Cloudberry instance", output) def test_invalid_option_prints_raw_usage(self): p = Popen([self.gpinitsystem_path, '--unknown-option'], stdout=PIPE) output = p.stdout.read().decode() self.assertIn("[ERROR]:-Unknown option --unknown-option", output) - self.assertIn("Creates a new Cloudberry Database instance", output) - self.assertNotIn("Initializes a Cloudberry Database system by using configuration", output) + self.assertIn("Creates a new Apache Cloudberry instance", output) + self.assertNotIn("Initializes a Apache Cloudberry system by using configuration", output) if __name__ == '__main__': run_tests() diff --git a/gpMgmt/bin/gppylib/test/unit/test_unit_gprecoverseg.py b/gpMgmt/bin/gppylib/test/unit/test_unit_gprecoverseg.py index 69cdf4ae8f0..292a6b8b5f1 100644 --- a/gpMgmt/bin/gppylib/test/unit/test_unit_gprecoverseg.py +++ b/gpMgmt/bin/gppylib/test/unit/test_unit_gprecoverseg.py @@ -274,7 +274,7 @@ def test_successful_recover(self, _): def test_gprecoverseg_with_mirrorless(self): self.gpArrayMock.hasMirrors = False with self.assertRaisesRegex(ExceptionNoStackTraceNeeded, - "GPDB Mirroring replication is not configured for this Cloudberry Database instance."): + "GPDB Mirroring replication is not configured for this Apache Cloudberry instance."): self.subject.run() def _create_gparray_with_2_primary_2_mirrors(self): diff --git a/gpMgmt/bin/gppylib/test/unit/test_unit_gpversion.py b/gpMgmt/bin/gppylib/test/unit/test_unit_gpversion.py index df5245a8a42..864ef4f6089 100755 --- a/gpMgmt/bin/gppylib/test/unit/test_unit_gpversion.py +++ b/gpMgmt/bin/gppylib/test/unit/test_unit_gpversion.py @@ -54,7 +54,7 @@ def test_case_4(self): self.assertTrue(v34 < "4.0") def test_case_5(self): - vShort = GpVersion("postgres (Cloudberry Database) 3.3.5.0 build 3") + vShort = GpVersion("postgres (Apache Cloudberry) 3.3.5.0 build 3") self.assertTrue(vShort.isVersionCurrentRelease() == False ) self.assertTrue(vShort.getVersionBuild() == '3') @@ -66,7 +66,7 @@ def test_case_5(self): def test_case_6(self): - vLong = GpVersion("PostgreSQL 8.2.14 (Cloudberry Database 3.4.filerep build 0) on i386-apple-darwin9.8.0, compiled by GCC i686-apple-darwin9-gcc-4.0.1 (GCC) 4.0.1 (Apple Inc. build 5465) compiled on Feb 16 2010 11:25:31 (with assert checking)") + vLong = GpVersion("PostgreSQL 8.2.14 (Apache Cloudberry 3.4.filerep build 0) on i386-apple-darwin9.8.0, compiled by GCC i686-apple-darwin9-gcc-4.0.1 (GCC) 4.0.1 (Apple Inc. build 5465) compiled on Feb 16 2010 11:25:31 (with assert checking)") self.assertTrue(vLong.isVersionCurrentRelease() == False ) self.assertTrue(vLong.getVersionBuild() == 'filerep') @@ -99,7 +99,7 @@ def test_50(self): self.assertEqual(v_2.getVersionRelease(), "4.2") def test_case_7(self): - vLong = GpVersion("PostgreSQL 9.4.20 (Cloudberry Database 7.0.0 build dev) on x86_64-unknown-linux-gnu, compiled by gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0, 64-bit compiled on Jul 8 2019 16:27:59") + vLong = GpVersion("PostgreSQL 9.4.20 (Apache Cloudberry 7.0.0 build dev) on x86_64-unknown-linux-gnu, compiled by gcc (Ubuntu 7.4.0-1ubuntu1~18.04.1) 7.4.0, 64-bit compiled on Jul 8 2019 16:27:59") self.assertTrue(vLong.isVersionCurrentRelease() == True ) self.assertTrue(vLong.getVersionBuild() == 'dev') self.assertTrue(vLong.getVersionRelease() == "7") diff --git a/gpMgmt/bin/gpshrink b/gpMgmt/bin/gpshrink index 7fca96982c9..4b1603e5093 100644 --- a/gpMgmt/bin/gpshrink +++ b/gpMgmt/bin/gpshrink @@ -1404,7 +1404,7 @@ def main(options, args, parser): gparray = GpArray.initFromCatalog(dburl, utility=True) except DatabaseError as ex: logger.error('Failed to connect to database. Make sure the') - logger.error('CloudberryDB instance you wish to shrink is running') + logger.error('Cloudberry instance you wish to shrink is running') logger.error('and that your environment is correct, then rerun') logger.error('gshrink ' + ' '.join(sys.argv[1:])) sys.exit(1) diff --git a/gpMgmt/bin/gpstart b/gpMgmt/bin/gpstart index 6f6e8f6915e..7ef8912f7b9 100755 --- a/gpMgmt/bin/gpstart +++ b/gpMgmt/bin/gpstart @@ -157,7 +157,7 @@ class GpStart: logger.warning("****************************************************************************") logger.warning("Coordinator-only start requested. If a standby is configured, this command") logger.warning("may lead to a split-brain condition and possible unrecoverable data loss.") - logger.warning("Maintenance mode should only be used with direction from CloudberryDB Support.") + logger.warning("Maintenance mode should only be used with direction from Cloudberry Support.") logger.warning("****************************************************************************") if self.interactive: if not userinput.ask_yesno(None, "\nContinue with coordinator-only startup", 'N'): @@ -215,7 +215,7 @@ class GpStart: if self.interactive: self._summarize_actions(segmentsToStart) - if not userinput.ask_yesno(None, "\nContinue with CloudberryDB instance startup", 'N'): + if not userinput.ask_yesno(None, "\nContinue with Cloudberry instance startup", 'N'): raise UserAbortedException() try: @@ -290,13 +290,13 @@ class GpStart: ###### def _check_version(self): self.gpversion = gp.GpVersion.local('local CBDB software version check', self.gphome) - logger.info("CloudberryDB Binary Version: '%s'" % self.gpversion) + logger.info("Cloudberry Binary Version: '%s'" % self.gpversion) # It would be nice to work out the catalog version => greenplum version # calculation so that we can print out nicer error messages when # version doesn't match. bin_catversion = gp.GpCatVersion.local('local CBDB software catalag version check', self.gphome) - logger.info("CloudberryDB Catalog Version: '%s'" % bin_catversion) + logger.info("Cloudberry Catalog Version: '%s'" % bin_catversion) dir_catversion = gp.GpCatVersionDirectory.local('local CBDB directory catalog version check', self.coordinator_datadir) @@ -506,7 +506,7 @@ class GpStart: logger.fatal("Failed to start Coordinator instance in admin mode") cmd.validate() - logger.info("Obtaining CloudberryDB Coordinator catalog information") + logger.info("Obtaining Cloudberry Coordinator catalog information") logger.info("Obtaining Segment details from coordinator...") self.dburl = dbconn.DbURL(port=self.port, dbname='template1') diff --git a/gpMgmt/bin/gpstop b/gpMgmt/bin/gpstop index f886cd431bd..41c8792dc74 100755 --- a/gpMgmt/bin/gpstop +++ b/gpMgmt/bin/gpstop @@ -208,7 +208,7 @@ class GpStop: if self.interactive: self._summarize_actions(segs) - if not userinput.ask_yesno(None, "\nContinue with CloudberryDB instance shutdown", 'N'): + if not userinput.ask_yesno(None, "\nContinue with Cloudberry instance shutdown", 'N'): raise UserAbortedException() try: @@ -320,8 +320,8 @@ class GpStop: ###### def _check_version(self): - self.gpversion = gp.GpVersion.local('local CloudberryDB version check', self.gphome) - logger.info("CloudberryDB Version: '%s'" % self.gpversion) + self.gpversion = gp.GpVersion.local('local Cloudberry version check', self.gphome) + logger.info("Cloudberry Version: '%s'" % self.gpversion) ###### def _read_postgresqlconf(self): @@ -353,11 +353,11 @@ class GpStop: pass else: raise ExceptionNoStackTraceNeeded( - 'postmaster.pid file does not exist. is CloudberryDB instance already stopped?') + 'postmaster.pid file does not exist. is Cloudberry instance already stopped?') ###### def _build_gparray(self): - logger.info("Obtaining CloudberryDB Coordinator catalog information") + logger.info("Obtaining Cloudberry Coordinator catalog information") logger.info("Obtaining Segment details from coordinator...") self.dburl = dbconn.DbURL(port=self.port, dbname='template1') @@ -815,7 +815,7 @@ class GpStop: logger.info("--------------------------------------------") tabLog = TableLogger(logger=logger).setWarnWithArrows(True) - tabLog.info(["Coordinator CloudberryDB instance process active PID", "= %s" % self.pid]) + tabLog.info(["Coordinator Cloudberry instance process active PID", "= %s" % self.pid]) tabLog.info(["Database", "= %s" % self.dburl.pgdb]) tabLog.info(["Coordinator port", "= %s" % self.port]) tabLog.info(["Coordinator directory", "= %s" % self.coordinator_datadir]) @@ -869,13 +869,13 @@ class GpStop: help='set the method of shutdown') addTo.add_option('-r', '--restart', action='store_true', - help='Restart Cloudberry Database instance after successful gpstop.') + help='Restart Apache Cloudberry instance after successful gpstop.') addTo.add_option('-m', '--master_only', '-c', '--coordinator_only', dest='coordinator_only', action='store_true', help='stop coordinator instance started in maintenance mode') addTo.add_option('-y', dest="stop_standby", action='store_false', default=True, help='Do not stop the standby coordinator process.') addTo.add_option('-u', dest="request_sighup", action='store_true', - help="upload new coordinator postgresql.conf settings, does not stop CloudberryDB array," \ + help="upload new coordinator postgresql.conf settings, does not stop Cloudberry array," \ "issues a signal to the coordinator segment postmaster process to reload") addTo.add_option('-B', '--parallel', type="int", default=DEFAULT_NUM_WORKERS, metavar="", diff --git a/gpMgmt/bin/lib/gp_bash_functions.sh b/gpMgmt/bin/lib/gp_bash_functions.sh index 9dcda937913..0b5d2811c95 100755 --- a/gpMgmt/bin/lib/gp_bash_functions.sh +++ b/gpMgmt/bin/lib/gp_bash_functions.sh @@ -23,7 +23,7 @@ if hash brew 2> /dev/null; then CMDPATH+=("$(brew --prefix)/bin") fi -#GPPATH is the list of possible locations for the Cloudberry Database binaries, in precedence order +#GPPATH is the list of possible locations for the Apache Cloudberry binaries, in precedence order declare -a GPPATH GPPATH=( $GPHOME $MPPHOME $BIZHOME ) if [ ${#GPPATH[@]} -eq 0 ];then @@ -309,7 +309,7 @@ ERROR_EXIT () { DEBUG_LEVEL=1 if [ $BACKOUT_FILE ]; then if [ -s $BACKOUT_FILE ]; then - LOG_MSG "[WARN]:-Script has left Cloudberry Database in an incomplete state" + LOG_MSG "[WARN]:-Script has left Apache Cloudberry in an incomplete state" LOG_MSG "[WARN]:-Run command bash $BACKOUT_FILE on coordinator to remove these changes" $ECHO "$RM -f $BACKOUT_FILE" >> $BACKOUT_FILE fi @@ -1140,7 +1140,7 @@ CHK_GPDB_ID () { elif [ x$GPDB_GROUPID_CHK == x$COORDINATOR_INITDB_GROUPID ] && [ x"x" == x"$GROUP_EXECUTE" ] ; then LOG_MSG "[INFO]:-Current group id of $GPDB_GROUPID, matches initdb group id of $COORDINATOR_INITDB_GROUPID" else - LOG_MSG "[WARN]:-File permission mismatch. The $GPDB_ID_CHK owns the Cloudberry Database installation directory." + LOG_MSG "[WARN]:-File permission mismatch. The $GPDB_ID_CHK owns the Apache Cloudberry installation directory." LOG_MSG "[WARN]:-You are currently logged in as $COORDINATOR_INITDB_ID and may not have sufficient" LOG_MSG "[WARN]:-permissions to run the Cloudberry binaries and management utilities." fi diff --git a/gpMgmt/bin/minirepro b/gpMgmt/bin/minirepro index 5342dcf175f..93aa53ed08b 100755 --- a/gpMgmt/bin/minirepro +++ b/gpMgmt/bin/minirepro @@ -12,7 +12,7 @@ minirepro -? DESCRIPTION -For any SQL commands, the minirepro utility generates Cloudberry Database +For any SQL commands, the minirepro utility generates Apache Cloudberry information for the commands. The information can be analyzed by Pivotal support to perform root cause analysis. @@ -28,18 +28,18 @@ to the input SQL commands. PARAMETERS - Name of the Cloudberry Database. + Name of the Apache Cloudberry. -h - Cloudberry Database coordinator host. Default is localhost. + Apache Cloudberry coordinator host. Default is localhost. -U - Cloudberry Database user name to log into the database and run the + Apache Cloudberry user name to log into the database and run the SQL command. Default is the PGUSER environment variable. If PGUSER is not defined, OS user name running the utility is used. -p - Port that is used to connect to Cloudberry Database. + Port that is used to connect to Apache Cloudberry. Default is the PGPORT environment variable. If PGPORT is not defined, the default value is 5432. diff --git a/gpMgmt/demo/gpfdist_transform/README b/gpMgmt/demo/gpfdist_transform/README index 09a8b685d28..7313a0d47f9 100644 --- a/gpMgmt/demo/gpfdist_transform/README +++ b/gpMgmt/demo/gpfdist_transform/README @@ -1,5 +1,5 @@ ************************************************************************** -ABOUT THE GREENPLUM GPFDIST TRANSFORM DEMOS FOR CLOUDBERRY DATABASE +ABOUT THE GREENPLUM GPFDIST TRANSFORM DEMOS FOR Apache Cloudberry ************************************************************************** This package contains example programs of gpfdist transformations: diff --git a/gpMgmt/demo/gppkg/sample.control b/gpMgmt/demo/gppkg/sample.control index 11e979adf07..7a70231576f 100644 --- a/gpMgmt/demo/gppkg/sample.control +++ b/gpMgmt/demo/gppkg/sample.control @@ -5,4 +5,4 @@ Priority: optional Architecture: #arch Maintainer: GPDB Extension Description: sample - This is a sample control file to build deb packge in gppkg for Cloudberry Database. + This is a sample control file to build deb packge in gppkg for Apache Cloudberry. diff --git a/gpMgmt/doc/gpactivatestandby_help b/gpMgmt/doc/gpactivatestandby_help index 76e729cfac7..21b6bbc1f3e 100755 --- a/gpMgmt/doc/gpactivatestandby_help +++ b/gpMgmt/doc/gpactivatestandby_help @@ -1,7 +1,7 @@ COMMAND NAME: gpactivatestandby Activates a standby coordinator host and makes it the active coordinator for the -Cloudberry Database system. +Apache Cloudberry system. ***************************************************** @@ -22,8 +22,8 @@ DESCRIPTION The gpactivatestandby utility activates a backup, standby coordinator host and brings it into operation as the active coordinator instance for a -Cloudberry Database system. The activated standby coordinator effectively -becomes the Cloudberry Database coordinator, accepting client connections on +Apache Cloudberry system. The activated standby coordinator effectively +becomes the Apache Cloudberry coordinator, accepting client connections on the coordinator port. When you initialize a standby coordinator, the default is to use the same @@ -44,7 +44,7 @@ The utility will perform the following steps: * Activates the standby coordinator to be the new active coordinator for the system -* Restarts the Cloudberry Database system with the new coordinator host +* Restarts the Apache Cloudberry system with the new coordinator host A backup, standby Cloudberry coordinator host serves as a 'warm standby' in the event of the primary Cloudberry coordinator host becoming non-operational. @@ -74,7 +74,7 @@ query statistics. For example: psql dbname -c 'ANALYZE;' After you activate the standby coordinator as the primary coordinator, the -Cloudberry Database system no longer has a standby coordinator configured. You +Apache Cloudberry system no longer has a standby coordinator configured. You might want to specify another host to be the new standby with the gpinitstandby utility. @@ -134,7 +134,7 @@ EXAMPLES ***************************************************** Activate the standby coordinator host and make it the active coordinator instance -for a Cloudberry Database system (run from backup coordinator host you are +for a Apache Cloudberry system (run from backup coordinator host you are activating): gpactivatestandby -d /gpdata diff --git a/gpMgmt/doc/gpaddmirrors_help b/gpMgmt/doc/gpaddmirrors_help index 65ca4717983..ab8b3a8c7a4 100755 --- a/gpMgmt/doc/gpaddmirrors_help +++ b/gpMgmt/doc/gpaddmirrors_help @@ -1,6 +1,6 @@ COMMAND NAME: gpaddmirrors -Adds mirror segments to a Cloudberry Database system that was +Adds mirror segments to a Apache Cloudberry system that was initially configured without mirroring. @@ -29,13 +29,13 @@ gpaddmirrors --version DESCRIPTION ***************************************************** The gpaddmirrors utility configures mirror segment instances for an -existing Cloudberry Database system that was initially configured with +existing Apache Cloudberry system that was initially configured with primary segment instances only. The utility will create the mirror instances and begin the online replication process between the primary and mirror segment instances. Once all mirrors are synchronized with -their primaries, your Cloudberry Database system is fully data redundant. +their primaries, your Apache Cloudberry system is fully data redundant. -IMPORTANT: During the online replication process, Cloudberry Database +IMPORTANT: During the online replication process, Apache Cloudberry should be in a quiescent state, workloads and other queries should not be running. @@ -208,7 +208,7 @@ Valid values: 1-128 EXAMPLES ***************************************************** -Add mirroring to an existing Cloudberry Database system using +Add mirroring to an existing Apache Cloudberry system using the same set of hosts as your primary data. Calculate the mirror database ports by adding 100 to the current primary segment port numbers: @@ -216,7 +216,7 @@ numbers: $ gpaddmirrors -p 100 -Add mirroring to an existing Cloudberry Database system using a +Add mirroring to an existing Apache Cloudberry system using a different set of hosts from your primary data: $ gpaddmirrors -i mirror_config_file diff --git a/gpMgmt/doc/gpcheckperf_help b/gpMgmt/doc/gpcheckperf_help index 8fd95568530..2a3d348b43c 100755 --- a/gpMgmt/doc/gpcheckperf_help +++ b/gpMgmt/doc/gpcheckperf_help @@ -44,14 +44,14 @@ and runs the following performance tests: memory bandwidth (in MB/s). This tests that your system is not limited in performance by the memory bandwidth of the system in relation to the computational performance of the CPU. In applications - where the data set is large (as in Cloudberry Database), low memory + where the data set is large (as in Apache Cloudberry), low memory bandwidth is a major performance issue. If memory bandwidth is significantly lower than the theoretical bandwidth of the CPU, then it can cause the CPU to spend significant amounts of time waiting for data to arrive from system memory. * Network Performance Test (gpnetbench) - To test network performance - (and thereby the performance of the Cloudberry Database interconnect), + (and thereby the performance of the Apache Cloudberry interconnect), the utility runs a network benchmark program that transfers a 5 second stream of data from the current host to each remote host included in the test. The data is transferred in parallel to each @@ -94,7 +94,7 @@ OPTIONS -B Specifies the block size (in KB or MB) to use for disk I/O test. -The default is 32KB, which is the same as the Cloudberry Database +The default is 32KB, which is the same as the Apache Cloudberry page size. The maximum block size is 1 MB. --buffersize diff --git a/gpMgmt/doc/gpconfig_help b/gpMgmt/doc/gpconfig_help index 8961f2e1cf7..03066dba038 100644 --- a/gpMgmt/doc/gpconfig_help +++ b/gpMgmt/doc/gpconfig_help @@ -1,7 +1,7 @@ COMMAND NAME: gpconfig Sets server configuration parameters on all segments within -a Cloudberry Database system. +a Apache Cloudberry system. ***************************************************** SYNOPSIS @@ -24,7 +24,7 @@ DESCRIPTION The gpconfig utility allows you to set, unset, or view configuration parameters from the postgresql.conf files of all instances (coordinator, -segments, and mirrors) in your Cloudberry Database system. When setting +segments, and mirrors) in your Apache Cloudberry system. When setting a parameter, you can also specify a different value for the coordinator if necessary. For example, parameters such as max_connections require a different setting on the coordinator than what is used for the segments. @@ -46,7 +46,7 @@ and later add it back (set a new value), there will be two instances of the parameter; one that is commented out, and one that is enabled and inserted at the bottom of the postgresql.conf file. -After setting a parameter, you must restart your Cloudberry Database +After setting a parameter, you must restart your Apache Cloudberry system or reload the postgresql.conf files in order for the change to take effect. Whether you require a restart or a reload depends on the parameter. See the Server Configuration Parameters reference for @@ -56,7 +56,7 @@ To show the currently set values for a parameter across the system, use the -s option. gpconfig uses the following environment variables to connect to -the Cloudberry Database coordinator instance and obtain system +the Apache Cloudberry coordinator instance and obtain system configuration information: * PGHOST * PGPORT @@ -109,7 +109,7 @@ Lists all configuration parameters supported by the gpconfig utility. -s | --show Shows the value for a configuration parameter used on all instances -(coordinator and segments) in the Cloudberry Database system. If there +(coordinator and segments) in the Apache Cloudberry system. If there is a discrepancy in a parameter value between segment instances, the gpconfig utility displays an error message. @@ -125,7 +125,7 @@ to take effect. --file For a configuration parameter, shows the value from the postgresql.conf -file on all instances (coordinator and segments) in the Cloudberry Database +file on all instances (coordinator and segments) in the Apache Cloudberry system. If there is a discrepancy in a parameter value between segment instances, the gpconfig utility displays a warning message. Must be specified with the -s option. diff --git a/gpMgmt/doc/gpconfigs/gpinitsystem_singlenode b/gpMgmt/doc/gpconfigs/gpinitsystem_singlenode index e10e7a27320..919ae920d72 100644 --- a/gpMgmt/doc/gpconfigs/gpinitsystem_singlenode +++ b/gpMgmt/doc/gpconfigs/gpinitsystem_singlenode @@ -1,7 +1,7 @@ # FILE NAME: gpinitsystem_singlenode # A configuration file is needed by the gpinitsystem utility. -# This sample file initializes a Cloudberry Database Single Node +# This sample file initializes a Apache Cloudberry Single Node # Edition (SNE) system with one coordinator and two segment instances # on the local host. This file is referenced when you run gpinitsystem. @@ -21,7 +21,7 @@ MACHINE_LIST_FILE=./hostlist_singlenode # This specifies a prefix that will be used to name the data directories # of the coordinator and segment instances. The naming convention for data -# directories in a Cloudberry Database system is SEG_PREFIX +# directories in a Apache Cloudberry system is SEG_PREFIX # where starts with 0 for segment instances and the coordinator # is always -1. So for example, if you choose the prefix gpsne, your # coordinator instance data directory would be named gpsne-1, and the segment @@ -54,7 +54,7 @@ PORT_BASE=6000 declare -a DATA_DIRECTORY=(/gpdata1 /gpdata2) -# The OS-configured hostname of the Cloudberry Database coordinator instance. +# The OS-configured hostname of the Apache Cloudberry coordinator instance. COORDINATOR_HOSTNAME=hostname_of_machine @@ -71,7 +71,7 @@ COORDINATOR_DIRECTORY=/gpmaster # The port number for the coordinator instance. This is the port number # that users and client connections will use when accessing the -# Cloudberry Database system. +# Apache Cloudberry system. COORDINATOR_PORT=5432 diff --git a/gpMgmt/doc/gpdeletesystem_help b/gpMgmt/doc/gpdeletesystem_help index d18bb8a7d50..698ca94e967 100755 --- a/gpMgmt/doc/gpdeletesystem_help +++ b/gpMgmt/doc/gpdeletesystem_help @@ -1,6 +1,6 @@ COMMAND NAME: gpdeletesystem -Deletes a Cloudberry Database system that was initialized +Deletes a Apache Cloudberry system that was initialized using gpinitsystem. @@ -29,7 +29,7 @@ The gpdeletesystem script will perform the following actions: Before running this script, you should move any backup files (created by gp_dump) out of the coordinator and segment data directories. -This script will not uninstall the Cloudberry Database software. +This script will not uninstall the Apache Cloudberry software. ***************************************************** @@ -58,7 +58,7 @@ segment instances it needs to delete. -f (force) Force a delete even if backup files are found in the data directories. -The default is to not delete Cloudberry Database instances if backup +The default is to not delete Apache Cloudberry instances if backup files (created by gp_dump) are present. @@ -86,12 +86,12 @@ Displays the version, status, last updated date, and check sum of this script. EXAMPLES ***************************************************** -Delete a Cloudberry Database system: +Delete a Apache Cloudberry system: gpdeletesystem -d /gpdata/gp-1 -Delete a Cloudberry Database system even if backup files are present: +Delete a Apache Cloudberry system even if backup files are present: gpdeletesystem -d /gpdata/gp-1 -f diff --git a/gpMgmt/doc/gpexpand_help b/gpMgmt/doc/gpexpand_help index b29097c021d..26a626811c2 100644 --- a/gpMgmt/doc/gpexpand_help +++ b/gpMgmt/doc/gpexpand_help @@ -1,6 +1,6 @@ COMMAND NAME: gpexpand -Expands an existing Cloudberry Database across new hosts in the array. +Expands an existing Apache Cloudberry across new hosts in the array. ****************************************************** SYNOPSIS @@ -25,7 +25,7 @@ gpexpand --version PREREQUISITES ****************************************************** -* You are logged in as the Cloudberry Database superuser (gpadmin). +* You are logged in as the Apache Cloudberry superuser (gpadmin). * The new segment hosts have been installed and configured as per the existing segment hosts. This involves: @@ -37,10 +37,10 @@ PREREQUISITES * Enough disk space on your segment hosts to temporarily hold a copy of your largest table. -* When redistributing data, Cloudberry Database must be running in - production mode. Cloudberry Database cannot be restricted mode or in +* When redistributing data, Apache Cloudberry must be running in + production mode. Apache Cloudberry cannot be restricted mode or in coordinator mode. The gpstart options -R or -m cannot be specified to start - Cloudberry Database. + Apache Cloudberry. ****************************************************** diff --git a/gpMgmt/doc/gpfdist_help b/gpMgmt/doc/gpfdist_help index 5bf7d0f442a..6a512c0b8f6 100755 --- a/gpMgmt/doc/gpfdist_help +++ b/gpMgmt/doc/gpfdist_help @@ -1,6 +1,6 @@ COMMAND NAME: gpfdist -Serves data files to or writes data files out from Cloudberry Database +Serves data files to or writes data files out from Apache Cloudberry segments. ***************************************************** @@ -19,13 +19,13 @@ DESCRIPTION gpfdist is Cloudberry's parallel file distribution program. It is used by readable external tables and gpload to serve external table files to -all Cloudberry Database segments in parallel. It is used by writable -external tables to accept output streams from Cloudberry Database +all Apache Cloudberry segments in parallel. It is used by writable +external tables to accept output streams from Apache Cloudberry segments in parallel and write them out to a file. In order for gpfdist to be used by an external table, the LOCATION clause of the external table definition must specify the external table -data using the gpfdist:// protocol (see the Cloudberry Database command +data using the gpfdist:// protocol (see the Apache Cloudberry command CREATE EXTERNAL TABLE). NOTE: If the --ssl option is specified to enable SSL security, create @@ -37,7 +37,7 @@ offering the best performance as well as easier administration of external tables. For readable external tables, gpfdist parses and serves data files -evenly to all the segment instances in the Cloudberry Database system +evenly to all the segment instances in the Apache Cloudberry system when users SELECT from the external table. For writable external tables, gpfdist accepts parallel output streams from the segments when users INSERT into the external table, and writes to an output file. @@ -52,7 +52,7 @@ Windows platforms, and writable external tables do not support compression on any platforms. Most likely, you will want to run gpfdist on your ETL machines rather -than the hosts where Cloudberry Database is installed. To install gpfdist +than the hosts where Apache Cloudberry is installed. To install gpfdist on another host, simply copy the utility over to that host and add gpfdist to your $PATH. @@ -87,7 +87,7 @@ OPTIONS -t - Sets the time allowed for Cloudberry Database to establish a connection + Sets the time allowed for Apache Cloudberry to establish a connection to a gpfdist process. Default is 5 seconds. Allowed values are 2 to 600 seconds. May need to be increased on systems with a lot of network traffic. @@ -111,13 +111,13 @@ OPTIONS -w