Merge branch 'main' into cherry_pick_hot_standby

Author: fanfuxiaoran

.github/ISSUE_TEMPLATE/config.yml

@@ -1,4 +1,4 @@
-blank_issues_enabled: false
+blank_issues_enabled: true
 contact_links:
   - name: 🙏🏻 Q&A
     url: https://github.com/apache/cloudberry/discussions/categories/q-a

configure

@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Apache Cloudberry 2.0.0-devel.
+# Generated by GNU Autoconf 2.69 for Apache Cloudberry 2.1.0-devel.
 #
 # Report bugs to <dev@cloudberry.apache.org>.
 #
@@ -582,8 +582,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='Apache Cloudberry'
 PACKAGE_TARNAME='apache-cloudberry'
-PACKAGE_VERSION='2.0.0-devel'
-PACKAGE_STRING='Apache Cloudberry 2.0.0-devel'
+PACKAGE_VERSION='2.1.0-devel'
+PACKAGE_STRING='Apache Cloudberry 2.1.0-devel'
 PACKAGE_BUGREPORT='dev@cloudberry.apache.org'
 PACKAGE_URL='https://cloudberry.apache.org/'
 
@@ -1513,7 +1513,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 Apache Cloudberry 2.0.0-devel to adapt to many kinds of systems.
+\`configure' configures Apache Cloudberry 2.1.0-devel to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1579,7 +1579,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of Apache Cloudberry 2.0.0-devel:";;
+     short | recursive ) echo "Configuration of Apache Cloudberry 2.1.0-devel:";;
    esac
   cat <<\_ACEOF
 
@@ -1782,7 +1782,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-Apache Cloudberry configure 2.0.0-devel
+Apache Cloudberry configure 2.1.0-devel
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2535,7 +2535,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 Apache Cloudberry $as_me 2.0.0-devel, which was
+It was created by Apache Cloudberry $as_me 2.1.0-devel, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -23334,7 +23334,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 Apache Cloudberry $as_me 2.0.0-devel, which was
+This file was extended by Apache Cloudberry $as_me 2.1.0-devel, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -23405,7 +23405,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="\\
-Apache Cloudberry config.status 2.0.0-devel
+Apache Cloudberry config.status 2.1.0-devel
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 

configure.ac

@@ -20,7 +20,7 @@ m4_pattern_forbid(^PGAC_)dnl to catch undefined macros
 dnl The PACKAGE_VERSION from upstream PostgreSQL is maintained in the
 dnl PG_PACKAGE_VERSION variable, when merging make sure to update this
 dnl variable with the merge conflict from the AC_INIT() statement.
-AC_INIT([Apache Cloudberry], [2.0.0-devel], [dev@cloudberry.apache.org], [], [https://cloudberry.apache.org/])
+AC_INIT([Apache Cloudberry], [2.1.0-devel], [dev@cloudberry.apache.org], [], [https://cloudberry.apache.org/])
 [PG_PACKAGE_VERSION=14.4]
 AC_SUBST(PG_PACKAGE_VERSION)
 

getversion

@@ -35,7 +35,13 @@
 #         e.g.,     VERSION = 2.0.1-devel+dev.3.gabcd123
 #
 #   3. If *not* in a Git repo but a `VERSION` file exists:
-#         VERSION and BUILDNUMBER are read from that file (format: "<version> build <build_number>")
+#
+#      a. If the file contains a line like "<version> build <build_number>", both values are extracted.
+#
+#      b. Otherwise, the VERSION is read from the file and the BUILDNUMBER is taken from BUILD_NUMBER if it exists.
+#
+#      (This is the case for Apache Cloudberry packaging builds, where these files are created by the
+#       release script and may also be leveraged by downstream users.)
 #
 #   4. If neither a Git repo nor a VERSION file is present:
 #         VERSION = <PACKAGE_VERSION> from configure
@@ -101,8 +107,16 @@ if type git >/dev/null 2>&1 && [ -d '.git' ]; then
     fi
 # Not a git repo but VERSION file exists
 elif [[ -s ./VERSION ]]; then
-    VERSION=$(awk -F' build ' '{print $1}' ./VERSION)
-    BUILDNUMBER=$(awk -F' build ' '{print $2}' ./VERSION)
+    # Support both legacy "<version> build <build_number>" and newer single-version formats
+    if grep -q ' build ' ./VERSION; then
+        VERSION=$(awk -F' build ' '{print $1}' ./VERSION)
+        BUILDNUMBER=$(awk -F' build ' '{print $2}' ./VERSION)
+    else
+        VERSION=$(<./VERSION)
+        if [[ -f ./BUILD_NUMBER ]]; then
+            BUILDNUMBER=$(<./BUILD_NUMBER)
+        fi
+    fi
 fi
 
 # Handle optional flag

src/backend/catalog/gp_matview_aux.c

@@ -41,7 +41,6 @@
 #include "catalog/pg_type.h"
 #include "catalog/indexing.h"
 #include "cdb/cdbvars.h"
-#include "commands/matview.h"
 #include "utils/array.h"
 #include "utils/builtins.h"
 #include "utils/rel.h"
@@ -168,7 +167,6 @@ InsertMatviewAuxEntry(Oid mvoid, const Query *viewQuery, bool skipdata)
 	List 		*relids;
 	NameData	mvname;
 	bool		has_foreign = false;
-	Relation		matviewRel;
 	char	   *viewsql;
 
 	Assert(OidIsValid(mvoid));
@@ -190,9 +188,7 @@ InsertMatviewAuxEntry(Oid mvoid, const Query *viewQuery, bool skipdata)
 
 	values[Anum_gp_matview_aux_has_foreign - 1] = BoolGetDatum(has_foreign);
 
-	matviewRel = table_open(mvoid, NoLock);
-	viewsql = nodeToString((Node *) copyObject(get_matview_query(matviewRel)));
-	table_close(matviewRel, NoLock);
+	viewsql = nodeToString((Node *) copyObject(viewQuery));
 	values[Anum_gp_matview_aux_view_query - 1] = CStringGetTextDatum(viewsql);
 
 	if (skipdata)

src/backend/optimizer/plan/aqumv.c

@@ -57,15 +57,7 @@
 #include "nodes/pathnodes.h"
 #include "nodes/pg_list.h"
 
-typedef struct
-{
-	int 	varno;
-} aqumv_adjust_varno_context;
-
-extern void aqumv_adjust_simple_query(Query *viewQuery);
 static bool aqumv_process_from_quals(Node *query_quals, Node *mv_quals, List** post_quals);
-static void aqumv_adjust_varno(Query *parse, int delta);
-static Node *aqumv_adjust_varno_mutator(Node *node, aqumv_adjust_varno_context *context);
 
 typedef struct
 {
@@ -361,9 +353,6 @@ answer_query_using_materialized_views(PlannerInfo *root, AqumvContext aqumv_cont
 		subroot->tuple_fraction = root->tuple_fraction;
 		subroot->limit_tuples = root->limit_tuples;
 
-		/* Adjust to valid query tree and fix varno after rewrite.*/
-		aqumv_adjust_simple_query(viewQuery);
-
 		/*
 		 * AQUMV_FIXME_MVP
 		 * Are stable functions OK?
@@ -886,111 +875,6 @@ aqumv_process_targetlist(aqumv_equivalent_transformation_context *context, List
 	return !context->has_unmatched;
 }
 
-void aqumv_adjust_simple_query(Query *viewQuery)
-{
-	ListCell *lc;
-	/*
-	 * AQUMV
-	 * We have to rewrite now before we do the real Equivalent
-	 * Transformation 'rewrite'.
-	 * Because actions stored in rule is not a normal query tree,
-	 * it can't be used directly, with exception to new/old relations used to
-	 * refresh mv.
-	 * Erase unused relations, keep the right one.
-	 */
-	foreach (lc, viewQuery->rtable)
-	{
-		RangeTblEntry *rtetmp = lfirst(lc);
-		if ((rtetmp->relkind == RELKIND_MATVIEW) &&
-			(rtetmp->alias != NULL) &&
-			(strcmp(rtetmp->alias->aliasname, "new") == 0 ||
-			 strcmp(rtetmp->alias->aliasname, "old") == 0))
-		{
-			foreach_delete_current(viewQuery->rtable, lc);
-		}
-	}
-
-	/*
-	 * Now we have the right relation, adjust
-	 * varnos in its query tree.
-	 * AQUMV_FIXME_MVP: Only one single relation
-	 * is supported now, we could assign varno
-	 * to 1 opportunistically.
-	 */
-	aqumv_adjust_varno(viewQuery, 1);
-}
-
-/*
- * Process varno after we eliminate mv's actions("old" and "new" relation)
- * Correct rindex and all varnos with a delta.
- *
- * MV's actions query tree:
- *		[rtable]
- *				RangeTblEntry [rtekind=RTE_RELATION]
- *						[alias] Alias [aliasname="old"]
- *				RangeTblEntry [rtekind=RTE_RELATION]
- *						[alias] Alias [aliasname="new"]
- *				RangeTblEntry [rtekind=RTE_RELATION]
- *		[jointree]
- *				FromExpr []
- *						[fromlist]
- *								RangeTblRef [rtindex=3]
- *		[targetList]
- *				TargetEntry [resno=1 resname="c1"]
- *						Var [varno=3 varattno=1]
- *				TargetEntry [resno=2 resname="c2"]
- *						Var [varno=3 varattno=2]
- *------------------------------------------------------------------------------------------
- * MV's query tree after rewrite:
- *		[rtable]
- *				RangeTblEntry [rtekind=RTE_RELATION]
- *		[jointree]
- *				FromExpr []
- *						[fromlist]
- *								RangeTblRef [rtindex=3]
- *		[targetList]
- *				TargetEntry [resno=1 resname="c1"]
- *						Var [varno=3 varattno=1]
- *				TargetEntry [resno=2 resname="c2"]
- *						Var [varno=3 varattno=2]
- *------------------------------------------------------------------------------------------
- * MV's query tree after varno adjust:
- *		[rtable]
- *				RangeTblEntry [rtekind=RTE_RELATION]
- *		[jointree]
- *				FromExpr []
- *						[fromlist]
- *								RangeTblRef [rtindex=1]
- *		[targetList]
- *				TargetEntry [resno=1 resname="c1"]
- *						Var [varno=1 varattno=1]
- *				TargetEntry [resno=2 resname="c2"]
- *						Var [varno=1 varattno=2]
- *
- */
-static void
-aqumv_adjust_varno(Query* parse, int varno)
-{
-	aqumv_adjust_varno_context context;
-	context.varno = varno;
-	parse = query_tree_mutator(parse, aqumv_adjust_varno_mutator, &context, QTW_DONT_COPY_QUERY);
-}
-
-static Node *aqumv_adjust_varno_mutator(Node *node, aqumv_adjust_varno_context *context)
-{
-	if (node == NULL)
-		return NULL;
-	if (IsA(node, Var))
-	{
-		((Var *)node)->varno = context->varno;
-		((Var *)node)->varnosyn = context->varno; /* Keep syntactic with varno. */
-	}
-	else if (IsA(node, RangeTblRef))
-		/* AQUMV_FIXME_MVP: currently we have only one relation */
-		((RangeTblRef*) node)->rtindex = context->varno;
-	return expression_tree_mutator(node, aqumv_adjust_varno_mutator, context);
-}
-
 /*
  * check_partition - Check if the query's range table entries align with the partitioned table structure.
  *

src/bin/pg_upgrade/util.c

@@ -273,7 +273,7 @@ check_ok(void)
  *  respected.
  */
 void
-gp_fatal_log(const char *fmt,...)  __attribute__ ((format (gnu_printf, 1, 2)));
+gp_fatal_log(const char *fmt,...)  pg_attribute_printf(1, 2);
 
 void
 gp_fatal_log(const char *fmt,...)

src/include/optimizer/aqumv.h

@@ -45,11 +45,4 @@ typedef AqumvContextData *AqumvContext;
 
 extern RelOptInfo* answer_query_using_materialized_views(PlannerInfo *root, AqumvContextData *aqumv_context);
 
-/*
- * Adjust parse tree storaged in view's actions.
- * Query should be a simple query, ex:
- * select from a single table.
- */
-extern void aqumv_adjust_simple_query(Query *viewQuery);
-
 #endif   /* AQUMV_H */

src/test/regress/expected/gp_explain.out

@@ -577,6 +577,10 @@ DROP USER regress_range_parted_user;
 -- Test if explain analyze will hang with materialize node
 CREATE TABLE recursive_table_ic (a INT) DISTRIBUTED BY (a);
 INSERT INTO recursive_table_ic SELECT * FROM generate_series(20, 30000);
+-- start_matchsubs
+-- m/Seq Scan on recursive_table_ic \(actual rows=\d+ loops=1\)/
+-- s/Seq Scan on recursive_table_ic \(actual rows=\d+ loops=1\)/Seq Scan on recursive_table_ic (actual rows=#### loops=1)/
+-- end_matchsubs
 explain (analyze, costs off, timing off, summary off) WITH RECURSIVE
 r(i) AS (
 	SELECT 1
@@ -600,7 +604,7 @@ SELECT * FROM y LIMIT 10;
                      ->  WorkTable Scan on y (never executed)
                      ->  Materialize (never executed)
                            ->  Gather Motion 3:1  (slice1; segments: 3) (never executed)
-                                 ->  Seq Scan on recursive_table_ic (actual rows=4061 loops=1)
+                                 ->  Seq Scan on recursive_table_ic (actual rows=#### loops=1)
  Optimizer: Postgres query optimizer
 (13 rows)
 

src/test/regress/expected/gp_explain_optimizer.out

@@ -599,6 +599,10 @@ DROP USER regress_range_parted_user;
 -- Test if explain analyze will hang with materialize node
 CREATE TABLE recursive_table_ic (a INT) DISTRIBUTED BY (a);
 INSERT INTO recursive_table_ic SELECT * FROM generate_series(20, 30000);
+-- start_matchsubs
+-- m/Seq Scan on recursive_table_ic \(actual rows=\d+ loops=1\)/
+-- s/Seq Scan on recursive_table_ic \(actual rows=\d+ loops=1\)/Seq Scan on recursive_table_ic (actual rows=#### loops=1)/
+-- end_matchsubs
 explain (analyze, costs off, timing off, summary off) WITH RECURSIVE
 r(i) AS (
 	SELECT 1
@@ -622,7 +626,7 @@ SELECT * FROM y LIMIT 10;
                      ->  WorkTable Scan on y (never executed)
                      ->  Materialize (never executed)
                            ->  Gather Motion 3:1  (slice1; segments: 3) (never executed)
-                                 ->  Seq Scan on recursive_table_ic (actual rows=4061 loops=1)
+                                 ->  Seq Scan on recursive_table_ic (actual rows=#### loops=1)
  Optimizer: Postgres query optimizer
 (13 rows)