Bump Citus to 12.1.5

.github/workflows/build_and_test.yml

@@ -19,18 +19,19 @@ jobs:
  runs-on: ubuntu-latest
  name: Initialize parameters
  outputs:
- build_image_name: "citus/extbuilder"
- test_image_name: "citus/exttester"
- citusupgrade_image_name: "citus/citusupgradetester"
- fail_test_image_name: "citus/failtester"
- pgupgrade_image_name: "citus/pgupgradetester"
- style_checker_image_name: "citus/stylechecker"
+ build_image_name: "ghcr.io/citusdata/extbuilder"
+ test_image_name: "ghcr.io/citusdata/exttester"
+ citusupgrade_image_name: "ghcr.io/citusdata/citusupgradetester"
+ fail_test_image_name: "ghcr.io/citusdata/failtester"
+ pgupgrade_image_name: "ghcr.io/citusdata/pgupgradetester"
+ style_checker_image_name: "ghcr.io/citusdata/stylechecker"
  style_checker_tools_version: "0.8.18"
- image_suffix: "-v9d71045"
- pg14_version: '{ "major": "14", "full": "14.9" }'
- pg15_version: '{ "major": "15", "full": "15.4" }'
- pg16_version: '{ "major": "16", "full": "16.0" }'
- upgrade_pg_versions: "14.9-15.4-16.0"
+ sql_snapshot_pg_version: "16.3"
+ image_suffix: "-v13fd57c"
+ pg14_version: '{ "major": "14", "full": "14.12" }'
+ pg15_version: '{ "major": "15", "full": "15.7" }'
+ pg16_version: '{ "major": "16", "full": "16.3" }'
+ upgrade_pg_versions: "14.12-15.7-16.3"
  steps:
  # Since GHA jobs needs at least one step we use a noop step here.
  - name: Set up parameters
@@ -39,7 +40,7 @@ jobs:
  needs: params
  runs-on: ubuntu-20.04
  container:
- image: ${{ needs.params.outputs.build_image_name }}:latest
+ image: ${{ needs.params.outputs.build_image_name }}:${{ needs.params.outputs.sql_snapshot_pg_version }}${{ needs.params.outputs.image_suffix }}
  options: --user root
  steps:
  - uses: actions/checkout@v3.5.0

.github/workflows/packaging-test-pipelines.yml

@@ -18,7 +18,7 @@ jobs:
  pg_versions: ${{ steps.get-postgres-versions.outputs.pg_versions }}
  steps:
  - name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
  with:
  fetch-depth: 2
  - name: Get Postgres Versions
@@ -50,26 +50,14 @@ jobs:
  - almalinux-8
  - almalinux-9
  POSTGRES_VERSION: ${{ fromJson(needs.get_postgres_versions_from_file.outputs.pg_versions) }}
- # Postgres removed support for CentOS 7 in PG 16. Below block is needed to
- # keep the build for CentOS 7 working for PG 14 and PG 15.
- # Once dependent systems drop support for Centos 7, we can remove this block.
- include:
- - packaging_docker_image: centos-7
- POSTGRES_VERSION: 14
- - packaging_docker_image: centos-7
- POSTGRES_VERSION: 15
- - packaging_docker_image: oraclelinux-7
- POSTGRES_VERSION: 14
- - packaging_docker_image: oraclelinux-7
- POSTGRES_VERSION: 15
 
  container:
  image: citus/packaging:${{ matrix.packaging_docker_image }}-pg${{ matrix.POSTGRES_VERSION }}
  options: --user root
 
  steps:
  - name: Checkout repository
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
 
  - name: Set Postgres and python parameters for rpm based distros
  run: |

CHANGELOG.md

@@ -1,3 +1,11 @@
+### citus v12.1.5 (July 17, 2024) ###
+
+* Adds support for MERGE commands with single shard distributed target tables
+ (#7643)
+
+* Fixes an error with MERGE commands when insert value does not have source
+ distribution column (#7627)
+
 ### citus v12.1.4 (May 28, 2024) ###
 
 * Adds null check for node in HasRangeTableRef (#7604)

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Citus 12.1.4.
+# Generated by GNU Autoconf 2.69 for Citus 12.1.5.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -579,8 +579,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Citus'
 PACKAGE_TARNAME='citus'
-PACKAGE_VERSION='12.1.4'
-PACKAGE_STRING='Citus 12.1.4'
+PACKAGE_VERSION='12.1.5'
+PACKAGE_STRING='Citus 12.1.5'
 PACKAGE_BUGREPORT=''
 PACKAGE_URL=''
 
@@ -1262,7 +1262,7 @@ if test "$ac_init_help" = "long"; then
  # Omit some internal or obsolete options to make the list less imposing.
  # This message is too long to be a string in the A/UX 3.1 sh.
  cat <<_ACEOF
-\`configure' configures Citus 12.1.4 to adapt to many kinds of systems.
+\`configure' configures Citus 12.1.5 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1324,7 +1324,7 @@ fi
 
 if test -n "$ac_init_help"; then
  case $ac_init_help in
- short | recursive ) echo "Configuration of Citus 12.1.4:";;
+ short | recursive ) echo "Configuration of Citus 12.1.5:";;
  esac
  cat <<\_ACEOF
 
@@ -1429,7 +1429,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
  cat <<\_ACEOF
-Citus configure 12.1.4
+Citus configure 12.1.5
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1912,7 +1912,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by Citus $as_me 12.1.4, which was
+It was created by Citus $as_me 12.1.5, which was
 generated by GNU Autoconf 2.69. Invocation command line was
 
  $ $0 $@
@@ -5393,7 +5393,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by Citus $as_me 12.1.4, which was
+This file was extended by Citus $as_me 12.1.5, which was
 generated by GNU Autoconf 2.69. Invocation command line was
 
  CONFIG_FILES = $CONFIG_FILES
@@ -5455,7 +5455,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-Citus config.status 12.1.4
+Citus config.status 12.1.5
 configured by $0, generated by GNU Autoconf 2.69,
  with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -5,7 +5,7 @@
 # everyone needing autoconf installed, the resulting files are checked
 # into the SCM.
 
-AC_INIT([Citus], [12.1.4])
+AC_INIT([Citus], [12.1.5])
 AC_COPYRIGHT([Copyright (c) Citus Data, Inc.])
 
 # we'll need sed and awk for some of the version commands

src/backend/distributed/commands/multi_copy.c

@@ -2572,7 +2572,7 @@ ShardIdForTuple(CitusCopyDestReceiver *copyDest, Datum *columnValues, bool *colu
  * Find the shard interval and id for the partition column value for
  * non-reference tables.
  *
- * For reference table, this function blindly returns the tables single
+ * For reference table, and single shard distributed table this function blindly returns the tables single
  * shard.
  */
  ShardInterval *shardInterval = FindShardInterval(partitionColumnValue, cacheEntry);

src/backend/distributed/planner/merge_planner.c

@@ -243,14 +243,27 @@
 
  CitusTableCacheEntry *targetRelation = GetCitusTableCacheEntry(targetRelationId);
 
- /*
- * Get the index of the column in the source query that will be utilized
- * to repartition the source rows, ensuring colocation with the target
- */
- distributedPlan->sourceResultRepartitionColumnIndex =
- SourceResultPartitionColumnIndex(mergeQuery,
- sourceQuery->targetList,
- targetRelation);
+
+ if (IsCitusTableType(targetRelation->relationId, SINGLE_SHARD_DISTRIBUTED))
+ {
+ /*
+ * if target table is SINGLE_SHARD_DISTRIBUTED let's set this to invalid -1
+ * so later in execution phase we don't rely on this value and try to find single shard of target instead.
+ */
+ distributedPlan->sourceResultRepartitionColumnIndex = -1;
+ }
+ else
+ {
+ /*
+ * Get the index of the column in the source query that will be utilized
+ * to repartition the source rows, ensuring colocation with the target
+ */
+
+ distributedPlan->sourceResultRepartitionColumnIndex =
+ SourceResultPartitionColumnIndex(mergeQuery,
+ sourceQuery->targetList,
+ targetRelation);
+ }
 
  /*
  * Make a copy of the source query, since following code scribbles it
@@ -262,11 +275,11 @@
  int cursorOptions = CURSOR_OPT_PARALLEL_OK;
  PlannedStmt *sourceRowsPlan = pg_plan_query(sourceQueryCopy, NULL, cursorOptions,
  boundParams);
- bool repartitioned = IsRedistributablePlan(sourceRowsPlan->planTree) &&
-  IsSupportedRedistributionTarget(targetRelationId);
+ bool isRepartitionAllowed = IsRedistributablePlan(sourceRowsPlan->planTree) &&
+  IsSupportedRedistributionTarget(targetRelationId);
 
  /* If plan is distributed, no work at the coordinator */
- if (repartitioned)
+ if (isRepartitionAllowed)
  {
  distributedPlan->modifyWithSelectMethod = MODIFY_WITH_SELECT_REPARTITION;
  }
@@ -1273,13 +1286,6 @@
 SourceResultPartitionColumnIndex(Query *mergeQuery, List *sourceTargetList,
  CitusTableCacheEntry *targetRelation)
 {
- if (IsCitusTableType(targetRelation->relationId, SINGLE_SHARD_DISTRIBUTED))
- {
- ereport(ERROR, (errmsg("MERGE operation across distributed schemas "
- "or with a row-based distributed table is "
- "not yet supported")));
- }
-
  /* Get all the Join conditions from the ON clause */
  List *mergeJoinConditionList = WhereClauseList(mergeQuery->jointree);
  Var *targetColumn = targetRelation->partitionColumn;

src/test/regress/Pipfile

@@ -5,7 +5,7 @@ verify_ssl = true
 
 [packages]
 mitmproxy = {editable = true, ref = "main", git = "https://github.com/citusdata/mitmproxy.git"}
-construct = "==2.9.45"
+construct = "*"
 docopt = "==0.6.2"
 cryptography = ">=39.0.1"
 pytest = "*"

src/test/regress/bin/normalize.sed

@@ -32,6 +32,7 @@ s/"t2_[0-9]+"/"t2_xxxxxxx"/g
 # shard table names for MERGE tests
 s/merge_schema\.([_a-z0-9]+)_40[0-9]+ /merge_schema.\1_xxxxxxx /g
 s/pgmerge_schema\.([_a-z0-9]+)_40[0-9]+ /pgmerge_schema.\1_xxxxxxx /g
+s/merge_vcore_schema\.([_a-z0-9]+)_40[0-9]+ /pgmerge_schema.\1_xxxxxxx /g
 
 # shard table names for multi_subquery
 s/ keyval(1|2|ref)_[0-9]+ / keyval\1_xxxxxxx /g