Merge remote-tracking branch 'upstream/BABEL_5_X_DEV' into JIRA-BABEL…

…-5479
babelfish-for-postgresql · Jan 18, 2025 · a9fc896 · a9fc896
2 parents c029fa1 + 70ce501
commit a9fc896
Show file tree

Hide file tree

Showing 109 changed files with 719 additions and 296 deletions.
diff --git a/.github/ISSUE_TEMPLATE/bug.yaml b/.github/ISSUE_TEMPLATE/bug.yaml
@@ -22,7 +22,8 @@ body:
       label: Version
       description: Which version of Babelfish are you running?
       options:
-        - BABEL_4_X_DEV (Default)
+        - BABEL_5_X_DEV (Default)
+        - BABEL_4_X_DEV
         - BABEL_3_X_DEV
         - BABEL_2_X_DEV
         - BABEL_1_X_DEV

diff --git a/.github/composite-actions/build-install-pgaudit-extension/action.yml b/.github/composite-actions/build-install-pgaudit-extension/action.yml
diff --git a/.github/composite-actions/minor-version-upgrade-util/action.yml b/.github/composite-actions/minor-version-upgrade-util/action.yml
@@ -81,7 +81,7 @@ runs:
         tar_dir: ${{ matrix.upgrade-path.last_version }}
       run: |
         cd test/JDBC/
-        export isUpgradeTestMode=false
+        export isUpgradeTestMode=true
         if [[ ${{ inputs.server_collation_name }} != "default" ]]; then
           export serverCollationName=${{ inputs.server_collation_name }}
         fi

diff --git a/.github/composite-actions/run-verify-tests/action.yml b/.github/composite-actions/run-verify-tests/action.yml
@@ -41,7 +41,7 @@ runs:
         touch dummy_schedule
         echo "all" > dummy_schedule
         export scheduleFile=dummy_schedule
-        export isUpgradeTestMode=false
+        export isUpgradeTestMode=true
         if [[ ${{ inputs.server_collation_name }} != "default" ]]; then
           export serverCollationName=${{ inputs.server_collation_name }}
         fi

diff --git a/.github/composite-actions/setup-base-version/action.yml b/.github/composite-actions/setup-base-version/action.yml
@@ -210,7 +210,7 @@ runs:
             exit 1
           fi
         done
-        export isUpgradeTestMode=false
+        export isUpgradeTestMode=true
         export inputFilesPath=input
         for filename in $(grep -v "^ignore.*\|^#.*\|^cmd.*\|^all.*\|^$" upgrade/$base_dir/schedule); do
           sed -i "s/\b$filename[ ]*\b$/$filename-vu-prepare/g" upgrade/$base_dir/schedule

diff --git a/.github/composite-actions/upload-coredump/action.yml b/.github/composite-actions/upload-coredump/action.yml
@@ -14,7 +14,7 @@ runs:
 
 
     - name: Upload Coredumps
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       if: always()
       with:
         name: coredumps

diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
@@ -119,28 +119,28 @@ jobs:
           lcov --list lcov.info
       - name: Upload Coverage Report for babelfishpg_tsql extension
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage_tsql_${{github.ref_name}}
           path: contrib/babelfishpg_tsql/coverage/
 
       - name: Upload Coverage Report for babelfishpg_tds extension
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage_tds_${{github.ref_name}}
           path: contrib/babelfishpg_tds/coverage/
 
       - name: Upload Coverage Report for babelfishpg_common extension
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage_common_${{github.ref_name}}
           path: contrib/babelfishpg_common/coverage/
 
       - name: Upload Coverage Report for babelfishpg_money extension
         if: always()
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage_money_${{github.ref_name}}
           path: contrib/babelfishpg_money/coverage/
@@ -163,7 +163,7 @@ jobs:
 
       - name: Upload CSV report with latest coverage numbers
         if: (github.event_name == 'schedule')
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: csv_${{github.ref_name}}
           path: contrib/${{github.ref_name}}.csv
diff --git a/.github/workflows/dotnet-tests.yml b/.github/workflows/dotnet-tests.yml
@@ -72,7 +72,7 @@ jobs:
 
       - name: Upload Coverage Report for Babelfish Extensions
         if: always() && steps.code-coverage-summary.outcome == 'success'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage-babelfish-extensions-dotnet
           path: contrib/dotnet-lcov.info

diff --git a/.github/workflows/isolation-tests.yml b/.github/workflows/isolation-tests.yml
@@ -105,7 +105,7 @@ jobs:
 
       - name: Upload Coverage Report for Babelfish Extensions
         if: always() && steps.code-coverage-summary.outcome == 'success'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage-babelfish-extensions-isolation
           path: contrib/isolation-lcov.info

diff --git a/.github/workflows/jdbc-tests-pgaudit-enable.yml b/.github/workflows/jdbc-tests-pgaudit-enable.yml
@@ -5,6 +5,10 @@ on:
 
 jobs:
   run-babelfish-jdbc-tests-with-pg-audit:
+    strategy:
+      matrix:
+        extension_branch: [BABEL_4_X_DEV,BABEL_5_X_DEV]
+
     env:
       INSTALL_DIR: psql
     runs-on: ubuntu-20.04
@@ -15,14 +19,28 @@ jobs:
       - name: Install Dependencies
         id: install-dependencies
         if: always()
-        uses: ./.github/composite-actions/install-dependencies
+        uses: ./.github/composite-actions/install-dependencies 
+
+      - name: Determine Engine Branch
+        id: determine-engine-branch
+        run: |
+          if [[ "${{ matrix.extension_branch }}" == "BABEL_4_X_DEV" ]]; then
+            echo "ENGINE_BRANCH=BABEL_4_X_DEV__PG_16_X" >> $GITHUB_OUTPUT
+          elif [[ "${{ matrix.extension_branch }}" == "BABEL_5_X_DEV" ]]; then
+            echo "ENGINE_BRANCH=BABEL_5_X_DEV__PG_17_X" >> $GITHUB_OUTPUT
+          elif [[ "${{ matrix.extension_branch }}" == "latest" ]]; then
+            echo "ENGINE_BRANCH=BABEL_5_X_DEV__PG_17_X" >> $GITHUB_OUTPUT
+          else
+            echo "ENGINE_BRANCH=main" >> $GITHUB_OUTPUT
+          fi
 
       - name: Build Modified Postgres
         id: build-modified-postgres
         if: always() && steps.install-dependencies.outcome == 'success'
         uses: ./.github/composite-actions/build-modified-postgres
         with:
           install_dir: 'psql'
+          engine_branch: ${{ steps.determine-engine-branch.outputs.ENGINE_BRANCH }}
 
       - name: Compile ANTLR
         id: compile-antlr
@@ -33,6 +51,9 @@ jobs:
         id: build-extensions
         if: always() && steps.compile-antlr.outcome == 'success'
         uses: ./.github/composite-actions/build-extensions
+        with:
+          extension_branch: ${{ matrix.extension_branch }}
+
 
       - name: Build tds_fdw Extension
         id: build-tds_fdw-extension
@@ -57,9 +78,36 @@ jobs:
           wal_level: logical
 
       - name: Build and Install PgAudit
-        uses: ./.github/composite-actions/build-install-pgaudit-extension
-        with:
-          install_dir: 'psql'
+        run: |
+          cd ~
+          rm -rf pgaudit
+          # Determine PgAudit version based on Babelfish branch
+          if [[ "${{ matrix.extension_branch }}" == 'BABEL_5_X_DEV' ]]; then
+            git clone --depth 1 --branch REL_17_STABLE https://github.com/pgaudit/pgaudit.git
+            cd pgaudit
+            # adding the patch to fix BABEL-4600 to test in Github
+            sed -i '1517 s/^        else$/        else if (auditEventStack != NULL)/' pgaudit.c
+            make install USE_PGXS=1 PG_CONFIG=~/psql/bin/pg_config 
+          elif [[ "${{ matrix.extension_branch }}" == 'BABEL_4_X_DEV' ]]; then
+            git clone --depth 1 --branch REL_16_STABLE https://github.com/pgaudit/pgaudit.git
+            cd pgaudit
+            # adding the patch to fix BABEL-4600 to test in Github
+            sed -i '1452 s/^        else$/        else if (auditEventStack != NULL)/' pgaudit.c
+            make install USE_PGXS=1 PG_CONFIG=~/psql/bin/pg_config 
+          else
+            echo "Unsupported branch: ${{ matrix.extension_branch }}"
+            exit 1 
+          fi
+          
+          cd ~/${{ env.INSTALL_DIR }}
+          sudo sed -i 's/^shared_preload_libraries .*$/shared_preload_libraries = '\''babelfishpg_tds, pg_stat_statements,pgaudit'\''/g' data/postgresql.conf
+          echo "everything set"
+
+          ~/${{ env.INSTALL_DIR }}/bin/pg_ctl -c -D ~/psql/data/ -l logfile restart
+          sudo PGPASSWORD=12345678 ~/${{ env.INSTALL_DIR }}/bin/psql -v ON_ERROR_STOP=1 -h localhost -d babelfish_db -U jdbc_user -c "CREATE EXTENSION pgaudit;"
+          sudo PGPASSWORD=12345678 ~/${{ env.INSTALL_DIR }}/bin/psql -v ON_ERROR_STOP=1 -h localhost -d babelfish_db -U jdbc_user -c "ALTER SYSTEM SET pgaudit.log = 'all';"
+
+        shell: bash
 
       - name: Ignore some JDBC files 
         run: |
@@ -120,7 +168,7 @@ jobs:
         if: always() && (steps.jdbc.outcome == 'failure' || steps.replication.outcome == 'failure')
         uses: actions/upload-artifact@v4
         with:
-          name: postgres-log-jdbc
+          name: postgres-log-jdbc-${{ matrix.extension_branch }}
           path: |
             ~/psql/data/logfile
             ~/psql/data_5433/logfile
@@ -144,7 +192,7 @@ jobs:
             mv $timestamp.diff ../replication-output-diff.diff
             mv "$timestamp"_runSummary.log ../replication-run-summary.log
 
-      - name: Upload Run Summary 
+      - name: Upload Run Summary-${{ matrix.extension_branch }}
         if: always() && steps.test-file-rename.outcome == 'success'
         uses: actions/upload-artifact@v4
         with:
@@ -153,7 +201,7 @@ jobs:
             test/JDBC/Info/run-summary.log
             test/JDBC/Info/replication-run-summary.log
 
-      - name: Upload Output Diff
+      - name: Upload Output Diff-${{ matrix.extension_branch }}
         if: always() && (steps.jdbc.outcome == 'failure' || steps.replication.outcome == 'failure')
         uses: actions/upload-artifact@v4
         with:
@@ -162,7 +210,7 @@ jobs:
             test/JDBC/Info/output-diff.diff
             test/JDBC/Info/replication-output-diff.diff
 
-      - name: Check and upload coredumps
+      - name: Check and upload coredumps-${{ matrix.extension_branch }}
         if: always() && (steps.jdbc.outcome == 'failure' || steps.replication.outcome == 'failure')
         uses: ./.github/composite-actions/upload-coredump
 
diff --git a/.github/workflows/jdbc-tests.yml b/.github/workflows/jdbc-tests.yml
@@ -167,7 +167,7 @@ jobs:
 
       - name: Upload Coverage Report for Babelfish Extensions
         if: always() && steps.code-coverage-summary.outcome == 'success'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage-babelfish-extensions-jdbc
           path: contrib/jdbc-lcov.info

diff --git a/.github/workflows/odbc-tests.yml b/.github/workflows/odbc-tests.yml
@@ -72,7 +72,7 @@ jobs:
 
       - name: Upload Coverage Report for Babelfish Extensions
         if: always() && steps.code-coverage-summary.outcome == 'success'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage-babelfish-extensions-odbc
           path: contrib/odbc-lcov.info

diff --git a/.github/workflows/pr-code-coverage.yml b/.github/workflows/pr-code-coverage.yml
@@ -37,31 +37,31 @@ jobs:
       run: |
         sudo apt-get install lcov
 
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       id: download-jdbc-coverage
       with:
         name:  coverage-babelfish-extensions-jdbc
         path: contrib/
 
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       id: download-dotnet-coverage
       with:
         name: coverage-babelfish-extensions-dotnet
         path: contrib/
 
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       id: download-odbc-coverage
       with:
         name: coverage-babelfish-extensions-odbc
         path: contrib/
 
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       id: download-python-coverage
       with:
         name: coverage-babelfish-extensions-python
         path: contrib/
 
-    - uses: actions/download-artifact@v3
+    - uses: actions/download-artifact@v4
       id: download-isolation-coverage
       with:
         name: coverage-babelfish-extensions-isolation

diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml
@@ -72,7 +72,7 @@ jobs:
 
       - name: Upload Coverage Report for Babelfish Extensions
         if: always() && steps.code-coverage-summary.outcome == 'success'
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage-babelfish-extensions-python
           path: contrib/python-lcov.info

diff --git a/contrib/babelfishpg_tds/src/backend/tds/tdsutils.c b/contrib/babelfishpg_tds/src/backend/tds/tdsutils.c
@@ -971,9 +971,9 @@ is_babelfish_role(const char *role)
 	if (OidIsValid(bbf_master_guest_oid)
 		&& OidIsValid(bbf_tempdb_guest_oid)
 		&& OidIsValid(bbf_msdb_guest_oid)
-		&& is_member_of_role(role_oid, bbf_master_guest_oid)
-		&& is_member_of_role(role_oid, bbf_tempdb_guest_oid)
-		&& is_member_of_role(role_oid, bbf_msdb_guest_oid))
+		&& (is_member_of_role(role_oid, bbf_master_guest_oid)
+		|| is_member_of_role(role_oid, bbf_tempdb_guest_oid)
+		|| is_member_of_role(role_oid, bbf_msdb_guest_oid)))
 		return true;
 
 	return false;
@@ -1242,7 +1242,7 @@ handle_grant_role(GrantRoleStmt *grant_stmt)
 			continue;
 
 		roleid = get_role_oid(rolename, false);
-		if (OidIsValid(roleid) && IS_DEFAULT_BBF_SERVER_ROLE(rolename))
+		if (OidIsValid(roleid) && is_babelfish_role(rolename))
 			check_babelfish_alterrole_restictions(false);
 	}
 
@@ -1254,7 +1254,7 @@ handle_grant_role(GrantRoleStmt *grant_stmt)
 		Oid			roleid;
 
 		roleid = get_rolespec_oid(rolespec, false);
-		if (OidIsValid(roleid) && IS_DEFAULT_BBF_SERVER_ROLE(rolespec->rolename))
+		if (OidIsValid(roleid) && is_babelfish_role(rolespec->rolename))
 			check_babelfish_alterrole_restictions(false);
 	}
 

diff --git a/contrib/babelfishpg_tds/src/include/tds_int.h b/contrib/babelfishpg_tds/src/include/tds_int.h
@@ -259,12 +259,6 @@ extern ProcessUtility_hook_type next_ProcessUtility;
 #define BABELFISH_SECURITYADMIN "securityadmin"
 #define BABELFISH_DBCREATOR "dbcreator"
 
-#define IS_DEFAULT_BBF_SERVER_ROLE(rolename) \
-	((strlen(rolename) == 13 && strncmp(rolename, BABELFISH_SECURITYADMIN, 13) == 0) || \
-	(strlen(rolename) == 14 && strncmp(rolename, BABELFISH_ROLE_ADMIN, 14) == 0) || \
-	(strlen(rolename) == 9 && strncmp(rolename, BABELFISH_DBCREATOR, 9) == 0) || \
-	(strlen(rolename) == 8 && strncmp(rolename, BABELFISH_SYSADMIN, 8) == 0))
-
 /* Functions in backend/tds/tdscomm.c */
 extern void TdsSetMessageType(uint8_t msgType);
 extern void TdsCommInit(uint32_t bufferSize,