Fix typos for v12

2019-05-25 Thread Alexander Lakhin
Hello hackers,

I've done another round of cross-checking the master branch for new
unique identifiers/words. As my previous attempt to fix things was not
noticed, now I'm focusing on distinct typos.
1. authenticaion (user-visible string)
2. becuase
3. checkinunique
4. cheep
5. comparion (user-visible)
6. comparision
7. compatiblity
8. continuescanthat
9. current_locked_pid (user-visible)
10. essentally
11. exptected
12. funcation
13. guarantess
14. HEAP_HASOID
15. Interfact
16. minimalslotslot (similar to heapslot)
17. modifcations
18. multiplcation
19. optimised
20. pased
21. perfer
22. relvant
23. represnting
24. ski p
25. unexcpected (user-visible string)

I still hope such fixes are useful and will be accepted.

Best regards,
Alexander

diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 52ac0d78f7..563d251019 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -1429,7 +1429,7 @@ parse_hba_line(TokenizedLine *tok_line, int elevel)
  errmsg("GSSAPI encryption only supports gss, trust, or reject authentication"),
  errcontext("line %d of configuration file \"%s\"",
 			line_num, HbaFileName)));
-		*err_msg = "GSSAPI encryption only supports gss, trust, or reject authenticaion";
+		*err_msg = "GSSAPI encryption only supports gss, trust, or reject authentication";
 		return NULL;
 	}
 
diff --git a/contrib/pgcrypto/imath.c b/contrib/pgcrypto/imath.c
index 6936d2cdca..88ced719d5 100644
--- a/contrib/pgcrypto/imath.c
+++ b/contrib/pgcrypto/imath.c
@@ -3373,7 +3373,7 @@ s_udiv_knuth(mp_int u, mp_int v)
 		 * decrease qhat one more time before we get a value that is smaller
 		 * than r.
 		 *
-		 * This way is less efficent than Knuth becuase we do more multiplies,
+		 * This way is less efficent than Knuth because we do more multiplies,
 		 * but we do not need to worry about underflow this way.
 		 */
 		/* t = qhat * v */
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index 2eccc99023..602f8849d4 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -663,7 +663,7 @@ _bt_check_unique(Relation rel, BTInsertState insertstate, Relation heapRel,
  *		(In a !heapkeyspace index, there can be multiple pages with the same
  *		high key, where the new tuple could legitimately be placed on.  In
  *		that case, the caller passes the first page containing duplicates,
- *		just like when checkinunique=true.  If that page doesn't have enough
+ *		just like when checkingunique=true.  If that page doesn't have enough
  *		room for the new tuple, this function moves right, trying to find a
  *		legal page that does.)
  *
diff --git a/src/include/utils/jsonpath.h b/src/include/utils/jsonpath.h
index 0732fe2ba9..3e9d60cb76 100644
--- a/src/include/utils/jsonpath.h
+++ b/src/include/utils/jsonpath.h
@@ -96,7 +96,7 @@ typedef enum JsonPathItemType
  * Support functions to parse/construct binary value.
  * Unlike many other representation of expression the first/main
  * node is not an operation but left operand of expression. That
- * allows to implement cheep follow-path descending in jsonb
+ * allows to implement cheap follow-path descending in jsonb
  * structure and then execute operator with right operand
  */
 
diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml
index 555d1b4ac6..a2a46c6ab3 100644
--- a/doc/src/sgml/charset.sgml
+++ b/doc/src/sgml/charset.sgml
@@ -896,7 +896,7 @@ CREATE COLLATION french FROM "fr-x-icu";
  equal only if they consist of the same byte sequence.  Nondeterministic
  comparison may determine strings to be equal even if they consist of
  different bytes.  Typical situations include case-insensitive comparison,
- accent-insensitive comparison, as well as comparion of strings in
+ accent-insensitive comparison, as well as comparison of strings in
  different Unicode normal forms.  It is up to the collation provider to
  actually implement such insensitive comparisons; the deterministic flag
  only determines whether ties are to be broken using bytewise comparison.
diff --git a/contrib/pgcrypto/imath.c b/contrib/pgcrypto/imath.c
index 6936d2cdca..393646032a 100644
--- a/contrib/pgcrypto/imath.c
+++ b/contrib/pgcrypto/imath.c
@@ -723,7 +723,7 @@ mp_int_add(mp_int a, mp_int b, mp_int c)
 	else
 	{
 		/* Different signs -- subtract magnitudes, preserve sign of greater */
-		int			cmp = s_ucmp(a, b); /* magnitude comparision, sign ignored */
+		int			cmp = s_ucmp(a, b); /* magnitude comparison, sign ignored */
 
 		/*
 		 * Set x to max(a, b), y to min(a, b) to simplify later code. A
diff --git a/src/interfaces/libpq/pqexpbuffer.c b/src/interfaces/libpq/pqexpbuffer.c
index b3c53b0cda..a9af6f8d83 100644
--- a/src/interfaces/libpq/pqexpbuffer.c
+++ b/src/interfaces/libpq/pqexpbuffer.c
@@ -37,7 +37,7 @@
 /* All "broken" PQExpBuffers point to this string. */
 static const char oom_buffer[1] = "";
 
-/* Need a char * for uncons

Fix typos for v12

2019-05-25 Thread Alexander Lakhin
Hello hackers,

I've done another round of cross-checking the master branch for new
unique identifiers/words. As my previous attempt to fix things was not
noticed, now I'm focusing on distinct typos.
1. authenticaion (user-visible string)
2. becuase
3. checkinunique
4. cheep
5. comparion (user-visible)
6. comparision
7. compatiblity
8. continuescanthat
9. current_locked_pid (user-visible)
10. essentally
11. exptected
12. funcation
13. guarantess
14. HEAP_HASOID
15. Interfact
16. minimalslotslot (similar to heapslot)
17. modifcations
18. multiplcation
19. optimised
20. pased
21. perfer
22. relvant
23. represnting
24. ski p
25. unexcpected (user-visible string)

I still hope such fixes are useful and will be accepted.

Best regards,
Alexander

diff --git a/src/backend/libpq/hba.c b/src/backend/libpq/hba.c
index 52ac0d78f7..563d251019 100644
--- a/src/backend/libpq/hba.c
+++ b/src/backend/libpq/hba.c
@@ -1429,7 +1429,7 @@ parse_hba_line(TokenizedLine *tok_line, int elevel)
  errmsg("GSSAPI encryption only supports gss, trust, or reject authentication"),
  errcontext("line %d of configuration file \"%s\"",
 			line_num, HbaFileName)));
-		*err_msg = "GSSAPI encryption only supports gss, trust, or reject authenticaion";
+		*err_msg = "GSSAPI encryption only supports gss, trust, or reject authentication";
 		return NULL;
 	}
 
diff --git a/contrib/pgcrypto/imath.c b/contrib/pgcrypto/imath.c
index 6936d2cdca..88ced719d5 100644
--- a/contrib/pgcrypto/imath.c
+++ b/contrib/pgcrypto/imath.c
@@ -3373,7 +3373,7 @@ s_udiv_knuth(mp_int u, mp_int v)
 		 * decrease qhat one more time before we get a value that is smaller
 		 * than r.
 		 *
-		 * This way is less efficent than Knuth becuase we do more multiplies,
+		 * This way is less efficent than Knuth because we do more multiplies,
 		 * but we do not need to worry about underflow this way.
 		 */
 		/* t = qhat * v */
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index 2eccc99023..602f8849d4 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -663,7 +663,7 @@ _bt_check_unique(Relation rel, BTInsertState insertstate, Relation heapRel,
  *		(In a !heapkeyspace index, there can be multiple pages with the same
  *		high key, where the new tuple could legitimately be placed on.  In
  *		that case, the caller passes the first page containing duplicates,
- *		just like when checkinunique=true.  If that page doesn't have enough
+ *		just like when checkingunique=true.  If that page doesn't have enough
  *		room for the new tuple, this function moves right, trying to find a
  *		legal page that does.)
  *
diff --git a/src/include/utils/jsonpath.h b/src/include/utils/jsonpath.h
index 0732fe2ba9..3e9d60cb76 100644
--- a/src/include/utils/jsonpath.h
+++ b/src/include/utils/jsonpath.h
@@ -96,7 +96,7 @@ typedef enum JsonPathItemType
  * Support functions to parse/construct binary value.
  * Unlike many other representation of expression the first/main
  * node is not an operation but left operand of expression. That
- * allows to implement cheep follow-path descending in jsonb
+ * allows to implement cheap follow-path descending in jsonb
  * structure and then execute operator with right operand
  */
 
diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml
index 555d1b4ac6..a2a46c6ab3 100644
--- a/doc/src/sgml/charset.sgml
+++ b/doc/src/sgml/charset.sgml
@@ -896,7 +896,7 @@ CREATE COLLATION french FROM "fr-x-icu";
  equal only if they consist of the same byte sequence.  Nondeterministic
  comparison may determine strings to be equal even if they consist of
  different bytes.  Typical situations include case-insensitive comparison,
- accent-insensitive comparison, as well as comparion of strings in
+ accent-insensitive comparison, as well as comparison of strings in
  different Unicode normal forms.  It is up to the collation provider to
  actually implement such insensitive comparisons; the deterministic flag
  only determines whether ties are to be broken using bytewise comparison.
diff --git a/contrib/pgcrypto/imath.c b/contrib/pgcrypto/imath.c
index 6936d2cdca..393646032a 100644
--- a/contrib/pgcrypto/imath.c
+++ b/contrib/pgcrypto/imath.c
@@ -723,7 +723,7 @@ mp_int_add(mp_int a, mp_int b, mp_int c)
 	else
 	{
 		/* Different signs -- subtract magnitudes, preserve sign of greater */
-		int			cmp = s_ucmp(a, b); /* magnitude comparision, sign ignored */
+		int			cmp = s_ucmp(a, b); /* magnitude comparison, sign ignored */
 
 		/*
 		 * Set x to max(a, b), y to min(a, b) to simplify later code. A
diff --git a/src/interfaces/libpq/pqexpbuffer.c b/src/interfaces/libpq/pqexpbuffer.c
index b3c53b0cda..a9af6f8d83 100644
--- a/src/interfaces/libpq/pqexpbuffer.c
+++ b/src/interfaces/libpq/pqexpbuffer.c
@@ -37,7 +37,7 @@
 /* All "broken" PQExpBuffers point to this string. */
 static const char oom_buffer[1] = "";
 
-/* Need a char * for uncons

Re: Fix typos for v12

2019-05-25 Thread Amit Kapila
On Sat, May 25, 2019 at 3:56 PM Alexander Lakhin  wrote:
>
> Hello hackers,
>
> I've done another round of cross-checking the master branch for new
> unique identifiers/words. As my previous attempt to fix things was not
> noticed, now I'm focusing on distinct typos.
> 1. authenticaion (user-visible string)
> 2. becuase
> 3. checkinunique
> 4. cheep
..
>
> I still hope such fixes are useful and will be accepted.
>

I think it is good to fix these.  I haven't verified all but I can
review them.  Isn't it better to fix them as one patch instead of
multiple patches?


-- 
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com




Re: Fix typos for v12

2019-05-25 Thread Alexander Lakhin
Hello Amit,

25.05.2019 13:42, Amit Kapila wrote:
> I think it is good to fix these.  I haven't verified all but I can
> review them.  Isn't it better to fix them as one patch instead of
> multiple patches?

If a single patch is more convenient, then here it is.
I thought that separate patches would be more handy in case of any doubts.

Best regards,
Alexander

diff --git a/contrib/pgcrypto/imath.c b/contrib/pgcrypto/imath.c
index 6936d2cdca..30dd4c9313 100644
--- a/contrib/pgcrypto/imath.c
+++ b/contrib/pgcrypto/imath.c
@@ -723,7 +723,7 @@ mp_int_add(mp_int a, mp_int b, mp_int c)
 	else
 	{
 		/* Different signs -- subtract magnitudes, preserve sign of greater */
-		int			cmp = s_ucmp(a, b); /* magnitude comparision, sign ignored */
+		int			cmp = s_ucmp(a, b); /* magnitude comparison, sign ignored */
 
 		/*
 		 * Set x to max(a, b), y to min(a, b) to simplify later code. A
@@ -3373,7 +3373,7 @@ s_udiv_knuth(mp_int u, mp_int v)
 		 * decrease qhat one more time before we get a value that is smaller
 		 * than r.
 		 *
-		 * This way is less efficent than Knuth becuase we do more multiplies,
+		 * This way is less efficent than Knuth because we do more multiplies,
 		 * but we do not need to worry about underflow this way.
 		 */
 		/* t = qhat * v */
diff --git a/contrib/pgcrypto/imath.h b/contrib/pgcrypto/imath.h
index 0e1676d04e..7b4497b3c6 100644
--- a/contrib/pgcrypto/imath.h
+++ b/contrib/pgcrypto/imath.h
@@ -107,7 +107,7 @@ extern const mp_result MP_MINERR;
 void		mp_int_default_precision(mp_size ndigits);
 
 /** Sets the number of digits below which multiplication will use the standard
-	quadratic "schoolbook" multiplcation algorithm rather than Karatsuba-Ofman.
+	quadratic "schoolbook" multiplication algorithm rather than Karatsuba-Ofman.
 	Requires `ndigits >= sizeof(mp_word)`. */
 void		mp_int_multiply_threshold(mp_size ndigits);
 
diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c
index 02c81ce7a9..1b09aa5a01 100644
--- a/contrib/postgres_fdw/postgres_fdw.c
+++ b/contrib/postgres_fdw/postgres_fdw.c
@@ -3064,7 +3064,7 @@ estimate_path_cost_size(PlannerInfo *root,
 	total_cost += cpu_tuple_cost * retrieved_rows;
 
 	/*
-	 * If we have LIMIT, we should perfer performing the restriction remotely
+	 * If we have LIMIT, we should prefer performing the restriction remotely
 	 * rather than locally, as the former avoids extra row fetches from the
 	 * remote that the latter might cause.  But since the core code doesn't
 	 * account for such fetches when estimating the costs of the local
diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml
index 555d1b4ac6..a2a46c6ab3 100644
--- a/doc/src/sgml/charset.sgml
+++ b/doc/src/sgml/charset.sgml
@@ -896,7 +896,7 @@ CREATE COLLATION french FROM "fr-x-icu";
  equal only if they consist of the same byte sequence.  Nondeterministic
  comparison may determine strings to be equal even if they consist of
  different bytes.  Typical situations include case-insensitive comparison,
- accent-insensitive comparison, as well as comparion of strings in
+ accent-insensitive comparison, as well as comparison of strings in
  different Unicode normal forms.  It is up to the collation provider to
  actually implement such insensitive comparisons; the deterministic flag
  only determines whether ties are to be broken using bytewise comparison.
diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml
index a179d6111e..570ac5e06f 100644
--- a/doc/src/sgml/monitoring.sgml
+++ b/doc/src/sgml/monitoring.sgml
@@ -3556,7 +3556,7 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid,
   
  
  
-  current_locked_pid
+  current_locker_pid
   bigint
   
 Process ID of the locker currently being waited for.
diff --git a/doc/src/sgml/storage.sgml b/doc/src/sgml/storage.sgml
index c4bac87e80..1047c77a63 100644
--- a/doc/src/sgml/storage.sgml
+++ b/doc/src/sgml/storage.sgml
@@ -960,7 +960,7 @@ data. Empty in ordinary tables.
   (that is, t_natts bits altogether). In this list of bits, a
   1 bit indicates not-null, a 0 bit is a null.  When the bitmap is not
   present, all columns are assumed not-null.
-  The object ID is only present if the HEAP_HASOID bit
+  The object ID is only present if the HEAP_HASOID_OLD bit
   is set in t_infomask.  If present, it appears just
   before the t_hoff boundary.  Any padding needed to make
   t_hoff a MAXALIGN multiple will appear between the null
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index 2eccc99023..602f8849d4 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -663,7 +663,7 @@ _bt_check_unique(Relation rel, BTInsertState insertstate, Relation heapRel,
  *		(In a !heapkeyspace index, there can be multiple pages with the same
  *		high key, where the new tuple could legitimately be placed on.  In
  *		that case, the caller pas

Re: Fix typos for v12

2019-05-25 Thread Amit Kapila
On Sat, May 25, 2019 at 4:23 PM Alexander Lakhin  wrote:
>
> Hello Amit,
>
> 25.05.2019 13:42, Amit Kapila wrote:
> > I think it is good to fix these.  I haven't verified all but I can
> > review them.  Isn't it better to fix them as one patch instead of
> > multiple patches?
>
> If a single patch is more convenient, then here it is.
> I thought that separate patches would be more handy in case of any doubts.
>

I have taken one pass over it and all fixes seem to be correct and got
introduced in v12.  I will re-verify them once again and then commit
your patch if I don't found any problem.  In the meantime, if anyone
else wants to look at it, that would be great.

-- 
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com




Re: Fix typos for v12

2019-05-25 Thread Tom Lane
Amit Kapila  writes:
> I have taken one pass over it and all fixes seem to be correct and got
> introduced in v12.  I will re-verify them once again and then commit
> your patch if I don't found any problem.  In the meantime, if anyone
> else wants to look at it, that would be great.

FWIW, I'd counsel against applying the changes in imath.h/.c, as that
is not our code, and unnecessary variations from upstream will just
make it harder to track upstream.  The rest of this looks fine.

regards, tom lane




Re: Fix typos for v12

2019-05-26 Thread Amit Kapila
On Sat, May 25, 2019 at 8:36 PM Tom Lane  wrote:
>
> Amit Kapila  writes:
> > I have taken one pass over it and all fixes seem to be correct and got
> > introduced in v12.  I will re-verify them once again and then commit
> > your patch if I don't found any problem.  In the meantime, if anyone
> > else wants to look at it, that would be great.
>
> FWIW, I'd counsel against applying the changes in imath.h/.c, as that
> is not our code, and unnecessary variations from upstream will just
> make it harder to track upstream.
>

This occurred to me as well while reviewing, but I thought typo fixes
should be fine.  Anyway, I have excluded those before pushing.  So, if
we want to fix these, then maybe one has to first get this fixed in
upstream first and then take from there.

>  The rest of this looks fine.
>

Thanks, pushed.

-- 
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com




Re: Fix typos for v12

2019-05-26 Thread Alexander Lakhin
26.05.2019 16:49, Amit Kapila wrote:
> This occurred to me as well while reviewing, but I thought typo fixes
> should be fine.  Anyway, I have excluded those before pushing.  So, if
> we want to fix these, then maybe one has to first get this fixed in
> upstream first and then take from there.
>
>>  The rest of this looks fine.
>>
> Thanks, pushed.
Thank you Amit!
I've filed a Pull Request in the imath project:
https://github.com/creachadair/imath/pull/39

Best regards,
Alexander




Re: Fix typos for v12

2019-05-26 Thread David Fetter
On Sun, May 26, 2019 at 06:43:41PM +0300, Alexander Lakhin wrote:
> 26.05.2019 16:49, Amit Kapila wrote:
> > This occurred to me as well while reviewing, but I thought typo fixes
> > should be fine.  Anyway, I have excluded those before pushing.  So, if
> > we want to fix these, then maybe one has to first get this fixed in
> > upstream first and then take from there.
> >
> >>  The rest of this looks fine.
> >>
> > Thanks, pushed.
> Thank you Amit!
> I've filed a Pull Request in the imath project:
> https://github.com/creachadair/imath/pull/39

I noticed that it's gone from upstream.  I also noticed that upstream
did a release in January since the previous pull. Is it worth trying
to merge those in as they arrive?

Best,
David.
-- 
David Fetter  http://fetter.org/
Phone: +1 415 235 3778

Remember to vote!
Consider donating to Postgres: http://www.postgresql.org/about/donate




Re: Fix typos for v12

2019-05-25 Thread Amit Kapila
On Sat, May 25, 2019 at 3:56 PM Alexander Lakhin  wrote:
>
> Hello hackers,
>
> I've done another round of cross-checking the master branch for new
> unique identifiers/words. As my previous attempt to fix things was not
> noticed, now I'm focusing on distinct typos.
> 1. authenticaion (user-visible string)
> 2. becuase
> 3. checkinunique
> 4. cheep
..
>
> I still hope such fixes are useful and will be accepted.
>

I think it is good to fix these.  I haven't verified all but I can
review them.  Isn't it better to fix them as one patch instead of
multiple patches?


-- 
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com




Re: Fix typos for v12

2019-05-25 Thread Alexander Lakhin
Hello Amit,

25.05.2019 13:42, Amit Kapila wrote:
> I think it is good to fix these.  I haven't verified all but I can
> review them.  Isn't it better to fix them as one patch instead of
> multiple patches?

If a single patch is more convenient, then here it is.
I thought that separate patches would be more handy in case of any doubts.

Best regards,
Alexander

diff --git a/contrib/pgcrypto/imath.c b/contrib/pgcrypto/imath.c
index 6936d2cdca..30dd4c9313 100644
--- a/contrib/pgcrypto/imath.c
+++ b/contrib/pgcrypto/imath.c
@@ -723,7 +723,7 @@ mp_int_add(mp_int a, mp_int b, mp_int c)
 	else
 	{
 		/* Different signs -- subtract magnitudes, preserve sign of greater */
-		int			cmp = s_ucmp(a, b); /* magnitude comparision, sign ignored */
+		int			cmp = s_ucmp(a, b); /* magnitude comparison, sign ignored */
 
 		/*
 		 * Set x to max(a, b), y to min(a, b) to simplify later code. A
@@ -3373,7 +3373,7 @@ s_udiv_knuth(mp_int u, mp_int v)
 		 * decrease qhat one more time before we get a value that is smaller
 		 * than r.
 		 *
-		 * This way is less efficent than Knuth becuase we do more multiplies,
+		 * This way is less efficent than Knuth because we do more multiplies,
 		 * but we do not need to worry about underflow this way.
 		 */
 		/* t = qhat * v */
diff --git a/contrib/pgcrypto/imath.h b/contrib/pgcrypto/imath.h
index 0e1676d04e..7b4497b3c6 100644
--- a/contrib/pgcrypto/imath.h
+++ b/contrib/pgcrypto/imath.h
@@ -107,7 +107,7 @@ extern const mp_result MP_MINERR;
 void		mp_int_default_precision(mp_size ndigits);
 
 /** Sets the number of digits below which multiplication will use the standard
-	quadratic "schoolbook" multiplcation algorithm rather than Karatsuba-Ofman.
+	quadratic "schoolbook" multiplication algorithm rather than Karatsuba-Ofman.
 	Requires `ndigits >= sizeof(mp_word)`. */
 void		mp_int_multiply_threshold(mp_size ndigits);
 
diff --git a/contrib/postgres_fdw/postgres_fdw.c b/contrib/postgres_fdw/postgres_fdw.c
index 02c81ce7a9..1b09aa5a01 100644
--- a/contrib/postgres_fdw/postgres_fdw.c
+++ b/contrib/postgres_fdw/postgres_fdw.c
@@ -3064,7 +3064,7 @@ estimate_path_cost_size(PlannerInfo *root,
 	total_cost += cpu_tuple_cost * retrieved_rows;
 
 	/*
-	 * If we have LIMIT, we should perfer performing the restriction remotely
+	 * If we have LIMIT, we should prefer performing the restriction remotely
 	 * rather than locally, as the former avoids extra row fetches from the
 	 * remote that the latter might cause.  But since the core code doesn't
 	 * account for such fetches when estimating the costs of the local
diff --git a/doc/src/sgml/charset.sgml b/doc/src/sgml/charset.sgml
index 555d1b4ac6..a2a46c6ab3 100644
--- a/doc/src/sgml/charset.sgml
+++ b/doc/src/sgml/charset.sgml
@@ -896,7 +896,7 @@ CREATE COLLATION french FROM "fr-x-icu";
  equal only if they consist of the same byte sequence.  Nondeterministic
  comparison may determine strings to be equal even if they consist of
  different bytes.  Typical situations include case-insensitive comparison,
- accent-insensitive comparison, as well as comparion of strings in
+ accent-insensitive comparison, as well as comparison of strings in
  different Unicode normal forms.  It is up to the collation provider to
  actually implement such insensitive comparisons; the deterministic flag
  only determines whether ties are to be broken using bytewise comparison.
diff --git a/doc/src/sgml/monitoring.sgml b/doc/src/sgml/monitoring.sgml
index a179d6111e..570ac5e06f 100644
--- a/doc/src/sgml/monitoring.sgml
+++ b/doc/src/sgml/monitoring.sgml
@@ -3556,7 +3556,7 @@ SELECT pg_stat_get_backend_pid(s.backendid) AS pid,
   
  
  
-  current_locked_pid
+  current_locker_pid
   bigint
   
 Process ID of the locker currently being waited for.
diff --git a/doc/src/sgml/storage.sgml b/doc/src/sgml/storage.sgml
index c4bac87e80..1047c77a63 100644
--- a/doc/src/sgml/storage.sgml
+++ b/doc/src/sgml/storage.sgml
@@ -960,7 +960,7 @@ data. Empty in ordinary tables.
   (that is, t_natts bits altogether). In this list of bits, a
   1 bit indicates not-null, a 0 bit is a null.  When the bitmap is not
   present, all columns are assumed not-null.
-  The object ID is only present if the HEAP_HASOID bit
+  The object ID is only present if the HEAP_HASOID_OLD bit
   is set in t_infomask.  If present, it appears just
   before the t_hoff boundary.  Any padding needed to make
   t_hoff a MAXALIGN multiple will appear between the null
diff --git a/src/backend/access/nbtree/nbtinsert.c b/src/backend/access/nbtree/nbtinsert.c
index 2eccc99023..602f8849d4 100644
--- a/src/backend/access/nbtree/nbtinsert.c
+++ b/src/backend/access/nbtree/nbtinsert.c
@@ -663,7 +663,7 @@ _bt_check_unique(Relation rel, BTInsertState insertstate, Relation heapRel,
  *		(In a !heapkeyspace index, there can be multiple pages with the same
  *		high key, where the new tuple could legitimately be placed on.  In
  *		that case, the caller pas

Re: Fix typos for v12

2019-05-25 Thread Amit Kapila
On Sat, May 25, 2019 at 4:23 PM Alexander Lakhin  wrote:
>
> Hello Amit,
>
> 25.05.2019 13:42, Amit Kapila wrote:
> > I think it is good to fix these.  I haven't verified all but I can
> > review them.  Isn't it better to fix them as one patch instead of
> > multiple patches?
>
> If a single patch is more convenient, then here it is.
> I thought that separate patches would be more handy in case of any doubts.
>

I have taken one pass over it and all fixes seem to be correct and got
introduced in v12.  I will re-verify them once again and then commit
your patch if I don't found any problem.  In the meantime, if anyone
else wants to look at it, that would be great.

-- 
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com




Re: Fix typos for v12

2019-05-25 Thread Tom Lane
Amit Kapila  writes:
> I have taken one pass over it and all fixes seem to be correct and got
> introduced in v12.  I will re-verify them once again and then commit
> your patch if I don't found any problem.  In the meantime, if anyone
> else wants to look at it, that would be great.

FWIW, I'd counsel against applying the changes in imath.h/.c, as that
is not our code, and unnecessary variations from upstream will just
make it harder to track upstream.  The rest of this looks fine.

regards, tom lane




Re: Fix typos for v12

2019-05-26 Thread Amit Kapila
On Sat, May 25, 2019 at 8:36 PM Tom Lane  wrote:
>
> Amit Kapila  writes:
> > I have taken one pass over it and all fixes seem to be correct and got
> > introduced in v12.  I will re-verify them once again and then commit
> > your patch if I don't found any problem.  In the meantime, if anyone
> > else wants to look at it, that would be great.
>
> FWIW, I'd counsel against applying the changes in imath.h/.c, as that
> is not our code, and unnecessary variations from upstream will just
> make it harder to track upstream.
>

This occurred to me as well while reviewing, but I thought typo fixes
should be fine.  Anyway, I have excluded those before pushing.  So, if
we want to fix these, then maybe one has to first get this fixed in
upstream first and then take from there.

>  The rest of this looks fine.
>

Thanks, pushed.

-- 
With Regards,
Amit Kapila.
EnterpriseDB: http://www.enterprisedb.com




Re: Fix typos for v12

2019-05-26 Thread Alexander Lakhin
26.05.2019 16:49, Amit Kapila wrote:
> This occurred to me as well while reviewing, but I thought typo fixes
> should be fine.  Anyway, I have excluded those before pushing.  So, if
> we want to fix these, then maybe one has to first get this fixed in
> upstream first and then take from there.
>
>>  The rest of this looks fine.
>>
> Thanks, pushed.
Thank you Amit!
I've filed a Pull Request in the imath project:
https://github.com/creachadair/imath/pull/39

Best regards,
Alexander




Re: Fix typos for v12

2019-05-26 Thread David Fetter
On Sun, May 26, 2019 at 06:43:41PM +0300, Alexander Lakhin wrote:
> 26.05.2019 16:49, Amit Kapila wrote:
> > This occurred to me as well while reviewing, but I thought typo fixes
> > should be fine.  Anyway, I have excluded those before pushing.  So, if
> > we want to fix these, then maybe one has to first get this fixed in
> > upstream first and then take from there.
> >
> >>  The rest of this looks fine.
> >>
> > Thanks, pushed.
> Thank you Amit!
> I've filed a Pull Request in the imath project:
> https://github.com/creachadair/imath/pull/39

I noticed that it's gone from upstream.  I also noticed that upstream
did a release in January since the previous pull. Is it worth trying
to merge those in as they arrive?

Best,
David.
-- 
David Fetter  http://fetter.org/
Phone: +1 415 235 3778

Remember to vote!
Consider donating to Postgres: http://www.postgresql.org/about/donate