Resolve conflicts in src/backend/parser/parse_utilcmd.c#2582
Open
RekGRpth wants to merge 1 commit into
Open
Conversation
1) Commit 5028981 in src/backend/parser/parse_utilcmd.c removed the inh_indexes field in the CreateStmtContext structure, while earlier commit 391b78e had already added the attr_encodings field in the same location. 2) Commit e7c2b95 in src/backend/parser/parse_utilcmd.c added a new local variable, nameEl_idx, in the generateSerialExtraStmts function, while earlier commit 19cd1cf had added the local variable, has_cache_option, in the same location. 3) Commit 5028981 in src/backend/parser/parse_utilcmd.c changed the comment before the transformTableLikeClause function, while earlier commit 598f4b0 had already added a GPDB-specific comment at this location. 4) Commit 5028981 in src/backend/parser/parse_utilcmd.c moved some code in the transformTableLikeClause function to the new expandTableLikeClause function, while earlier GPDB-specific commits had already added handling for the CREATE_TABLE_LIKE_STORAGE option. A further modification to the CREATE_TABLE_LIKE_STORAGE option will be made in commit 2e7e4d6. 5) Commit 5028981 in src/backend/parser/parse_utilcmd.c in the transformAlterTableStmt function removed the initialization of the inh_indexes field, while the earlier commit 391b78e had already added the initialization of the attr_encodings field in the same place.
silent-observer
approved these changes
May 25, 2026
bimboterminator1
approved these changes
May 28, 2026
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Commit 5028981 in src/backend/parser/parse_utilcmd.c removed the
inh_indexes field in the CreateStmtContext structure, while earlier
commit 391b78e had already added the attr_encodings field in the same
location.
Commit e7c2b95 in src/backend/parser/parse_utilcmd.c added a new
local variable, nameEl_idx, in the generateSerialExtraStmts function,
while earlier commit 19cd1cf had added the local variable,
has_cache_option, in the same location.
Commit 5028981 in src/backend/parser/parse_utilcmd.c changed the
comment before the transformTableLikeClause function, while earlier
commit 598f4b0 had already added a GPDB-specific comment at this
location.
Commit 5028981 in src/backend/parser/parse_utilcmd.c moved some code
in the transformTableLikeClause function to the new
expandTableLikeClause function, while earlier GPDB-specific commits had
already added handling for the CREATE_TABLE_LIKE_STORAGE option. A
further modification to the CREATE_TABLE_LIKE_STORAGE option will be
made in commit 2e7e4d6.
Commit 5028981 in src/backend/parser/parse_utilcmd.c in the
transformAlterTableStmt function removed the initialization of the
inh_indexes field, while the earlier commit 391b78e had already added
the initialization of the attr_encodings field in the same place.