You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudberry.apache.org by ma...@apache.org on 2025/01/10 02:28:25 UTC
(cloudberry) 10/18: Fix spelling errors identified by lintian (#15483)
This is an automated email from the ASF dual-hosted git repository.
maxyang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit 189aaf7a7950f529cfb0f2a23912ae70dabbdc55
Author: Bradford Boyle <br...@users.noreply.github.com>
AuthorDate: Tue May 9 09:52:24 2023 -0700
Fix spelling errors identified by lintian (#15483)
---
src/backend/commands/tablecmds.c | 2 +-
src/backend/parser/parse_relation.c | 2 +-
src/backend/utils/misc/guc_gp.c | 2 +-
.../expected/segwalrep/recoverseg_from_file.out | 2 +-
.../sql/segwalrep/recoverseg_from_file.sql | 2 +-
src/test/regress/expected/partition_expand.out | 6 ++---
src/test/regress/expected/tidscan.out | 26 ++++++++++++++++------
src/test/regress/expected/tidscan_optimizer.out | 26 ++++++++++++++++------
src/test/regress/sql/tidscan.sql | 17 ++++++++------
9 files changed, 56 insertions(+), 29 deletions(-)
diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index f6ee3a0c30..a149a189f1 100644
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -5672,7 +5672,7 @@ ATPrepCmd(List **wqueue, Relation rel, AlterTableCmd *cmd,
{
ereport(NOTICE,
(errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
- errmsg("skipped, table \"%s\" has already been expanded partiton prepare",
+ errmsg("skipped, table \"%s\" has already been expanded partition prepare",
RelationGetRelationName(rel))));
pass = AT_PASS_MISC; /* We do nothing here */
break;
diff --git a/src/backend/parser/parse_relation.c b/src/backend/parser/parse_relation.c
index 2c274eefe9..be22e80874 100644
--- a/src/backend/parser/parse_relation.c
+++ b/src/backend/parser/parse_relation.c
@@ -1496,7 +1496,7 @@ addRangeTableEntry(ParseState *pstate,
lockmode = pstate->p_canOptSelectLockingClause ? RowShareLock : ExclusiveLock;
if (lockmode == ExclusiveLock && locking->waitPolicy != LockWaitBlock)
ereport(WARNING,
- (errmsg("Upgrade the lockmode to ExclusiveLock on table(%s) and ingore the wait policy.",
+ (errmsg("Upgrade the lockmode to ExclusiveLock on table(%s) and ignore the wait policy.",
RelationGetRelationName(rel))));
heap_close(rel, NoLock);
diff --git a/src/backend/utils/misc/guc_gp.c b/src/backend/utils/misc/guc_gp.c
index 3c8d8e1881..ff8d828569 100644
--- a/src/backend/utils/misc/guc_gp.c
+++ b/src/backend/utils/misc/guc_gp.c
@@ -2906,7 +2906,7 @@ struct config_bool ConfigureNamesBool_gp[] =
{
{"gp_allow_date_field_width_5digits", PGC_USERSET, COMPAT_OPTIONS_PREVIOUS,
- gettext_noop("Allow parsing input date field with exactly continous 5 digits in non-standard YYYMMDD timeformat (follow pg12+ behave)"),
+ gettext_noop("Allow parsing input date field with exactly continuous 5 digits in non-standard YYYMMDD timeformat (follow pg12+ behave)"),
NULL,
GUC_NO_SHOW_ALL | GUC_NOT_IN_SAMPLE
},
diff --git a/src/test/isolation2/expected/segwalrep/recoverseg_from_file.out b/src/test/isolation2/expected/segwalrep/recoverseg_from_file.out
index 13d8ee0afb..00921bb1b3 100644
--- a/src/test/isolation2/expected/segwalrep/recoverseg_from_file.out
+++ b/src/test/isolation2/expected/segwalrep/recoverseg_from_file.out
@@ -5,7 +5,7 @@
-- This is caused by gprecoverseg fetch the smallest dbid in
-- gp_segment_configuration which is not occupied by others when
-- adding a new mirror. When dbid in gp_segment_configuration is not
--- continous, the inconsistent issue will happen
+-- continuous, the inconsistent issue will happen
--
-- generate_recover_config_file:
diff --git a/src/test/isolation2/sql/segwalrep/recoverseg_from_file.sql b/src/test/isolation2/sql/segwalrep/recoverseg_from_file.sql
index 5f756962e4..eb7b0194c5 100644
--- a/src/test/isolation2/sql/segwalrep/recoverseg_from_file.sql
+++ b/src/test/isolation2/sql/segwalrep/recoverseg_from_file.sql
@@ -5,7 +5,7 @@
-- This is caused by gprecoverseg fetch the smallest dbid in
-- gp_segment_configuration which is not occupied by others when
-- adding a new mirror. When dbid in gp_segment_configuration is not
--- continous, the inconsistent issue will happen
+-- continuous, the inconsistent issue will happen
--
-- generate_recover_config_file:
diff --git a/src/test/regress/expected/partition_expand.out b/src/test/regress/expected/partition_expand.out
index 2acdcb07f7..05e3d180a3 100644
--- a/src/test/regress/expected/partition_expand.out
+++ b/src/test/regress/expected/partition_expand.out
@@ -99,7 +99,7 @@ select gp_segment_id, localoid::regclass, policytype, numsegments, distkey, dist
(12 rows)
alter table t_hash_partition expand partition prepare;
-NOTICE: skipped, table "t_hash_partition" has already been expanded partiton prepare
+NOTICE: skipped, table "t_hash_partition" has already been expanded partition prepare
--dml of parent table
select count(*) from t_hash_partition;
count
@@ -282,7 +282,7 @@ select gp_segment_id, localoid::regclass, policytype, numsegments, distkey, dist
alter table t_randomly_partition expand partition prepare;
-NOTICE: skipped, table "t_randomly_partition" has already been expanded partiton prepare
+NOTICE: skipped, table "t_randomly_partition" has already been expanded partition prepare
--dml of parent table
select count(*) from t_randomly_partition;
count
@@ -553,7 +553,7 @@ select gp_segment_id, localoid::regclass, policytype, numsegments, distkey, dist
(30 rows)
alter table t_hash_subpartition expand partition prepare;
-NOTICE: skipped, table "t_hash_subpartition" has already been expanded partiton prepare
+NOTICE: skipped, table "t_hash_subpartition" has already been expanded partition prepare
--dml of parent table
select count(*) from t_hash_subpartition;
count
diff --git a/src/test/regress/expected/tidscan.out b/src/test/regress/expected/tidscan.out
index fa1482aa81..c36ba953ae 100644
--- a/src/test/regress/expected/tidscan.out
+++ b/src/test/regress/expected/tidscan.out
@@ -331,11 +331,23 @@ SELECT count(*) FROM tenk1 t1 JOIN tenk1 t2 ON t1.ctid = t2.ctid and t1.gp_segme
(1 row)
RESET enable_hashjoin;
--- GPDB_13_MERGE_FIXME
--- --check predicate lock on CTID
--- BEGIN ISOLATION LEVEL SERIALIZABLE;
--- SELECT * FROM tidscan WHERE ctid = '(0,1)';
--- -- locktype should be 'tuple'
--- SELECT locktype, mode FROM pg_locks WHERE pid = pg_backend_pid() AND mode = 'SIReadLock';
--- ROLLBACK;
+-- check predicate lock on CTID
+-- GPDB_12_MERGE_FEATURE_NOT_SUPPORTED: Greenplum does not support serializable transactions,
+-- ignore the below test case.
+-- start_ignore
+BEGIN ISOLATION LEVEL SERIALIZABLE;
+SELECT * FROM tidscan WHERE ctid = '(0,1)';
+ id
+----
+ 1
+(1 row)
+
+-- locktype should be 'tuple'
+SELECT locktype, mode FROM pg_locks WHERE pid = pg_backend_pid() AND mode = 'SIReadLock';
+ locktype | mode
+----------+------
+(0 rows)
+
+ROLLBACK;
+-- end_ignore
DROP TABLE tidscan;
diff --git a/src/test/regress/expected/tidscan_optimizer.out b/src/test/regress/expected/tidscan_optimizer.out
index ed4ae3e528..cac7499414 100644
--- a/src/test/regress/expected/tidscan_optimizer.out
+++ b/src/test/regress/expected/tidscan_optimizer.out
@@ -331,11 +331,23 @@ SELECT count(*) FROM tenk1 t1 JOIN tenk1 t2 ON t1.ctid = t2.ctid and t1.gp_segme
(1 row)
RESET enable_hashjoin;
--- GPDB_13_MERGE_FIXME
--- --check predicate lock on CTID
--- BEGIN ISOLATION LEVEL SERIALIZABLE;
--- SELECT * FROM tidscan WHERE ctid = '(0,1)';
--- -- locktype should be 'tuple'
--- SELECT locktype, mode FROM pg_locks WHERE pid = pg_backend_pid() AND mode = 'SIReadLock';
--- ROLLBACK;
+-- check predicate lock on CTID
+-- GPDB_12_MERGE_FEATURE_NOT_SUPPORTED: Greenplum does not support serializable transactions,
+-- ignore the below test case.
+-- start_ignore
+BEGIN ISOLATION LEVEL SERIALIZABLE;
+SELECT * FROM tidscan WHERE ctid = '(0,1)';
+ id
+----
+ 1
+(1 row)
+
+-- locktype should be 'tuple'
+SELECT locktype, mode FROM pg_locks WHERE pid = pg_backend_pid() AND mode = 'SIReadLock';
+ locktype | mode
+----------+------
+(0 rows)
+
+ROLLBACK;
+-- end_ignore
DROP TABLE tidscan;
diff --git a/src/test/regress/sql/tidscan.sql b/src/test/regress/sql/tidscan.sql
index c87caea18d..00b3e74fc0 100644
--- a/src/test/regress/sql/tidscan.sql
+++ b/src/test/regress/sql/tidscan.sql
@@ -118,12 +118,15 @@ SELECT count(*) FROM tenk1 t1 JOIN tenk1 t2 ON t1.ctid = t2.ctid and t1.gp_segme
SELECT count(*) FROM tenk1 t1 JOIN tenk1 t2 ON t1.ctid = t2.ctid and t1.gp_segment_id = t2.gp_segment_id;
RESET enable_hashjoin;
--- GPDB_13_MERGE_FIXME
--- --check predicate lock on CTID
--- BEGIN ISOLATION LEVEL SERIALIZABLE;
--- SELECT * FROM tidscan WHERE ctid = '(0,1)';
--- -- locktype should be 'tuple'
--- SELECT locktype, mode FROM pg_locks WHERE pid = pg_backend_pid() AND mode = 'SIReadLock';
--- ROLLBACK;
+-- check predicate lock on CTID
+-- GPDB_12_MERGE_FEATURE_NOT_SUPPORTED: Greenplum does not support serializable transactions,
+-- ignore the below test case.
+-- start_ignore
+BEGIN ISOLATION LEVEL SERIALIZABLE;
+SELECT * FROM tidscan WHERE ctid = '(0,1)';
+-- locktype should be 'tuple'
+SELECT locktype, mode FROM pg_locks WHERE pid = pg_backend_pid() AND mode = 'SIReadLock';
+ROLLBACK;
+-- end_ignore
DROP TABLE tidscan;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cloudberry.apache.org
For additional commands, e-mail: commits-help@cloudberry.apache.org