PG17 compatibility: Fix Test Failure in multi_name_lengths multi_create_table_constraints #7726
+19
−5
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Codecov ReportAll modified and coverable lines are covered by tests ✅
Additional details and impacted files@@ Coverage Diff @@
## naisila/pg17_support #7726 +/- ##
=========================================================
- Coverage 89.61% 34.05% -55.57%
=========================================================
Files 274 274
Lines 59689 59352 -337
Branches 7446 7387 -59
=========================================================
- Hits 53490 20211 -33279
- Misses 4069 36085 +32016
- Partials 2130 3056 +926 |
naisila
changed the title
naisila
reviewed
Nov 12, 2024
39 tasks
naisila
reviewed
Nov 13, 2024
| s/\|[[:space:]]*CHECK[[:space:]]*\((date_col_[a-zA-Z0-9_]+[[:space:]]*[>=<]+[[:space:]].*)\)/| CHECK \1/g | ||
|
|
||
| # Specifically remove outer parentheses from CHECK constraints for int_col_* columns, ensuring proper formatting. | ||
| s/\|[[:space:]]*CHECK[[:space:]]*\((int_col_[a-zA-Z0-9_]+[[:space:]]*[>=<]+[[:space:]].*)\)/| CHECK \1/g |
There was a problem hiding this comment.
It seems that these two normalization lines are specific to the column name, hence they don't take care of the following failure in multi_create_table_constraints:
https://github.com/citusdata/citus/actions/runs/11775359161/attempts/1#summary-32795798881
SELECT "Constraint", "Definition" FROM table_checks WHERE relid='public.check_example_365068'::regclass;
Constraint | Definition
-------------------------------------+-----------------------------------
- check_example_other_col_check | CHECK (other_col >= 100)
- check_example_other_other_col_check | CHECK (abs(other_other_col) >= 100)
+ check_example_other_col_check | CHECK other_col >= 100
+ check_example_other_other_col_check | CHECK abs(other_other_col) >= 100
(2 rows)So we have date_col, int_col, other_col and abs(other_other_col)
I think we can rename these columns to make the normalization rules apply to them?
Example:
date_col_ to column_date
int_col_ to column_int
other_col to column_other
And then have two normalization lines: one for CHECK column_... and one for CHECK abs(...?
There might be a better way, just thoughts from the top of my head. But definitely in this PR we should fix both multi_create_table_constraints and multi_name_lengths tests
There was a problem hiding this comment.
I tried to combine the rules into a single, more comprehensive one, but it didn't work out. A more general rule could potentially work, but it carries the risk of affecting other tests as well.
m3hm3t
changed the title
m3hm3t
force-pushed
the
m3hm3t/multi_name_lengths
branch
from
7e63f00
to
1b3cfdc
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Relevant PG commit:
e59fcbd712c777eb2987d7c9ad542a7e817954ec
\c - - :public_worker_1_host :worker_1_port SELECT "Constraint", "Definition" FROM table_checks WHERE relid='public.name_lengths_225002'::regclass ORDER BY 1 DESC, 2 DESC; Constraint | Definition -----------------------------------------------------------------+----------------------------------------------------------------------------------------- - nl_checky_1234567890123456789012345678901234567_b16df46d_225002 | CHECK (date_col_12345678901234567890123456789012345678901234567890 >= '01-01-2014'::date) + nl_checky_1234567890123456789012345678901234567_b16df46d_225002 | CHECK date_col_12345678901234567890123456789012345678901234567890 >= '01-01-2014'::date (1 row) diff -dU10 -w /__w/citus/citus/src/test/regress/expected/multi_create_table_constraints.out /__w/citus/citus/src/test/regress/results/multi_create_table_constraints.out --- /__w/citus/citus/src/test/regress/expected/multi_create_table_constraints.out.modified 2024-11-05 09:50:21.744669730 +0000 +++ /__w/citus/citus/src/test/regress/results/multi_create_table_constraints.out.modified 2024-11-05 09:50:21.756669718 +0000 @@ -402,22 +402,22 @@ SELECT "Column", "Type", "Definition" FROM index_attrs WHERE relid = 'check_example_partition_col_key_365068'::regclass; Column | Type | Definition ---------------+---------+--------------- partition_col | integer | partition_col (1 row) SELECT "Constraint", "Definition" FROM table_checks WHERE relid='public.check_example_365068'::regclass; Constraint | Definition -------------------------------------+----------------------------------- - check_example_other_col_check | CHECK (other_col >= 100) - check_example_other_other_col_check | CHECK (abs(other_other_col) >= 100) + check_example_other_col_check | CHECK other_col >= 100 + check_example_other_other_col_check | CHECK abs(other_other_col) >= 100