From b09dae0dab91ccde2e6f210f8f6db43bce62e869 Mon Sep 17 00:00:00 2001 From: Mehmet Yilmaz Date: Thu, 3 Jul 2025 10:13:51 +0000 Subject: [PATCH 1/4] Refactor Makefile to skip columnar storage build and install steps --- Makefile | 12 +++++++----- citus-tools | 1 + 2 files changed, 8 insertions(+), 5 deletions(-) create mode 160000 citus-tools diff --git a/Makefile b/Makefile index 77d8cad3e..2ab764b7d 100644 --- a/Makefile +++ b/Makefile @@ -15,13 +15,15 @@ all: extension # build columnar only +.PHONY: columnar columnar: - $(MAKE) -C src/backend/columnar all + @echo ">>> skipping columnar storage build <<<" # build extension -extension: $(citus_top_builddir)/src/include/citus_version.h columnar +extension: $(citus_top_builddir)/src/include/citus_version.h $(MAKE) -C src/backend/distributed/ all +.PHONY: install-columnar install-columnar: columnar - $(MAKE) -C src/backend/columnar install + @echo ">>> skipping columnar storage install <<<" install-extension: extension install-columnar $(MAKE) -C src/backend/distributed/ install install-headers: extension @@ -33,7 +35,7 @@ install-headers: extension clean-extension: $(MAKE) -C src/backend/distributed/ clean - $(MAKE) -C src/backend/columnar/ clean +# $(MAKE) -C src/backend/columnar/ clean clean-full: $(MAKE) -C src/backend/distributed/ clean-full .PHONY: extension install-extension clean-extension clean-full @@ -41,7 +43,7 @@ clean-full: install-downgrades: $(MAKE) -C src/backend/distributed/ install-downgrades install-all: install-headers - $(MAKE) -C src/backend/columnar/ install-all +# $(MAKE) -C src/backend/columnar/ install-all $(MAKE) -C src/backend/distributed/ install-all diff --git a/citus-tools b/citus-tools new file mode 160000 index 000000000..3376bd684 --- /dev/null +++ b/citus-tools @@ -0,0 +1 @@ +Subproject commit 3376bd6845f0614908ed304f5033bd644c82d3bf From 67ca0cda1a3a9fe7565591f199c3caf588a73534 Mon Sep 17 00:00:00 2001 From: Mehmet Yilmaz Date: Thu, 3 Jul 2025 10:22:16 +0000 Subject: [PATCH 2/4] Remove references to citus_columnar extension in utility hook and dependency checks --- src/backend/distributed/commands/utility_hook.c | 4 ++-- src/backend/distributed/metadata/dependency.c | 7 +++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/backend/distributed/commands/utility_hook.c b/src/backend/distributed/commands/utility_hook.c index 4d297297b..1342a72ec 100644 --- a/src/backend/distributed/commands/utility_hook.c +++ b/src/backend/distributed/commands/utility_hook.c @@ -212,7 +212,7 @@ citus_ProcessUtility(PlannedStmt *pstmt, * Postgres forbids creating/altering other extensions from within an extension script, so we use a utility hook instead * This preprocess check whether citus_columnar should be installed first before citus */ - PreprocessCreateExtensionStmtForCitusColumnar(parsetree); + // PreprocessCreateExtensionStmtForCitusColumnar(parsetree); } if (isCreateAlterExtensionUpdateCitusStmt || IsDropCitusExtensionStmt(parsetree)) @@ -797,7 +797,7 @@ citus_ProcessUtilityInternal(PlannedStmt *pstmt, * or drop citus_columnar fake version when downgrade citus to older version that do not support * citus_columnar */ - PostprocessAlterExtensionCitusStmtForCitusColumnar(parsetree); + // PostprocessAlterExtensionCitusStmtForCitusColumnar(parsetree); } /* diff --git a/src/backend/distributed/metadata/dependency.c b/src/backend/distributed/metadata/dependency.c index 36db39bab..295952f7b 100644 --- a/src/backend/distributed/metadata/dependency.c +++ b/src/backend/distributed/metadata/dependency.c @@ -1233,10 +1233,10 @@ bool IsObjectAddressOwnedByCitus(const ObjectAddress *objectAddress) { Oid citusId = get_extension_oid("citus", true); - Oid citusColumnarId = get_extension_oid("citus_columnar", true); + // Oid citusColumnarId = get_extension_oid("citus_columnar", true); /* return false because we could not find any citus extension */ - if (!OidIsValid(citusId) && !OidIsValid(citusColumnarId)) + if (!OidIsValid(citusId)) { return false; } @@ -1250,9 +1250,8 @@ IsObjectAddressOwnedByCitus(const ObjectAddress *objectAddress) } bool ownedByCitus = extObjectAddress.objectId == citusId; - bool ownedByCitusColumnar = extObjectAddress.objectId == citusColumnarId; - return ownedByCitus || ownedByCitusColumnar; + return ownedByCitus; } From 0de9d9542ac182b8d63dd896fe2750bdb58c83d9 Mon Sep 17 00:00:00 2001 From: Mehmet Yilmaz Date: Thu, 3 Jul 2025 10:26:03 +0000 Subject: [PATCH 3/4] Comment out columnar-related checks in build and test workflows --- .github/workflows/build_and_test.yml | 4 ++-- src/test/regress/Makefile | 22 +++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.github/workflows/build_and_test.yml b/.github/workflows/build_and_test.yml index f9b9f5701..e39b96089 100644 --- a/.github/workflows/build_and_test.yml +++ b/.github/workflows/build_and_test.yml @@ -153,8 +153,8 @@ jobs: - check-isolation - check-operations - check-follower-cluster - - check-columnar - - check-columnar-isolation + # - check-columnar + # - check-columnar-isolation - check-enterprise - check-enterprise-isolation - check-enterprise-isolation-logicalrep-1 diff --git a/src/test/regress/Makefile b/src/test/regress/Makefile index 4bdc7a1b8..8c79e6333 100644 --- a/src/test/regress/Makefile +++ b/src/test/regress/Makefile @@ -45,7 +45,7 @@ vanilla_diffs_file = $(citus_abs_srcdir)/pg_vanilla_outputs/$(MAJORVERSION)/regr # intermediate, for muscle memory backward compatibility. check: check-full check-enterprise-full # check-full triggers all tests that ought to be run routinely -check-full: check-multi check-multi-mx check-multi-1 check-operations check-follower-cluster check-isolation check-failure check-split check-vanilla check-columnar check-columnar-isolation check-pg-upgrade check-arbitrary-configs check-citus-upgrade check-citus-upgrade-mixed check-citus-upgrade-local check-citus-upgrade-mixed-local check-pytest check-query-generator +check-full: check-multi check-multi-mx check-multi-1 check-operations check-follower-cluster check-isolation check-failure check-split check-vanilla check-pg-upgrade check-arbitrary-configs check-citus-upgrade check-citus-upgrade-mixed check-citus-upgrade-local check-citus-upgrade-mixed-local check-pytest check-query-generator # check-enterprise-full triggers all enterprise specific tests check-enterprise-full: check-enterprise check-enterprise-isolation check-enterprise-failure check-enterprise-isolation-logicalrep-1 check-enterprise-isolation-logicalrep-2 check-enterprise-isolation-logicalrep-3 @@ -180,10 +180,10 @@ check-multi-1-vg: all --pg_ctl-timeout=360 --connection-timeout=500000 --valgrind-path=valgrind --valgrind-log-file=$(CITUS_VALGRIND_LOG_FILE) \ -- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/multi_1_schedule $(EXTRA_TESTS) -check-columnar-vg: all - $(pg_regress_multi_check) --load-extension=citus --valgrind \ - --pg_ctl-timeout=360 --connection-timeout=500000 --valgrind-path=valgrind --valgrind-log-file=$(CITUS_VALGRIND_LOG_FILE) \ - -- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/columnar_schedule $(EXTRA_TESTS) +# check-columnar-vg: all +# $(pg_regress_multi_check) --load-extension=citus --valgrind \ +# --pg_ctl-timeout=360 --connection-timeout=500000 --valgrind-path=valgrind --valgrind-log-file=$(CITUS_VALGRIND_LOG_FILE) \ +# -- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/columnar_schedule $(EXTRA_TESTS) check-isolation: all $(isolation_test_files) $(pg_regress_multi_check) --load-extension=citus --isolationtester \ @@ -227,13 +227,13 @@ check-operations: all $(pg_regress_multi_check) --load-extension=citus --worker-count=6 \ -- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/operations_schedule $(EXTRA_TESTS) -check-columnar: all - $(pg_regress_multi_check) --load-extension=citus_columnar --load-extension=citus \ - -- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/columnar_schedule $(EXTRA_TESTS) +# check-columnar: all +# $(pg_regress_multi_check) --load-extension=citus_columnar --load-extension=citus \ +# -- $(MULTI_REGRESS_OPTS) --schedule=$(citus_abs_srcdir)/columnar_schedule $(EXTRA_TESTS) -check-columnar-isolation: all $(isolation_test_files) - $(pg_regress_multi_check) --load-extension=citus --isolationtester \ - -- $(MULTI_REGRESS_OPTS) --inputdir=$(citus_abs_srcdir)/build --schedule=$(citus_abs_srcdir)/columnar_isolation_schedule $(EXTRA_TESTS) +# check-columnar-isolation: all $(isolation_test_files) +# $(pg_regress_multi_check) --load-extension=citus --isolationtester \ +# -- $(MULTI_REGRESS_OPTS) --inputdir=$(citus_abs_srcdir)/build --schedule=$(citus_abs_srcdir)/columnar_isolation_schedule $(EXTRA_TESTS) check-split: all $(pg_regress_multi_check) --load-extension=citus \ From 4f031b977fdc129a953187a329aeeb1b6ed6bb87 Mon Sep 17 00:00:00 2001 From: Mehmet Yilmaz Date: Thu, 3 Jul 2025 10:34:50 +0000 Subject: [PATCH 4/4] Comment out columnar extension preprocessing in utility hook --- src/backend/distributed/commands/utility_hook.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/backend/distributed/commands/utility_hook.c b/src/backend/distributed/commands/utility_hook.c index 1342a72ec..399b6500a 100644 --- a/src/backend/distributed/commands/utility_hook.c +++ b/src/backend/distributed/commands/utility_hook.c @@ -784,7 +784,7 @@ citus_ProcessUtilityInternal(PlannedStmt *pstmt, /* * Check whether need to install/drop citus_columnar when upgrade/downgrade citus */ - PreprocessAlterExtensionCitusStmtForCitusColumnar(parsetree); + // PreprocessAlterExtensionCitusStmtForCitusColumnar(parsetree); } PrevProcessUtility(pstmt, queryString, false, context,