Use citus_columnar instead of columnar

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
 

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
 

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);
 }
 
 

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);