From 6ea565d8f07d31daae8f7d2b73d310c287ad05b1 Mon Sep 17 00:00:00 2001
From: Yanwen Jin <yanwjin@microsoft.com>
Date: Fri, 25 Feb 2022 14:56:27 -0800
Subject: [PATCH] Use citus_columnar instead of columnar

---
 src/backend/columnar/Makefile                 | 2 +-
 src/backend/distributed/Makefile              | 5 +++--
 src/backend/distributed/shared_library_init.c | 4 ++--
 src/include/columnar/mod.h                    | 1 +
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/backend/columnar/Makefile b/src/backend/columnar/Makefile
index c53e55cda..abda9c90d 100644
--- a/src/backend/columnar/Makefile
+++ b/src/backend/columnar/Makefile
@@ -7,7 +7,7 @@ ENSURE_SUBDIRS_EXIST := $(shell mkdir -p $(SUBDIRS))
 OBJS += \
 	$(patsubst $(citus_abs_srcdir)/%.c,%.o,$(foreach dir,$(SUBDIRS), $(sort $(wildcard $(citus_abs_srcdir)/$(dir)/*.c))))
 
-MODULE_big = columnar
+MODULE_big = citus_columnar
 
 PG_CPPFLAGS += -I$(libpq_srcdir) -I$(safestringlib_srcdir)/include
 
diff --git a/src/backend/distributed/Makefile b/src/backend/distributed/Makefile
index 463736015..b88d6b77f 100644
--- a/src/backend/distributed/Makefile
+++ b/src/backend/distributed/Makefile
@@ -37,7 +37,7 @@ all:
 NO_PGXS = 1
 
 SHLIB_LINK = $(libpq)
-SHLIB_LINK_INTERNAL += -L../columnar -l:columnar.so
+SHLIB_LINK_INTERNAL += -L../columnar -l:citus_columnar.so
 override enable_rpath = yes
 include $(citus_top_builddir)/Makefile.global
 
@@ -85,7 +85,8 @@ endif
 .PHONY: clean-full install install-downgrades install-all
 
 cleanup-before-install:
-	rm -f $(DESTDIR)$(datadir)/$(datamoduledir)/citus*
+	rm -f $(DESTDIR)$(datadir)/$(datamoduledir)/citus.control
+	rm -f $(DESTDIR)$(datadir)/$(datamoduledir)/citus--*
 
 install: cleanup-before-install
 
diff --git a/src/backend/distributed/shared_library_init.c b/src/backend/distributed/shared_library_init.c
index 6796594e8..0cedff55f 100644
--- a/src/backend/distributed/shared_library_init.c
+++ b/src/backend/distributed/shared_library_init.c
@@ -349,10 +349,10 @@ _PG_init(void)
 
 	/*
 	 * For convenience and backwards compatibility, we avoid users having to add both
-	 * citus and columnar to shared_preload_libraries by loading columnar.so as part of
+	 * citus and columnar to shared_preload_libraries by loading citus_columnar.so as part of
 	 * loading citus.so.
 	 */
-	load_file("columnar.so", false);
+	load_file(COLUMNAR_LIB_NAME, false);
 }
 
 
diff --git a/src/include/columnar/mod.h b/src/include/columnar/mod.h
index 7440a9fd7..7e24b3b6e 100644
--- a/src/include/columnar/mod.h
+++ b/src/include/columnar/mod.h
@@ -11,6 +11,7 @@
 
 #ifndef MOD_H
 #define MOD_H
+#define COLUMNAR_LIB_NAME "citus_columnar"
 
 /* Function declarations for extension loading and unloading */
 extern void columnar_init(void);