fix typo in comments

.devcontainer/.psqlrc

@@ -3,5 +3,5 @@
 \pset border 2
 \setenv PAGER 'pspg --no-mouse -bX --no-commandbar --no-topbar'
 \set HISTSIZE 100000
-\set PROMPT1 '\n%[%033[1m%]%M %n@%/:%>-%p%R%[%033[0m%]%# '
+\set PROMPT1 '\n%[%033[1m%]%M %n@%/:%> (PID: %p)%R%[%033[0m%]%# '
 \set PROMPT2 '  '

.devcontainer/Dockerfile

@@ -68,7 +68,7 @@ USER citus
 
 # build postgres versions separately for effective parrallelism and caching of already built versions when changing only certain versions
 FROM base AS pg14
-RUN MAKEFLAGS="-j $(nproc)" pgenv build 14.11
+RUN MAKEFLAGS="-j $(nproc)" pgenv build 14.12
 RUN rm .pgenv/src/*.tar*
 RUN make -C .pgenv/src/postgresql-*/ clean
 RUN make -C .pgenv/src/postgresql-*/src/include install
@@ -80,7 +80,7 @@ RUN cp -r .pgenv/src .pgenv/pgsql-* .pgenv/config .pgenv-staging/
 RUN rm .pgenv-staging/config/default.conf
 
 FROM base AS pg15
-RUN MAKEFLAGS="-j $(nproc)" pgenv build 15.6
+RUN MAKEFLAGS="-j $(nproc)" pgenv build 15.7
 RUN rm .pgenv/src/*.tar*
 RUN make -C .pgenv/src/postgresql-*/ clean
 RUN make -C .pgenv/src/postgresql-*/src/include install
@@ -92,7 +92,7 @@ RUN cp -r .pgenv/src .pgenv/pgsql-* .pgenv/config .pgenv-staging/
 RUN rm .pgenv-staging/config/default.conf
 
 FROM base AS pg16
-RUN MAKEFLAGS="-j $(nproc)" pgenv build 16.2
+RUN MAKEFLAGS="-j $(nproc)" pgenv build 16.3
 RUN rm .pgenv/src/*.tar*
 RUN make -C .pgenv/src/postgresql-*/ clean
 RUN make -C .pgenv/src/postgresql-*/src/include install
@@ -211,7 +211,7 @@ COPY --chown=citus:citus .psqlrc .
 RUN sudo chown --from=root:root citus:citus -R ~
 
 # sets default pg version
-RUN pgenv switch 16.2
+RUN pgenv switch 16.3
 
 # make connecting to the coordinator easy
 ENV PGPORT=9700

.devcontainer/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 = ">=41.0.4"
 pytest = "*"
@@ -16,6 +16,7 @@ pytest-timeout = "*"
 pytest-xdist = "*"
 pytest-repeat = "*"
 pyyaml = "*"
+werkzeug = "==2.3.7"
 
 [dev-packages]
 black = "*"

.github/workflows/build_and_test.yml

@@ -24,18 +24,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: "-v390dab3"
-      pg14_version: '{ "major": "14", "full": "14.11" }'
-      pg15_version: '{ "major": "15", "full": "15.6" }'
-      pg16_version: '{ "major": "16", "full": "16.2" }'
-      upgrade_pg_versions: "14.11-15.6-16.2"
+      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
@@ -44,7 +45,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/[email protected]

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

@@ -19,7 +19,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
@@ -51,26 +51,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,21 @@
+### citus v12.1.6 (Nov 14, 2024) ###
+
+* Propagates `SECURITY LABEL .. ON ROLE` statements (#7304)
+
+* Fixes crash caused by running queries with window partition (#7718)
+
+### 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)
+
 ### citus v12.1.3 (April 18, 2024) ###
 
 * Allows overwriting host name for all inter-node connections by

CONTRIBUTING.md

@@ -35,6 +35,28 @@ To get citus installed from source we run `make install -s` in the first termina
 
 With the Citus cluster running you can connect to the coordinator in the first terminal via `psql -p9700`. Because the coordinator is the most common entrypoint the `PGPORT` environment is set accordingly, so a simple `psql` will connect directly to the coordinator.
 
+### Debugging in the VS code
+
+1. Start Debugging: Press F5 in VS Code to start debugging. When prompted, you'll need to attach the debugger to the appropriate PostgreSQL process.
+
+2. Identify the Process: If you're running a psql command, take note of the PID that appears in your psql prompt. For example:
+```
+[local] citus@citus:9700 (PID: 5436)=#
+```
+This PID (5436 in this case) indicates the process that you should attach the debugger to.
+If you are uncertain about which process to attach, you can list all running PostgreSQL processes using the following command:
+```
+ps aux | grep postgres
+```
+
+Look for the process associated with the PID you noted. For example:
+```
+citus      5436  0.0  0.0  0  0 ?        S    14:00   0:00 postgres: citus citus
+```
+4. Attach the Debugger: Once you've identified the correct PID, select that process when prompted in VS Code to attach the debugger. You should now be able to debug the PostgreSQL session tied to the psql command.
+
+5. Set Breakpoints and Debug: With the debugger attached, you can set breakpoints within the code. This allows you to step through the code execution, inspect variables, and fully debug the PostgreSQL instance running in your container.
+
 ### Getting and building
 
 [PostgreSQL documentation](https://www.postgresql.org/support/versioning/) has a

src/backend/columnar/columnar_tableam.c

@@ -3021,6 +3021,8 @@ AvailableExtensionVersionColumnar(void)
 
 	ereport(ERROR, (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 					errmsg("citus extension is not found")));
+
+	return NULL; /* keep compiler happy */
 }
 
 

src/backend/distributed/commands/multi_copy.c

@@ -2568,7 +2568,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/executor/adaptive_executor.c

@@ -3805,7 +3805,7 @@ PopAssignedPlacementExecution(WorkerSession *session)
 
 
 /*
- * PopAssignedPlacementExecution finds an executable task from the queue of assigned tasks.
+ * PopUnAssignedPlacementExecution finds an executable task from the queue of assigned tasks.
  */
 static TaskPlacementExecution *
 PopUnassignedPlacementExecution(WorkerPool *workerPool)

src/backend/distributed/metadata/metadata_cache.c

@@ -2522,6 +2522,8 @@ AvailableExtensionVersion(void)
 
 	ereport(ERROR, (errcode(ERRCODE_OBJECT_NOT_IN_PREREQUISITE_STATE),
 					errmsg("citus extension is not found")));
+
+	return NULL; /* keep compiler happy */
 }
 
 

src/backend/distributed/metadata/node_metadata.c

@@ -217,6 +217,9 @@ citus_set_coordinator_host(PG_FUNCTION_ARGS)
 		EnsureTransactionalMetadataSyncMode();
 	}
 
+	/* prevent concurrent modification */
+	LockRelationOid(DistNodeRelationId(), RowExclusiveLock);
+
 	bool isCoordinatorInMetadata = false;
 	WorkerNode *coordinatorNode = PrimaryNodeForGroup(COORDINATOR_GROUP_ID,
 													  &isCoordinatorInMetadata);

src/backend/distributed/planner/insert_select_planner.c

@@ -1810,6 +1810,8 @@ CastExpr(Expr *expr, Oid sourceType, Oid targetType, Oid targetCollation,
 		ereport(ERROR, (errmsg("could not find a conversion path from type %d to %d",
 							   sourceType, targetType)));
 	}
+
+	return NULL; /* keep compiler happy */
 }
 
 

src/backend/distributed/planner/merge_planner.c

@@ -243,14 +243,27 @@ CreateNonPushableMergePlan(Oid targetRelationId, uint64 planId, Query *originalQ
 
 	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 @@ CreateNonPushableMergePlan(Oid targetRelationId, uint64 planId, Query *originalQ
 	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;
 	}
@@ -845,7 +858,7 @@ ConvertRelationRTEIntoSubquery(Query *mergeQuery, RangeTblEntry *sourceRte,
 	newRangeTableRef->rtindex = SINGLE_RTE_INDEX;
 	sourceResultsQuery->jointree = makeFromExpr(list_make1(newRangeTableRef), NULL);
 	sourceResultsQuery->targetList =
-		CreateAllTargetListForRelation(sourceRte->relid, requiredAttributes);
+		CreateFilteredTargetListForRelation(sourceRte->relid, requiredAttributes);
 	List *restrictionList =
 		GetRestrictInfoListForRelation(sourceRte, plannerRestrictionContext);
 	List *copyRestrictionList = copyObject(restrictionList);
@@ -1273,13 +1286,6 @@ static int
 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/backend/distributed/planner/multi_logical_optimizer.c

@@ -1557,9 +1557,10 @@ MasterAggregateMutator(Node *originalNode, MasterAggregateWalkerContext *walkerC
 	}
 	else if (IsA(originalNode, Var))
 	{
-		Var *newColumn = copyObject((Var *) originalNode);
-		newColumn->varno = masterTableId;
-		newColumn->varattno = walkerContext->columnId;
+		Var *origColumn = (Var *) originalNode;
+		Var *newColumn = makeVar(masterTableId, walkerContext->columnId,
+								 origColumn->vartype, origColumn->vartypmod,
+								 origColumn->varcollid, origColumn->varlevelsup);
 		walkerContext->columnId++;
 
 		newNode = (Node *) newColumn;
@@ -4753,22 +4754,35 @@ WorkerLimitCount(Node *limitCount, Node *limitOffset, OrderByLimitReference
 	if (workerLimitNode != NULL && limitOffset != NULL)
 	{
 		Const *workerLimitConst = (Const *) workerLimitNode;
-		Const *workerOffsetConst = (Const *) limitOffset;
-		int64 workerLimitCount = DatumGetInt64(workerLimitConst->constvalue);
-		int64 workerOffsetCount = DatumGetInt64(workerOffsetConst->constvalue);
 
-		workerLimitCount = workerLimitCount + workerOffsetCount;
-		workerLimitNode = (Node *) MakeIntegerConstInt64(workerLimitCount);
+		/* Only update the worker limit if the const is not null.*/
+		if (!workerLimitConst->constisnull)
+		{
+			Const *workerOffsetConst = (Const *) limitOffset;
+			int64 workerLimitCount = DatumGetInt64(workerLimitConst->constvalue);
+
+			/* If the offset is null, it defaults to 0 when cast to int64. */
+			int64 workerOffsetCount = DatumGetInt64(workerOffsetConst->constvalue);
+			workerLimitCount = workerLimitCount + workerOffsetCount;
+			workerLimitNode = (Node *) MakeIntegerConstInt64(workerLimitCount);
+		}
 	}
 
 	/* display debug message on limit push down */
 	if (workerLimitNode != NULL)
 	{
 		Const *workerLimitConst = (Const *) workerLimitNode;
-		int64 workerLimitCount = DatumGetInt64(workerLimitConst->constvalue);
+		if (!workerLimitConst->constisnull)
+		{
+			int64 workerLimitCount = DatumGetInt64(workerLimitConst->constvalue);
 
-		ereport(DEBUG1, (errmsg("push down of limit count: " INT64_FORMAT,
-								workerLimitCount)));
+			ereport(DEBUG1, (errmsg("push down of limit count: " INT64_FORMAT,
+									workerLimitCount)));
+		}
+		else
+		{
+			ereport(DEBUG1, (errmsg("push down of limit count: ALL")));
+		}
 	}
 
 	return workerLimitNode;

src/backend/distributed/planner/query_colocation_checker.c

@@ -45,8 +45,6 @@
 static RangeTblEntry * AnchorRte(Query *subquery);
 static List * UnionRelationRestrictionLists(List *firstRelationList,
 											List *secondRelationList);
-static List * CreateFilteredTargetListForRelation(Oid relationId,
-												  List *requiredAttributes);
 static List * CreateDummyTargetList(Oid relationId, List *requiredAttributes);
 static TargetEntry * CreateTargetEntryForColumn(Form_pg_attribute attributeTuple, Index
 												rteIndex,
@@ -378,7 +376,7 @@ CreateAllTargetListForRelation(Oid relationId, List *requiredAttributes)
  * only the required columns of the given relation. If there is not required
  * columns then a dummy NULL column is put as the only entry.
  */
-static List *
+List *
 CreateFilteredTargetListForRelation(Oid relationId, List *requiredAttributes)
 {
 	Relation relation = relation_open(relationId, AccessShareLock);