This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new d39e698c663 Enable tools in bin/scripts
d39e698c663 is described below
commit d39e698c663168953c4f9ef25be348d28993d22d
Author: Jinbao Chen <[email protected]>
AuthorDate: Mon Oct 20 20:40:34 2025 +0800
Enable tools in bin/scripts
---
src/bin/Makefile | 3 ++-
src/bin/scripts/nls.mk | 4 ----
src/bin/scripts/reindexdb.c | 10 ----------
src/bin/scripts/vacuumdb.c | 8 --------
4 files changed, 2 insertions(+), 23 deletions(-)
diff --git a/src/bin/Makefile b/src/bin/Makefile
index 6614b35f576..24b2efccf88 100644
--- a/src/bin/Makefile
+++ b/src/bin/Makefile
@@ -44,7 +44,8 @@ SUBDIRS = \
pg_config \
pg_controldata \
pg_ctl \
- psql
+ psql \
+ scripts
ifeq ($(PORTNAME), win32)
SUBDIRS += pgevent
diff --git a/src/bin/scripts/nls.mk b/src/bin/scripts/nls.mk
index 3f3e590fd25..5fe63fa7106 100644
--- a/src/bin/scripts/nls.mk
+++ b/src/bin/scripts/nls.mk
@@ -1,9 +1,5 @@
# src/bin/scripts/nls.mk
CATALOG_NAME = pgscripts
-<<<<<<< HEAD
-AVAIL_LANGUAGES = cs de el es fr ja ko ru sv tr uk zh_CN
-=======
->>>>>>> REL_16_9
GETTEXT_FILES = $(FRONTEND_COMMON_GETTEXT_FILES) \
createdb.c \
createuser.c \
diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c
index 410444ed84a..62ce79bee97 100644
--- a/src/bin/scripts/reindexdb.c
+++ b/src/bin/scripts/reindexdb.c
@@ -328,16 +328,6 @@ reindex_one_database(ConnParams *cparams, ReindexType type,
conn = connectDatabase(cparams, progname, echo, false, false);
-<<<<<<< HEAD
-=======
- if (concurrently && PQserverVersion(conn) < 120000)
- {
- PQfinish(conn);
- pg_fatal("cannot use the \"%s\" option on server versions older
than PostgreSQL %s",
- "concurrently", "12");
- }
-
->>>>>>> REL_16_9
if (tablespace && PQserverVersion(conn) < 140000)
{
PQfinish(conn);
diff --git a/src/bin/scripts/vacuumdb.c b/src/bin/scripts/vacuumdb.c
index ee3711f982a..a1ebabc0735 100644
--- a/src/bin/scripts/vacuumdb.c
+++ b/src/bin/scripts/vacuumdb.c
@@ -731,18 +731,10 @@ vacuum_one_database(ConnParams *cparams,
*/
if ((objfilter & OBJFILTER_TABLE) == 0)
{
-<<<<<<< HEAD
- appendPQExpBufferStr(&catalog_query, " WHERE c.relkind
OPERATOR(pg_catalog.=) ANY (array["
-
CppAsString2(RELKIND_RELATION) ", "
-
CppAsString2(RELKIND_DIRECTORY_TABLE) ", "
-
CppAsString2(RELKIND_MATVIEW) "])\n");
- has_where = true;
-=======
appendPQExpBuffer(&catalog_query,
" AND c.relkind
OPERATOR(pg_catalog.=) ANY (array["
CppAsString2(RELKIND_RELATION) ", "
CppAsString2(RELKIND_MATVIEW)
"])\n");
->>>>>>> REL_16_9
}
/*
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
