merge: fix merging 15.10 conflicts

ApsaraDB · Nov 26, 2024 · bdbd7e2 · bdbd7e2
1 parent ce02698
commit bdbd7e2
Show file tree

Hide file tree

Showing 6 changed files with 1 addition and 161 deletions.
diff --git a/src/backend/backup/basebackup.c b/src/backend/backup/basebackup.c
@@ -1413,18 +1413,8 @@ sendDir(bbsink *sink, const char *path, int basepathlen, bool sizeonly,
 		}
 
 		/* Allow symbolic links in pg_tblspc only */
-<<<<<<< HEAD
 		snprintf(pathbuf2, MAXPGPATH, "%s/pg_tblspc", is_shared_data ? polar_datadir : ".");
-		if (strcmp(path, pathbuf2) == 0 &&
-#ifndef WIN32
-			S_ISLNK(statbuf.st_mode)
-#else
-			pgwin32_is_junction(pathbuf)
-#endif
-			)
-=======
-		if (strcmp(path, "./pg_tblspc") == 0 && S_ISLNK(statbuf.st_mode))
->>>>>>> REL_15_10
+		if (strcmp(path, pathbuf2) == 0 && S_ISLNK(statbuf.st_mode))
 		{
 #if defined(HAVE_READLINK) || defined(WIN32)
 			char		linkpath[MAXPGPATH];

diff --git a/src/backend/executor/nodeHashjoin.c b/src/backend/executor/nodeHashjoin.c
@@ -1524,18 +1524,13 @@ void
 ExecHashJoinReInitializeDSM(HashJoinState *state, ParallelContext *cxt)
 {
 	int			plan_node_id = state->js.ps.plan->plan_node_id;
-<<<<<<< HEAD
-	ParallelHashJoinState *pstate =
-		shm_toc_lookup(cxt->toc, plan_node_id, false);
-=======
 	ParallelHashJoinState *pstate;
 
 	/* Nothing to do if we failed to create a DSM segment. */
 	if (cxt->seg == NULL)
 		return;
 
 	pstate = shm_toc_lookup(cxt->toc, plan_node_id, false);
->>>>>>> REL_15_10
 
 	/*
 	 * It would be possible to reuse the shared hash table in single-batch

diff --git a/src/backend/jit/llvm/llvmjit.c b/src/backend/jit/llvm/llvmjit.c
@@ -1319,15 +1319,11 @@ llvm_create_object_layer(void *Ctx, LLVMOrcExecutionSessionRef ES, const char *T
 {
 #ifdef USE_LLVM_BACKPORT_SECTION_MEMORY_MANAGER
 	LLVMOrcObjectLayerRef objlayer =
-<<<<<<< HEAD
-		LLVMOrcCreateRTDyldObjectLinkingLayerWithSectionMemoryManager(ES);
-=======
 		LLVMOrcCreateRTDyldObjectLinkingLayerWithSafeSectionMemoryManager(ES);
 #else
 	LLVMOrcObjectLayerRef objlayer =
 		LLVMOrcCreateRTDyldObjectLinkingLayerWithSectionMemoryManager(ES);
 #endif
->>>>>>> REL_15_10
 
 #if defined(HAVE_DECL_LLVMCREATEGDBREGISTRATIONLISTENER) && HAVE_DECL_LLVMCREATEGDBREGISTRATIONLISTENER
 	if (jit_debugging_support)

diff --git a/src/backend/utils/misc/guc.c b/src/backend/utils/misc/guc.c
@@ -6688,11 +6688,7 @@ static struct config_string ConfigureNamesString[] =
 
 	{
 		{"restrict_nonsystem_relation_kind", PGC_USERSET, CLIENT_CONN_STATEMENT,
-<<<<<<< HEAD
-			gettext_noop("Sets relation kinds of non-system relation to restrict use."),
-=======
 			gettext_noop("Prohibits access to non-system relations of specified kinds."),
->>>>>>> REL_15_10
 			NULL,
 			GUC_LIST_INPUT | GUC_NOT_IN_SAMPLE
 		},

diff --git a/src/test/regress/expected/advisory_lock.out b/src/test/regress/expected/advisory_lock.out
@@ -12,17 +12,12 @@ SELECT
 (1 row)
 
 SELECT locktype, classid, objid, objsubid, mode, granted
-<<<<<<< HEAD
     FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
     WHERE
         locktype = 'advisory'
         AND pa.datname = current_database()
         AND pa.application_name = 'pg_regress/advisory_lock'
     ORDER BY 1, 2, 3, 4;
-=======
-	FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
-	ORDER BY classid, objid, objsubid;
->>>>>>> REL_15_10
  locktype | classid | objid | objsubid |     mode      | granted 
 ----------+---------+-------+----------+---------------+---------
  advisory |       0 |     1 |        1 | ExclusiveLock | t
@@ -38,14 +33,10 @@ SELECT pg_advisory_unlock_all();
 
 (1 row)
 
-<<<<<<< HEAD
 SELECT count(*) FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
 	WHERE locktype = 'advisory'
 	AND pa.datname = current_database()
     AND pa.application_name = 'pg_regress/advisory_lock';
-=======
-SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid;
->>>>>>> REL_15_10
  count 
 -------
      4
@@ -66,14 +57,10 @@ WARNING:  you don't own a lock of type ShareLock
 
 -- automatically release xact locks at commit
 COMMIT;
-<<<<<<< HEAD
 SELECT count(*) FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
 	WHERE locktype = 'advisory'
 	AND pa.datname = current_database()
     AND pa.application_name = 'pg_regress/advisory_lock';
-=======
-SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid;
->>>>>>> REL_15_10
  count 
 -------
      0
@@ -90,17 +77,12 @@ SELECT
 (1 row)
 
 SELECT locktype, classid, objid, objsubid, mode, granted
-<<<<<<< HEAD
     FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
     WHERE
         locktype = 'advisory'
         AND pa.datname = current_database()
         AND pa.application_name = 'pg_regress/advisory_lock'
     ORDER BY 1, 2, 3, 4;
-=======
-	FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
-	ORDER BY classid, objid, objsubid;
->>>>>>> REL_15_10
  locktype | classid | objid | objsubid |     mode      | granted 
 ----------+---------+-------+----------+---------------+---------
  advisory |       0 |     1 |        1 | ExclusiveLock | t
@@ -119,17 +101,12 @@ SELECT
 
 ROLLBACK;
 SELECT locktype, classid, objid, objsubid, mode, granted
-<<<<<<< HEAD
     FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
     WHERE
         locktype = 'advisory'
         AND pa.datname = current_database()
         AND pa.application_name = 'pg_regress/advisory_lock'
     ORDER BY 1, 2, 3, 4;
-=======
-	FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
-	ORDER BY classid, objid, objsubid;
->>>>>>> REL_15_10
  locktype | classid | objid | objsubid |     mode      | granted 
 ----------+---------+-------+----------+---------------+---------
  advisory |       0 |     1 |        1 | ExclusiveLock | t
@@ -153,14 +130,10 @@ WARNING:  you don't own a lock of type ShareLock
  t                  | f                  | t                         | f                         | t                  | f                  | t                         | f
 (1 row)
 
-<<<<<<< HEAD
 SELECT count(*) FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
 	WHERE locktype = 'advisory'
 	AND pa.datname = current_database()
     AND pa.application_name = 'pg_regress/advisory_lock';
-=======
-SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid;
->>>>>>> REL_15_10
  count 
 -------
      0
@@ -177,17 +150,12 @@ SELECT
 (1 row)
 
 SELECT locktype, classid, objid, objsubid, mode, granted
-<<<<<<< HEAD
     FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
     WHERE
         locktype = 'advisory'
         AND pa.datname = current_database()
         AND pa.application_name = 'pg_regress/advisory_lock'
     ORDER BY 1, 2, 3, 4;
-=======
-	FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
-	ORDER BY classid, objid, objsubid;
->>>>>>> REL_15_10
  locktype | classid | objid | objsubid |     mode      | granted 
 ----------+---------+-------+----------+---------------+---------
  advisory |       0 |     1 |        1 | ExclusiveLock | t
@@ -206,17 +174,12 @@ SELECT
 
 ROLLBACK;
 SELECT locktype, classid, objid, objsubid, mode, granted
-<<<<<<< HEAD
     FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
     WHERE
         locktype = 'advisory'
         AND pa.datname = current_database()
         AND pa.application_name = 'pg_regress/advisory_lock'
     ORDER BY 1, 2, 3, 4;
-=======
-	FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
-	ORDER BY classid, objid, objsubid;
->>>>>>> REL_15_10
  locktype | classid | objid | objsubid |     mode      | granted 
 ----------+---------+-------+----------+---------------+---------
  advisory |       0 |     1 |        1 | ExclusiveLock | t
@@ -232,14 +195,10 @@ SELECT pg_advisory_unlock_all();
 
 (1 row)
 
-<<<<<<< HEAD
 SELECT count(*) FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
 	WHERE locktype = 'advisory'
 	AND pa.datname = current_database()
     AND pa.application_name = 'pg_regress/advisory_lock';
-=======
-SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid;
->>>>>>> REL_15_10
  count 
 -------
      0
@@ -258,17 +217,12 @@ SELECT
 (1 row)
 
 SELECT locktype, classid, objid, objsubid, mode, granted
-<<<<<<< HEAD
     FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
     WHERE
         locktype = 'advisory'
         AND pa.datname = current_database()
         AND pa.application_name = 'pg_regress/advisory_lock'
     ORDER BY 1, 2, 3, 4;
-=======
-	FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
-	ORDER BY classid, objid, objsubid;
->>>>>>> REL_15_10
  locktype | classid | objid | objsubid |     mode      | granted 
 ----------+---------+-------+----------+---------------+---------
  advisory |       0 |     1 |        1 | ExclusiveLock | t
@@ -278,14 +232,10 @@ SELECT locktype, classid, objid, objsubid, mode, granted
 (4 rows)
 
 COMMIT;
-<<<<<<< HEAD
 SELECT count(*) FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
 	WHERE locktype = 'advisory'
 	AND pa.datname = current_database()
     AND pa.application_name = 'pg_regress/advisory_lock';
-=======
-SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid;
->>>>>>> REL_15_10
  count 
 -------
      0
@@ -303,17 +253,12 @@ SELECT
 (1 row)
 
 SELECT locktype, classid, objid, objsubid, mode, granted
-<<<<<<< HEAD
     FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
     WHERE
         locktype = 'advisory'
         AND pa.datname = current_database()
         AND pa.application_name = 'pg_regress/advisory_lock'
     ORDER BY 1, 2, 3, 4;
-=======
-	FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
-	ORDER BY classid, objid, objsubid;
->>>>>>> REL_15_10
  locktype | classid | objid | objsubid |     mode      | granted 
 ----------+---------+-------+----------+---------------+---------
  advisory |       0 |     1 |        1 | ExclusiveLock | t
@@ -332,14 +277,10 @@ SELECT
  t                  | t                  | t                         | t                         | t                  | t                  | t                         | t
 (1 row)
 
-<<<<<<< HEAD
 SELECT count(*) FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
 	WHERE locktype = 'advisory'
 	AND pa.datname = current_database()
     AND pa.application_name = 'pg_regress/advisory_lock';
-=======
-SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid;
->>>>>>> REL_15_10
  count 
 -------
      0
@@ -357,17 +298,12 @@ SELECT
 (1 row)
 
 SELECT locktype, classid, objid, objsubid, mode, granted
-<<<<<<< HEAD
     FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
     WHERE
         locktype = 'advisory'
         AND pa.datname = current_database()
         AND pa.application_name = 'pg_regress/advisory_lock'
     ORDER BY 1, 2, 3, 4;
-=======
-	FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid
-	ORDER BY classid, objid, objsubid;
->>>>>>> REL_15_10
  locktype | classid | objid | objsubid |     mode      | granted 
 ----------+---------+-------+----------+---------------+---------
  advisory |       0 |     1 |        1 | ExclusiveLock | t
@@ -382,14 +318,10 @@ SELECT pg_advisory_unlock_all();
 
 (1 row)
 
-<<<<<<< HEAD
 SELECT count(*) FROM pg_locks pl JOIN pg_stat_activity pa USING (pid)
 	WHERE locktype = 'advisory'
 	AND pa.datname = current_database()
     AND pa.application_name = 'pg_regress/advisory_lock';
-=======
-SELECT count(*) FROM pg_locks WHERE locktype = 'advisory' AND database = :datoid;
->>>>>>> REL_15_10
  count 
 -------
      0