From fe05c4e0a5ba39ec61be16fe1f57567e3fd274c3 Mon Sep 17 00:00:00 2001 From: Shard Gupta Date: Mon, 3 Mar 2025 05:47:45 +0000 Subject: [PATCH] Replace ucol_safeClone with ucol_clone as former has been deprecated Signed-off-by: Shard Gupta --- .github/workflows/code-coverage.yml | 2 +- .github/workflows/dotnet-tests.yml | 2 +- .github/workflows/isolation-tests.yml | 2 +- .github/workflows/jdbc-tests-db-collation.yml | 2 +- .github/workflows/jdbc-tests-pgaudit-enable.yml | 2 +- .github/workflows/jdbc-tests-single-db-mode.yml | 2 +- .../jdbc-tests-with-non-default-server-collation.yml | 2 +- .github/workflows/jdbc-tests-with-parallel-query.yml | 2 +- .github/workflows/jdbc-tests.yml | 2 +- .github/workflows/major-version-upgrade.yml | 2 +- .github/workflows/manual_tags.yml | 2 +- .github/workflows/minor-version-upgrade.yml | 2 +- .github/workflows/odbc-tests.yml | 2 +- .github/workflows/pg_dump-restore-test.yml | 4 ++-- .github/workflows/pr-code-coverage.yml | 2 +- .github/workflows/python-tests.yml | 2 +- .github/workflows/singledb-version-upgrade.yml | 2 +- .github/workflows/sql-validation-tests.yml | 2 +- .github/workflows/tap-tests.yml | 2 +- .github/workflows/unit-tests.yml | 2 +- .github/workflows/upgrade-test.yml | 4 ++-- contrib/babelfishpg_tsql/src/collation.c | 2 +- 22 files changed, 24 insertions(+), 24 deletions(-) diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml index f631383fa32..8fe391bf5b3 100644 --- a/.github/workflows/code-coverage.yml +++ b/.github/workflows/code-coverage.yml @@ -5,7 +5,7 @@ on: jobs: run-code-coverage-tests: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 env: INSTALL_DIR: psql steps: diff --git a/.github/workflows/dotnet-tests.yml b/.github/workflows/dotnet-tests.yml index 0e29dc600f1..16e7b417a61 100644 --- a/.github/workflows/dotnet-tests.yml +++ b/.github/workflows/dotnet-tests.yml @@ -3,7 +3,7 @@ on: [workflow_call] jobs: run-babelfish-dotnet-tests: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 id: checkout diff --git a/.github/workflows/isolation-tests.yml b/.github/workflows/isolation-tests.yml index a9f021a3820..fca4663c6cb 100644 --- a/.github/workflows/isolation-tests.yml +++ b/.github/workflows/isolation-tests.yml @@ -4,7 +4,7 @@ on: [workflow_call] jobs: isolation-tests: name: Isolation-Tests - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 id: checkout diff --git a/.github/workflows/jdbc-tests-db-collation.yml b/.github/workflows/jdbc-tests-db-collation.yml index 0009beee428..4354d60d228 100644 --- a/.github/workflows/jdbc-tests-db-collation.yml +++ b/.github/workflows/jdbc-tests-db-collation.yml @@ -6,7 +6,7 @@ jobs: env: INSTALL_DIR: psql DATABASE_COLLATION_NAME: bbf_unicode_cp1_ci_ai - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 id: checkout diff --git a/.github/workflows/jdbc-tests-pgaudit-enable.yml b/.github/workflows/jdbc-tests-pgaudit-enable.yml index 7bff03f4ea2..6fa9e14c0fb 100644 --- a/.github/workflows/jdbc-tests-pgaudit-enable.yml +++ b/.github/workflows/jdbc-tests-pgaudit-enable.yml @@ -11,7 +11,7 @@ jobs: env: INSTALL_DIR: psql - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 id: checkout diff --git a/.github/workflows/jdbc-tests-single-db-mode.yml b/.github/workflows/jdbc-tests-single-db-mode.yml index ff384174111..1660a96bba8 100644 --- a/.github/workflows/jdbc-tests-single-db-mode.yml +++ b/.github/workflows/jdbc-tests-single-db-mode.yml @@ -5,7 +5,7 @@ jobs: run-babelfish-jdbc-tests: env: INSTALL_DIR: psql - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 id: checkout diff --git a/.github/workflows/jdbc-tests-with-non-default-server-collation.yml b/.github/workflows/jdbc-tests-with-non-default-server-collation.yml index 1db3de3d984..1d092e1e128 100644 --- a/.github/workflows/jdbc-tests-with-non-default-server-collation.yml +++ b/.github/workflows/jdbc-tests-with-non-default-server-collation.yml @@ -7,7 +7,7 @@ jobs: INSTALL_DIR: psql SERVER_COLLATION_NAME: chinese_prc_ci_as - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 id: checkout diff --git a/.github/workflows/jdbc-tests-with-parallel-query.yml b/.github/workflows/jdbc-tests-with-parallel-query.yml index a9209fdd88d..055cdf5359c 100644 --- a/.github/workflows/jdbc-tests-with-parallel-query.yml +++ b/.github/workflows/jdbc-tests-with-parallel-query.yml @@ -5,7 +5,7 @@ jobs: run-babelfish-jdbc-tests-with-parallel-query-mode: env: INSTALL_DIR: psql - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 id: checkout diff --git a/.github/workflows/jdbc-tests.yml b/.github/workflows/jdbc-tests.yml index b70900d566e..34a2a23881e 100644 --- a/.github/workflows/jdbc-tests.yml +++ b/.github/workflows/jdbc-tests.yml @@ -5,7 +5,7 @@ jobs: run-babelfish-jdbc-tests: env: INSTALL_DIR: psql - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 id: checkout diff --git a/.github/workflows/major-version-upgrade.yml b/.github/workflows/major-version-upgrade.yml index f52bd534d40..8010fac9b86 100644 --- a/.github/workflows/major-version-upgrade.yml +++ b/.github/workflows/major-version-upgrade.yml @@ -9,7 +9,7 @@ jobs: ENGINE_BRANCH_FROM: BABEL_2_X_DEV__PG_14_X EXTENSION_BRANCH_FROM: BABEL_2_X_DEV - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/manual_tags.yml b/.github/workflows/manual_tags.yml index c8cf377b975..741a3ec8844 100644 --- a/.github/workflows/manual_tags.yml +++ b/.github/workflows/manual_tags.yml @@ -18,7 +18,7 @@ on: jobs: create_tag: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/minor-version-upgrade.yml b/.github/workflows/minor-version-upgrade.yml index 710ade30e73..4f7120bb06b 100644 --- a/.github/workflows/minor-version-upgrade.yml +++ b/.github/workflows/minor-version-upgrade.yml @@ -9,7 +9,7 @@ jobs: INSTALL_DIR: psql name: Build and test - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/odbc-tests.yml b/.github/workflows/odbc-tests.yml index 26b3f283bb5..46ac5fde6dd 100644 --- a/.github/workflows/odbc-tests.yml +++ b/.github/workflows/odbc-tests.yml @@ -3,7 +3,7 @@ on: [workflow_call] jobs: run-babelfish-odbc-tests: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 id: checkout diff --git a/.github/workflows/pg_dump-restore-test.yml b/.github/workflows/pg_dump-restore-test.yml index 5b59dc584ea..f9c7a45c2c5 100644 --- a/.github/workflows/pg_dump-restore-test.yml +++ b/.github/workflows/pg_dump-restore-test.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: generate-dump-restore-tests: name: Generate Dump/Restore Tests - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: dump-restore-path-list: ${{ steps.generate-dump-restore-path.outputs.dump-restore-path-list }} steps: @@ -32,7 +32,7 @@ jobs: matrix: upgrade-path: ${{ fromJson(needs.generate-dump-restore-tests.outputs.dump-restore-path-list) }} name: Dump Restore Test using ${{ matrix.upgrade-path.dump_method }} for ${{ matrix.upgrade-path.title }} - format=${{ matrix.upgrade-path.dump_format }} - type=${{ matrix.upgrade-path.type }} - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/pr-code-coverage.yml b/.github/workflows/pr-code-coverage.yml index 5fa0006c092..96f108f78bb 100644 --- a/.github/workflows/pr-code-coverage.yml +++ b/.github/workflows/pr-code-coverage.yml @@ -25,7 +25,7 @@ jobs: run-babelfish-code-coverage-for-pull_request: needs: [run-jdbc-tests, run-odbc-tests, run-dotnet-tests, run-python-tests, run-isolation-tests] - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/python-tests.yml b/.github/workflows/python-tests.yml index e7f06e54d5b..dc6ff6eb235 100644 --- a/.github/workflows/python-tests.yml +++ b/.github/workflows/python-tests.yml @@ -3,7 +3,7 @@ on: [workflow_call] jobs: run-babelfish-python-tests: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 id: checkout diff --git a/.github/workflows/singledb-version-upgrade.yml b/.github/workflows/singledb-version-upgrade.yml index 58d833296c5..a53487fdb1b 100644 --- a/.github/workflows/singledb-version-upgrade.yml +++ b/.github/workflows/singledb-version-upgrade.yml @@ -10,7 +10,7 @@ jobs: ENGINE_BRANCH_FROM: BABEL_2_X_DEV__PG_14_X EXTENSION_BRANCH_FROM: BABEL_2_X_DEV - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 diff --git a/.github/workflows/sql-validation-tests.yml b/.github/workflows/sql-validation-tests.yml index ba69b9194df..a86a7d00f12 100644 --- a/.github/workflows/sql-validation-tests.yml +++ b/.github/workflows/sql-validation-tests.yml @@ -3,7 +3,7 @@ on: [push, pull_request] jobs: run-sql-validation-tests: - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 id: checkout diff --git a/.github/workflows/tap-tests.yml b/.github/workflows/tap-tests.yml index b1e31ae583d..e8564dd1bb7 100644 --- a/.github/workflows/tap-tests.yml +++ b/.github/workflows/tap-tests.yml @@ -11,7 +11,7 @@ jobs: INSTALL_DIR_16: psql16 ENGINE_BRANCH_16: BABEL_4_X_DEV__PG_16_X - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 id: checkout diff --git a/.github/workflows/unit-tests.yml b/.github/workflows/unit-tests.yml index 210f6f7c8c9..517dfc7d1f2 100644 --- a/.github/workflows/unit-tests.yml +++ b/.github/workflows/unit-tests.yml @@ -5,7 +5,7 @@ jobs: run-babelfish-unit-tests: env: INSTALL_DIR: psql - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 id: checkout diff --git a/.github/workflows/upgrade-test.yml b/.github/workflows/upgrade-test.yml index 20e8fb71b1a..d48b6643860 100644 --- a/.github/workflows/upgrade-test.yml +++ b/.github/workflows/upgrade-test.yml @@ -4,7 +4,7 @@ on: [push, pull_request] jobs: generate-version-upgrade-tests: name: Generate Version Upgrade Tests - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 outputs: upgrade-path-list: ${{ steps.generate-upgrade-path.outputs.upgrade-path-list }} steps: @@ -25,7 +25,7 @@ jobs: matrix: upgrade-path: ${{ fromJson(needs.generate-version-upgrade-tests.outputs.upgrade-path-list) }} name: Run Version Upgrade Test for ${{ matrix.upgrade-path.title }} - runs-on: ubuntu-latest + runs-on: ubuntu-22.04 steps: - uses: actions/checkout@v2 diff --git a/contrib/babelfishpg_tsql/src/collation.c b/contrib/babelfishpg_tsql/src/collation.c index 44bda8ecdf8..62168656adf 100644 --- a/contrib/babelfishpg_tsql/src/collation.c +++ b/contrib/babelfishpg_tsql/src/collation.c @@ -1485,7 +1485,7 @@ icu_compare_utf8_coll(UCollator *coll, UChar *uchar1, int32_t ulen1, if (is_cs_ai_range_cmp) { - collator = ucol_safeClone(coll, NULL, NULL, &status); + collator = ucol_clone(coll, &status); if (U_FAILURE(status)) ereport(ERROR,