Skip to content

Commit ab73fd1

Browse files
committed
pljava: align 1.6.10 for Cloudberry + update CI
- add 1.6.10 extension files and install layout - add legacy example shims for regression - GPDB-specific guards and replicated sqlj tables - adjust loader/fallback behavior - add Cloudberry docker CI and remove lazypg workflow
1 parent 9582337 commit ab73fd1

File tree

22 files changed

+685
-342
lines changed

22 files changed

+685
-342
lines changed

.github/workflows/ci-lazypg.yml

Lines changed: 0 additions & 288 deletions
This file was deleted.

Makefile

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ JAVA_HOME := $(PLJAVA_HOME)
3131
PLJAVADATA = $(DESTDIR)$(datadir)/pljava
3232
PLJAVALIB = $(DESTDIR)$(pkglibdir)/java
3333
PLJAVAEXT = $(DESTDIR)$(datadir)/extension
34+
PLJAVASYSCONF = $(shell pg_config --sysconfdir)
3435

3536
REGRESS_OPTS = --dbname=pljava_test --create-role=pljava_test
3637
REGRESS = pljava_ext_init pljava_functions pljava_test pljava_ext_cleanup pljava_init pljava_functions pljava_test pljava_uninstall
@@ -49,28 +50,36 @@ install-nar-snapshot:
4950

5051
build: install-nar-snapshot
5152
mvn clean install
52-
find $(PROJDIR)/pljava-so/target/nar/ -name "libpljava-so-$(PLJAVA_OSS_VERSION).so" -exec cp {} $(PROJDIR)/$(MODULE_big).so \;
53+
cp $(PROJDIR)/pljava-so/target/pljava-pgxs/libpljava-so-$(PLJAVA_OSS_VERSION).so $(PROJDIR)/$(MODULE_big).so
5354
cp $(PROJDIR)/pljava/target/pljava-$(PLJAVA_OSS_VERSION).jar $(PROJDIR)/target/pljava.jar
55+
cp $(PROJDIR)/pljava-api/target/pljava-api-$(PLJAVA_OSS_VERSION).jar $(PROJDIR)/target/pljava-api.jar
5456
cp $(PROJDIR)/pljava-examples/target/pljava-examples-$(PLJAVA_OSS_VERSION).jar $(PROJDIR)/target/examples.jar
5557

5658
installdirs:
5759
$(MKDIR_P) '$(PLJAVALIB)'
5860
$(MKDIR_P) '$(PLJAVADATA)'
5961
$(MKDIR_P) '$(PLJAVADATA)/docs'
6062
$(MKDIR_P) '$(PLJAVAEXT)'
63+
$(MKDIR_P) '$(PLJAVASYSCONF)'
6164

6265
install: installdirs install-lib
66+
$(INSTALL_PROGRAM) '$(PROJDIR)/pljava-so/target/pljava-pgxs/libpljava-so-$(PLJAVA_OSS_VERSION).so' '$(pkglibdir)/libpljava-so-$(PLJAVA_OSS_VERSION).so'
67+
$(INSTALL_DATA) '$(PROJDIR)/pljava/target/pljava-$(PLJAVA_OSS_VERSION).jar' '$(PLJAVADATA)/pljava-$(PLJAVA_OSS_VERSION).jar'
68+
$(INSTALL_DATA) '$(PROJDIR)/pljava-api/target/pljava-api-$(PLJAVA_OSS_VERSION).jar' '$(PLJAVADATA)/pljava-api-$(PLJAVA_OSS_VERSION).jar'
69+
$(INSTALL_DATA) '$(PROJDIR)/pljava-examples/target/pljava-examples-$(PLJAVA_OSS_VERSION).jar' '$(PLJAVADATA)/pljava-examples-$(PLJAVA_OSS_VERSION).jar'
6370
$(INSTALL_DATA) '$(PROJDIR)/pljava/target/pljava-$(PLJAVA_OSS_VERSION).jar' '$(PLJAVALIB)/pljava.jar'
71+
$(INSTALL_DATA) '$(PROJDIR)/pljava-api/target/pljava-api-$(PLJAVA_OSS_VERSION).jar' '$(PLJAVALIB)/pljava-api.jar'
6472
$(INSTALL_DATA) '$(PROJDIR)/pljava-examples/target/pljava-examples-$(PLJAVA_OSS_VERSION).jar' '$(PLJAVALIB)/examples.jar'
6573
$(INSTALL_DATA) '$(PROJDIR)/gpdb/installation/install.sql' '$(PLJAVADATA)'
6674
$(INSTALL_DATA) '$(PROJDIR)/gpdb/installation/uninstall.sql' '$(PLJAVADATA)'
6775
$(INSTALL_DATA) '$(PROJDIR)/gpdb/installation/install_pljavat.sql' '$(PLJAVADATA)'
6876
$(INSTALL_DATA) '$(PROJDIR)/gpdb/installation/uninstall_pljavat.sql' '$(PLJAVADATA)'
6977
$(INSTALL_DATA) '$(PROJDIR)/gpdb/installation/examples.sql' '$(PLJAVADATA)'
70-
$(INSTALL_DATA) '$(PROJDIR)/gpdb/installation/pljava--1.5.0.sql' '$(PLJAVAEXT)'
78+
$(INSTALL_DATA) '$(PROJDIR)/gpdb/installation/pljava--$(PLJAVA_OSS_VERSION).sql' '$(PLJAVADATA)'
7179
$(INSTALL_DATA) '$(PROJDIR)/gpdb/installation/pljava.control' '$(PLJAVAEXT)'
7280
$(INSTALL_DATA) '$(PROJDIR)/gpdb/installation/pljavat--1.5.0.sql' '$(PLJAVAEXT)'
7381
$(INSTALL_DATA) '$(PROJDIR)/gpdb/installation/pljavat.control' '$(PLJAVAEXT)'
82+
$(INSTALL_DATA) '$(PROJDIR)/pljava-packaging/target/classes/pljava.policy' '$(PLJAVASYSCONF)/pljava.policy'
7483
find $(PROJDIR)/docs -name "*.html" -exec $(INSTALL_DATA) {} '$(PLJAVADATA)/docs' \;
7584

7685
uninstall: uninstall-lib
@@ -82,7 +91,7 @@ test:
8291
echo 'host all pljava_test 0.0.0.0/0 trust # PLJAVA' >> $(MASTER_DATA_DIRECTORY)/pg_hba.conf
8392
echo 'local all pljava_test trust # PLJAVA' >> $(MASTER_DATA_DIRECTORY)/pg_hba.conf
8493
gpstop -u
85-
cd $(PROJDIR)/gpdb/tests && $(REGRESS_DIR)/src/test/regress/pg_regress --bindir=$(bindir) $(REGRESS_OPTS) $(REGRESS)
94+
cd $(PROJDIR)/gpdb/tests && $(REGRESS_DIR)/src/test/regress/pg_regress --bindir=$(bindir) $(REGRESS_OPTS) --prehook=pljava_examples $(REGRESS)
8695

8796
localconfig:
8897
gpconfig -c pljava_classpath -v $(PROJDIR)/target/

0 commit comments

Comments
 (0)