Merge branch 'adb-7.2.0' into ADBDEV-5496

arenadata · Jan 9, 2025 · 38df48e · 38df48e
2 parents d71ab9e + 4b791e6
commit 38df48e
Show file tree

Hide file tree

Showing 808 changed files with 3,191 additions and 90,835 deletions.
diff --git a/README.md b/README.md
@@ -179,12 +179,6 @@ throughout the codebase, but a few larger additions worth noting:
   manual is maintained separately and only the reference pages used
   to build man pages are here.
 
-* __gpdb-doc/__
-
-  Contains the Greenplum documentation in DITA XML format. Refer to
-  `gpdb-doc/README.md` for information on how to build, and work with
-  the documentation.
-
 * __ci/__
 
   Contains configuration files for the GPDB continuous integration system.

diff --git a/arenadata/Dockerfile b/arenadata/Dockerfile
@@ -19,10 +19,12 @@ RUN dnf makecache && \
     dnf -y install perl-IPC-Run perl-Test-Base libxslt-devel openldap-devel && \
     dnf -y install python3.11-psycopg2 python3.11-pyyaml python3.11-lxml python3.11-pip && \
     dnf -y install llvm-devel-17.0.6 clang-17.0.6 && \
+    dnf -y install protobuf-compiler && \
     dnf clean all && \
     #we install pytest from pypi since the version from the repository does not contain an executable file
     #the rest of the packages are not available in the repository.
-    pip3 install pytest gsutil behave~=1.2.6 coverage~=4.5 'mock<=5.0.0' allure-behave psutil
+    pip3 install pytest gsutil behave~=1.2.6 coverage~=4.5 'mock<=5.0.0' allure-behave psutil && \
+    pip3 install protobuf==3.20.0
 
 # setup ssh configuration
 RUN ssh-keygen -f /etc/ssh/ssh_host_rsa_key -N '' -t rsa && \

diff --git a/arenadata/Dockerfile.ubuntu b/arenadata/Dockerfile.ubuntu
@@ -14,8 +14,9 @@ RUN set -eux; \
     echo 'precedence ::ffff:0:0/96  100' >> /etc/gai.conf; \
 # Packages for tests
     apt install -y rsync iproute2 fakeroot lsof sudo python3.11 python3.11-dev openjdk-17-jdk libipc-run-perl; \
+    apt install -y protobuf-compiler; \
 # Install allure-behave for behave tests
-    pip3 install pytest gsutil behave~=1.2.6 coverage~=4.5 'mock<=5.0.0' allure-behave==2.4.0; \
+    pip3 install pytest gsutil behave~=1.2.6 coverage~=4.5 'mock<=5.0.0' allure-behave==2.4.0 protobuf==3.20.0; \
     pip3 cache purge
 
 WORKDIR /home/gpadmin

diff --git a/concourse/pipelines/gpdb_main-generated.yml b/concourse/pipelines/gpdb_main-generated.yml
@@ -390,7 +390,6 @@ resources:
     branch: ((gpdb-git-branch))
     uri: ((gpdb-git-remote))
     ignore_paths:
-    - gpdb-doc/*
     - README*
 
 - name: filedump_src

diff --git a/concourse/pipelines/pr_pipeline.yml b/concourse/pipelines/pr_pipeline.yml
@@ -22,7 +22,6 @@ resources:
     access_token: ((gpdb-git-access-token))
     disable_forks: true
     ignore_paths:
-    - gpdb-doc/*
     - README*
 
 - name: gpdb7-rocky8-build

diff --git a/concourse/pipelines/templates/gpdb-tpl.yml b/concourse/pipelines/templates/gpdb-tpl.yml
@@ -419,7 +419,6 @@ resources:
     branch: ((gpdb-git-branch))
     uri: ((gpdb-git-remote))
     ignore_paths:
-    - gpdb-doc/*
     - README*
 
 {% if "icw" in test_sections %}

diff --git a/contrib/tablefunc/Makefile b/contrib/tablefunc/Makefile
@@ -3,7 +3,8 @@
 MODULES = tablefunc
 
 EXTENSION = tablefunc
-DATA = tablefunc--1.0.sql tablefunc--unpackaged--1.0.sql
+DATA = tablefunc--1.0.sql tablefunc--unpackaged--1.0.sql \
+       tablefunc--1.0--1.1.sql
 
 REGRESS = tablefunc
 REGRESS_OPTS += --init-file=$(top_srcdir)/src/test/regress/init_file

diff --git a/contrib/tablefunc/data/ctas.data b/contrib/tablefunc/data/ctas.data
@@ -0,0 +1,7 @@
+row1	extra1	att1	val1
+row1	extra1	att2	val2
+row1	extra1	att4	val4
+row2	extra2	att1	val5
+row2	extra2	att2	val6
+row2	extra2	att3	val7
+row2	extra2	att4	val8