Fix some grammer errors from error messages and codes comments

Discussion: https://postgr.es/m/CAHewXNkGMPU50QG7V6Q60JGFORfo8LfYO1_GCkCa0VWbmB-fEw%40mail.gmail.com
Author: Tender Wang

diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c
index 3c74eef3e675e358d64f5f71aa193b111120c274..865c6331c1f45b914df9a3ad015b7dfa35acc7dc 100644 (file)
--- a/src/backend/commands/tablecmds.c
+++ b/src/backend/commands/tablecmds.c
@@ -19099,7 +19099,7 @@ QueuePartitionConstraintValidation(List **wqueue, Relation scanrel,
 }
 
 /*
- * attachPartitionTable: attach new partition to partitioned table
+ * attachPartitionTable: attach a new partition to the partitioned table
  *
  * wqueue: the ALTER TABLE work queue; can be NULL when not running as part
  *   of an ALTER TABLE sequence.
@@ -20892,10 +20892,10 @@ GetAttributeStorage(Oid atttypid, const char *storagemode)
  */
 typedef struct SplitPartitionContext
 {
-   ExprState  *partqualstate;  /* expression for check slot for partition
+   ExprState  *partqualstate;  /* expression for checking slot for partition
                                 * (NULL for DEFAULT partition) */
    BulkInsertState bistate;    /* state of bulk inserts for partition */
-   TupleTableSlot *dstslot;    /* slot for insert row into partition */
+   TupleTableSlot *dstslot;    /* slot for inserting row into partition */
    Relation    partRel;        /* relation for partition */
 } SplitPartitionContext;
 
@@ -21142,7 +21142,7 @@ moveSplitTableRows(Relation rel, Relation splitRel, List *partlist, List *newPar
 }
 
 /*
- * createPartitionTable: create table for new partition with given name
+ * createPartitionTable: create table for a new partition with given name
  * (newPartName) like table (modelRelName)
  *
  * Emulates command: CREATE TABLE <newPartName> (LIKE <modelRelName>
@@ -21219,7 +21219,7 @@ ATExecSplitPartition(List **wqueue, AlteredTableInfo *tab, Relation rel,
 
    /*
     * We are going to detach and remove this partition: need to use exclusive
-    * lock for prevent DML-queries to the partition.
+    * lock for preventing DML-queries to the partition.
     */
    splitRel = table_openrv(cmd->name, AccessExclusiveLock);
 
@@ -21269,13 +21269,13 @@ ATExecSplitPartition(List **wqueue, AlteredTableInfo *tab, Relation rel,
 
    /*
     * If new partition has the same name as split partition then we should
-    * rename split partition for reuse name.
+    * rename split partition for reusing name.
     */
    if (isSameName)
    {
        /*
         * We must bump the command counter to make the split partition tuple
-        * visible for rename.
+        * visible for renaming.
         */
        CommandCounterIncrement();
        /* Rename partition. */
@@ -21284,7 +21284,7 @@ ATExecSplitPartition(List **wqueue, AlteredTableInfo *tab, Relation rel,
 
        /*
         * We must bump the command counter to make the split partition tuple
-        * visible after rename.
+        * visible after renaming.
         */
        CommandCounterIncrement();
    }
@@ -21459,7 +21459,7 @@ ATExecMergePartitions(List **wqueue, AlteredTableInfo *tab, Relation rel,
 
        /*
         * We are going to detach and remove this partition: need to use
-        * exclusive lock for prevent DML-queries to the partition.
+        * exclusive lock for preventing DML-queries to the partition.
         */
        mergingPartition = table_openrv(name, AccessExclusiveLock);
 

diff --git a/src/backend/parser/parse_utilcmd.c b/src/backend/parser/parse_utilcmd.c
index 88a4a41186abb1765ca8ddccd31abec18f5922ac..9e3e14087fbafb666822abbc24ce734ec6c31166 100644 (file)
--- a/src/backend/parser/parse_utilcmd.c
+++ b/src/backend/parser/parse_utilcmd.c
@@ -3804,7 +3804,7 @@ transformAlterTableStmt(Oid relid, AlterTableStmt *stmt,
                    if (list_length(partcmd->partlist) < 2)
                        ereport(ERROR,
                                (errcode(ERRCODE_INVALID_OBJECT_DEFINITION),
-                                errmsg("list of new partitions should contains at least two items")));
+                                errmsg("list of new partitions should contain at least two items")));
 
                    if (cmd->subtype == AT_SplitPartition)
                        transformPartitionCmdForSplit(&cxt, partcmd);

diff --git a/src/backend/partitioning/partbounds.c b/src/backend/partitioning/partbounds.c
index c36e26ba4bd7e84bec528b448c8dd3f4165de24c..c0c49b0a0b57540a42ef2524a489bc579b5172a7 100644 (file)
--- a/src/backend/partitioning/partbounds.c
+++ b/src/backend/partitioning/partbounds.c
@@ -4986,7 +4986,7 @@ satisfies_hash_partition(PG_FUNCTION_ARGS)
  * This is a helper function for check_partitions_for_split() and
  * calculate_partition_bound_for_merge().
  * This function compares upper bound of first_bound and lower bound of
- * second_bound. These bounds should be equals except case
+ * second_bound. These bounds should be equal except case
  * "defaultPart == true" (this means that one of split partitions is DEFAULT).
  * In this case upper bound of first_bound can be less than lower bound of
  * second_bound because space between of these bounds will be included in
@@ -5262,7 +5262,7 @@ check_partition_bounds_for_split_range(Relation parent,
                     errmsg("%s bound of partition \"%s\" is %s %s bound of split partition",
                            first ? "lower" : "upper",
                            relname,
-                           defaultPart ? (first ? "less than" : "greater than") : "not equals to",
+                           defaultPart ? (first ? "less than" : "greater than") : "not equal to",
                            first ? "lower" : "upper"),
                     parser_errposition(pstate, datum->location)));
        }
@@ -5483,7 +5483,11 @@ check_parent_values_in_new_partitions(Relation parent,
        Const      *notFoundVal;
 
        if (!searchNull)
-           /* Make Const for get string representation of not found value. */
+
+           /*
+            * Make Const for getting string representation of not found
+            * value.
+            */
            notFoundVal = makeConst(key->parttypid[0],
                                    key->parttypmod[0],
                                    key->parttypcoll[0],

diff --git a/src/include/nodes/parsenodes.h b/src/include/nodes/parsenodes.h
index 5e470d59023a1c6d689bc256f16d2403dd039d5d..f763f790b1808511536ab1e46db35e6d4089c19b 100644 (file)
--- a/src/include/nodes/parsenodes.h
+++ b/src/include/nodes/parsenodes.h
@@ -956,8 +956,8 @@ typedef struct PartitionCmd
    NodeTag     type;
    RangeVar   *name;           /* name of partition to attach/detach */
    PartitionBoundSpec *bound;  /* FOR VALUES, if attaching */
-   List       *partlist;       /* list of partitions, for SPLIT PARTITION
-                                * command */
+   List       *partlist;       /* list of partitions, for MERGE/SPLIT
+                                * PARTITION command */
    bool        concurrent;
 } PartitionCmd;
 

diff --git a/src/test/regress/expected/partition_split.out b/src/test/regress/expected/partition_split.out
index 0a40f20554d74721bf1b06af36b4bba5dda8b47f..675a1453c349c04e92fb7e18a5489a2f17660388 100644 (file)
--- a/src/test/regress/expected/partition_split.out
+++ b/src/test/regress/expected/partition_split.out
@@ -46,7 +46,7 @@ DETAIL:  Specified lower bound ('03-01-2022') is greater than or equal to upper
 --ERROR:  list of split partitions should contains at least two items
 ALTER TABLE sales_range SPLIT PARTITION sales_feb_mar_apr2022 INTO
   (PARTITION sales_feb2022 FOR VALUES FROM ('2022-02-01') TO ('2022-10-01'));
-ERROR:  list of new partitions should contains at least two items
+ERROR:  list of new partitions should contain at least two items
 -- ERROR:  lower bound of partition "sales_feb2022" is less than lower bound of split partition
 ALTER TABLE sales_range SPLIT PARTITION sales_feb_mar_apr2022 INTO
   (PARTITION sales_feb2022 FOR VALUES FROM ('2022-01-01') TO ('2022-03-01'),
@@ -101,7 +101,7 @@ ALTER TABLE sales_range SPLIT PARTITION sales_feb_mar_apr2022 INTO
   (PARTITION sales_feb2022 FOR VALUES FROM ('2022-02-02') TO ('2022-03-01'),
    PARTITION sales_mar2022 FOR VALUES FROM ('2022-03-01') TO ('2022-04-01'),
    PARTITION sales_apr2022 FOR VALUES FROM ('2022-04-01') TO ('2022-05-01'));
-ERROR:  lower bound of partition "sales_feb2022" is not equals to lower bound of split partition
+ERROR:  lower bound of partition "sales_feb2022" is not equal to lower bound of split partition
 LINE 2:   (PARTITION sales_feb2022 FOR VALUES FROM ('2022-02-02') TO...
                                                     ^
 DROP TABLE sales_range;