Sync 14x b13 test#2611
Draft
RekGRpth wants to merge 732 commits into
Draft
Conversation
1) Commit a04daa9 in src/backend/executor/nodeModifyTable.c changed the comment before the ExecInsert function, but earlier GPDB-specific commits had already added a GPDB-specific comment in the same location. 2) Commit a04daa9 in src/backend/executor/nodeModifyTable.c in the ExecDelete function deleted a couple of lines, but earlier GPDB-specific commits had already added a conditional error message before this location. 3) Commit c5b097f in src/backend/executor/nodeModifyTable.c moved some code to the new ExecCrossPartitionUpdate function in the ExecUpdate function. However, the earlier commit 19cd1cf had already added the segid and splitUpdate arguments to the ExecDelete and ExecInsert functions in these same locations. 4) Commit a04daa9 in src/backend/executor/nodeModifyTable.c removed the es_result_relation_info save in the ExecModifyTable function before calling the EvalPlanQualSetPlan function. However, earlier GPDB-specific commits had already added code before this location. 5) Commit a04daa9 in src/backend/executor/nodeModifyTable.c added a new resultRelInfo argument to the ExecModifyTable function when calling ExecInsert ExecDelete. However, the earlier commit 19cd1cf had already added the splitUpdate argument to the ExecInsert function. 6) Commit a04daa9 in src/backend/executor/nodeModifyTable.c added a new resultRelInfo argument to the ExecModifyTable function when calling ExecUpdate. However, earlier GPDB-specific commits had already added the code for split updates. 7) Commit a04daa9 in file src/backend/executor/nodeModifyTable.c in function ExecModifyTable when calling function ExecDelete added new argument resultRelInfo, while earlier commit 19cd1cf already added arguments segid and splitUpdate, and commit 973cf25 already added conditional call of function ExecPrepareTupleRouting before and conditional saving of resultRelInfo after this place.
1) Commit a90c950 in src/backend/optimizer/path/costsize.c changed the comment and calculation of nrows in the clamp_row_est function, while earlier commit 6b0e52b had already moved the clamp_row_est function to src/include/optimizer/cost.h. 2) Commit a90c950 in src/backend/optimizer/path/costsize.c in the final_cost_nestloop function removed isnan(outer_path_rows) from the conditions, while earlier commit c5f6dbb had already added the conditional setting of numsegments to the same location.
1) Commit 1375422 in src/backend/optimizer/plan/planner.c in the standard_planner function removed the assertion for the rootResultRelations field, while earlier commit e180c8a had already added an assertion in the same location. 2) Commit 41efb83 in src/backend/optimizer/plan/planner.c in the subquery_planner function added initialization for the hasPseudoConstantQuals and hasAlternativeSubPlans fields, while earlier commits 6b0e52b and 7efe320 had already added initialization for the upd_del_replicated_table and config fields in the same location. 3) Commit 62e221e in the src/backend/optimizer/plan/planner.c file in the create_one_window_path function added support for incremental sorting, although it is temporarily disabled in the GPDB.
1) Commit 41efb83 in src/backend/optimizer/plan/setrefs.c added a new field, num_exec, to the fix_join_expr_context structure. However, the earlier commit 6b0e52b had already added the fields, use_outer_tlist_for_matching_nonvars and use_inner_tlist_for_matching_nonvars, to the same location. 2) Commit 41efb83 in src/backend/optimizer/plan/setrefs.c added the num_exec argument to the initialization of the startOffset and endOffset fields in the fix_scan_expr function call. However, earlier GPDB-specific commits had already added GPDB-specific code to the same location. 3) Commit 41efb83 in src/backend/optimizer/plan/setrefs.c added the num_exec argument to the initialization of the indexqual field in the set_indexonlyscan_references function when calling the fix_scan_list macro. However, commit 598f4b0 had already added the initialization of the indexqualorig field to the same location. 4) Commit 41efb83 in src/backend/optimizer/plan/setrefs.c added the initialization of the num_exec field to the fix_join_expr function. However, commit 6b0e52b had already added the initialization of the use_outer_tlist_for_matching_nonvars and use_inner_tlist_for_matching_nonvars fields to the same location.
1) Commit 1375422 in src/backend/commands/copy.c replaced the call to InitResultRelInfo with ExecInitResultRelation in the CopyFrom function, while earlier commit 25a9039 had already added an empty line in the same location. 2) Commit 1375422 in src/backend/commands/copy.c removed the call to ExecCloseIndices in the CopyFrom function, while earlier commit d2461dd had already added a conditional call to table_dml_finish in the same location.
1) Commit 9d701e6 in src/backend/commands/explain.c in the ExplainOnePlan function replaced the es->summary && (planning || bufusage) condition with the bufusage condition. However, the earlier commit 7a1ce37 had already added a conditional call to the ExplainParallelRetrieveCursor function in the same location. 2) Commit 9d701e6 in src/backend/commands/explain.c in the ExplainOnePlan function removed the es->summary && bufusage and es->summary && (planation || bufusage) conditions along with the code, while the earlier commit 08d8dba had already added a conditional call to the ExplainPrintSliceTable function in the same place.
1) Commit 2453ea1 in src/backend/commands/functioncmds.c in the interpret_function_parameter_list function renamed the local variable inTypes to sigArgTypes. However, the earlier commit 6b0e52b had already added a pre-allocation comment in the same location. 2) Commit 2453ea1 in src/backend/commands/functioncmds.c in the interpret_function_parameter_list function renamed the local variable inTypes to sigArgTypes, changed the word input to signature in the error message, and removed the assignment to isinput. However, the earlier commit fa287d0 had already added a conditional increment of multisetCount in the same location.
Commit d6c08e2 in the file src/backend/optimizer/plan/subselect.c in the make_subplan and subplan_is_hashable functions changed work_mem to hash_mem, and commit 41efb83 in the file src/backend/optimizer/plan/subselect.c in the make_subplan function changed the call to the subplan_is_hashable function to call a new function subpath_is_hashable, and also moved the call to the create_plan function under the condition, while the early commit 6b0e52b had already added the PlannerInfo *root argument and its use to the subplan_is_hashable function, and other early GPDB-specific commits had already added initialization of the curSlice and flow fields. Add a similar PlannerInfo *root argument to the subpath_is_hashable function and move the initialization of the curSlice and flow fields under the condition.
Commit f893e68 in src/backend/parser/analyze.c in the transformSetOperationTree function removed the local variables lcoltypmod and rcoltypmod and their usage, while earlier GPDB-specific commits had already added GPDB-specific code in the same place.
1) Commit 06a7c31 in the file src/backend/parser/gram.y replaced var_name type_function_name param_name with BareColLabel, while the earlier commit 9b88bed had already added ColLabelNoAs in the same place. 2) Commit 06a7c31 in the file src/backend/parser/gram.y added a new definition of bare_label_keyword, while the earlier commit 6b0e52b already added the definition of keywords_ok_in_alias_no_as in the same place. 3) Commit 28a61fc in the file src/backend/parser/gram.y replaced the comment in the UNBOUNDED definition and removed GENERATED NULL_P from the IDENT definition, while the earlier commit 6b0e52b had already added many GPDB-specific definitions below in the same place. 4) Commit 844c05a in the file src/backend/parser/gram.y replaced the initialization of the concurrent field with the conditional setting of the REINDEXOPT_CONCURRENTLY option, while the early commit 19cd1cf already began to generate an error about the non-support of this functionality in the GPDB. 5) Commit 06a7c31 in the file src/backend/parser/gram.y replaced a_expr IDENT with a_expr BareColLabel, while the earlier commit 6b0e52b had already added a large comment before this place.
1) Commit a90c950 in src/backend/optimizer/path/costsize.c changed the comment and calculation of nrows in the clamp_row_est function, while earlier commit 6b0e52b had already moved the clamp_row_est function to src/include/optimizer/cost.h. 2) Commit a90c950 in src/backend/optimizer/path/costsize.c in the final_cost_nestloop function removed isnan(outer_path_rows) from the conditions, while earlier commit c5f6dbb had already added the conditional setting of numsegments to the same location.
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.
Commit 44fc6e2 in src/backend/postmaster/bgwriter.c in the BackgroundWriterMain function removed the SIGQUIT signal setting and added a corresponding comment. However, an earlier commit, 89f85cc, had already changed this signal setting from SignalHandlerForCrashExit to bg_quickdie, which is needed for the fault_in_background_writer_quickdie default injector in the fts_segment_reset test.
1) Commit 8d9a935 in src/backend/postmaster/pgstat.c added handling for the new PGSTAT_MTYPE_WAL case in the PgstatCollectorMain function, while earlier commit 6b0e52b had already added handling for the PGSTAT_MTYPE_QUEUESTAT case in the same location. 2) Commit 9868167 in src/backend/postmaster/pgstat.c added a fputc for the new 'R' case in the pgstat_write_statsfiles function, while earlier commit c7649f1 had already added a fputc for the 'Q' case in the same location. 3) Commit 9868167 in src/backend/postmaster/pgstat.c added allocate the space for replication slot statistics in the pgstat_read_statsfiles function, while earlier commit 6b0e52b had already added creation of a Queue hashtable in the same location. 4) Commit 9868167 in src/backend/postmaster/pgstat.c added handling for the new 'R' case in the pgstat_read_statsfiles function, while earlier commit c7649f1 had already added handling for the 'Q' case in the same location. 5) Commit 9868167 in src/backend/postmaster/pgstat.c in the pgstat_read_db_statsfile_timestamp function added handling for the new case 'R', while the earlier commit c7649f1 had already added handling for the case 'Q' in the same place.
Commit be9788e in src/backend/replication/syncrep.c in the SyncRepWaitForLSN function moved the conditional return higher, adding additional conditions and a large comment. Commit e174f69 added an InterruptHoldoffCount assertion before it. However, the earlier commit 6b0e52b had already added a debug log in the same location, and commit 33a6433 added an assertion before it.
Commit 44fc6e2 in src/backend/postmaster/bgwriter.c in the BackgroundWriterMain function removed the SIGQUIT signal setting and added a corresponding comment. However, an earlier commit, 89f85cc, had already changed this signal setting from SignalHandlerForCrashExit to bg_quickdie, which is needed for the fault_in_background_writer_quickdie default injector in the fts_segment_reset test.
1) Commit 808e13b in src/backend/storage/file/buffile.c added a new conditional error message to the BufFileSeek function. However, earlier commit 5028054 had already done the same, but with incorrect indentation, and also added a conditional call to the BufFileFlush function. 2) Commit 808e13b added a new function BufFileTruncateShared to src/backend/storage/file/buffile.c, while earlier GPDB-specific commits had already added the functions BufFileGetFilename, BufFileSuspend, BufFileResume, BufFilePledgeSequential, BufFileStartCompression, BufFileDumpCompressedBuffer, BufFileEndCompression, BufFileLoadCompressedBuffer in the same location.
Commit 94bc27b in src/backend/storage/ipc/procarray.c added the maybe_needed field setting to the GlobalVisTempRels variable in the GlobalVisUpdateApply function. However, an earlier commit, 0a5cc3f, had already added a call to the GetDistOldestXmin function as an argument to the FullXidRelativeTo function call above.
Commit be9788e in src/backend/replication/syncrep.c in the SyncRepWaitForLSN function moved the conditional return higher, adding additional conditions and a large comment. Commit e174f69 added an InterruptHoldoffCount assertion before it. However, the earlier commit 6b0e52b had already added a debug log in the same location, and commit 33a6433 added an assertion before it, and commit bdb1ea1 removed InterruptHoldoffCount assertion.
1) Commit 808e13b in src/backend/storage/file/buffile.c added a new conditional error message to the BufFileSeek function. However, earlier commit 5028054 had already done the same, but with incorrect indentation, and also added a conditional call to the BufFileFlush function. 2) Commit 808e13b added a new function BufFileTruncateShared to src/backend/storage/file/buffile.c, while earlier GPDB-specific commits had already added the functions BufFileGetFilename, BufFileSuspend, BufFileResume, BufFilePledgeSequential, BufFileStartCompression, BufFileDumpCompressedBuffer, BufFileEndCompression, BufFileLoadCompressedBuffer in the same location.
Commit 5028981 in src/backend/parser/parse_utilcmd.c removed the inh_indexes field from the CreateStmtContext structure, although it was used in the transformDistributedBy function in the GPDB. Restore it for the GPDB and add code to populate it in the transformTableLikeClause function from 7X.
Commit 9796f45 in src/bin/pgbench/pgbench.c in the initCreateTables function removed the local variable opts, replacing snprintf opts with appendPQExpBuffer query. Replace in GPDB-specific code.
Commit 06a7c31 has added a new is-bare-label argument to PG_KEYWORD. Most keywords have BARE_LABEL, allowing them to be used as labels without AS keyword, but 39 are marked AS_LABEL, requiring as. However, there are a lot of GPDB-specific keywords too, most of them without comments. Conservatively mark them AS_LABEL to avoid accidentally breaking the grammar, Also mark all GPDB-specific keywords with comments to simplify future conflict resolutions. However, some of the keywords, specifically "format" and "ignore", are present in later versions of Postgres and "format" is marked as BARE_LABEL, so mark it BARE_LABEL here too.
Commit 9796f45 in src/bin/pgbench/pgbench.c in the initCreateTables function removed the local variable opts, replacing snprintf opts with appendPQExpBuffer query. Replace in GPDB-specific code.
Commit 2203ede added new targets to the Makefile for installing pg_isolation_regress and isolationtester, however GPDB-specific commits have already added several targets for *.pl and *.pm files.
Commit 41efb83 added the possibility of glob->subplan entries being NULL, when they are deleted. GPDB-specific code attempted to pfree it. Add a NULL check to cdbllize.c, with an additional benefit that all the NULL entries will be replaced with dummy plans, which are handled correctly by the rest of GPDB-specific code.
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
2 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.
No description provided.