mirror of https://github.com/citusdata/citus.git
Merge branch 'release-13.0' into release-13.0
commit
bfe58a663f
|
@ -39,7 +39,7 @@ jobs:
|
||||||
run: echo 'noop'
|
run: echo 'noop'
|
||||||
check-sql-snapshots:
|
check-sql-snapshots:
|
||||||
needs: params
|
needs: params
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-latest
|
||||||
container:
|
container:
|
||||||
image: ${{ needs.params.outputs.build_image_name }}:${{ needs.params.outputs.sql_snapshot_pg_version }}${{ needs.params.outputs.image_suffix }}
|
image: ${{ needs.params.outputs.build_image_name }}:${{ needs.params.outputs.sql_snapshot_pg_version }}${{ needs.params.outputs.image_suffix }}
|
||||||
options: --user root
|
options: --user root
|
||||||
|
@ -51,7 +51,7 @@ jobs:
|
||||||
ci/check_sql_snapshots.sh
|
ci/check_sql_snapshots.sh
|
||||||
check-style:
|
check-style:
|
||||||
needs: params
|
needs: params
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-latest
|
||||||
container:
|
container:
|
||||||
image: ${{ needs.params.outputs.style_checker_image_name }}:${{ needs.params.outputs.style_checker_tools_version }}${{ needs.params.outputs.image_suffix }}
|
image: ${{ needs.params.outputs.style_checker_image_name }}:${{ needs.params.outputs.style_checker_tools_version }}${{ needs.params.outputs.image_suffix }}
|
||||||
steps:
|
steps:
|
||||||
|
@ -109,7 +109,7 @@ jobs:
|
||||||
- ${{ needs.params.outputs.pg15_version }}
|
- ${{ needs.params.outputs.pg15_version }}
|
||||||
- ${{ needs.params.outputs.pg16_version }}
|
- ${{ needs.params.outputs.pg16_version }}
|
||||||
- ${{ needs.params.outputs.pg17_version }}
|
- ${{ needs.params.outputs.pg17_version }}
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-latest
|
||||||
container:
|
container:
|
||||||
image: "${{ matrix.image_name }}:${{ fromJson(matrix.pg_version).full }}${{ matrix.image_suffix }}"
|
image: "${{ matrix.image_name }}:${{ fromJson(matrix.pg_version).full }}${{ matrix.image_suffix }}"
|
||||||
options: --user root
|
options: --user root
|
||||||
|
@ -217,7 +217,7 @@ jobs:
|
||||||
pg_version: ${{ needs.params.outputs.pg17_version }}
|
pg_version: ${{ needs.params.outputs.pg17_version }}
|
||||||
suite: regress
|
suite: regress
|
||||||
image_name: ${{ needs.params.outputs.fail_test_image_name }}
|
image_name: ${{ needs.params.outputs.fail_test_image_name }}
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-latest
|
||||||
container:
|
container:
|
||||||
image: "${{ matrix.image_name }}:${{ fromJson(matrix.pg_version).full }}${{ needs.params.outputs.image_suffix }}"
|
image: "${{ matrix.image_name }}:${{ fromJson(matrix.pg_version).full }}${{ needs.params.outputs.image_suffix }}"
|
||||||
options: --user root --dns=8.8.8.8
|
options: --user root --dns=8.8.8.8
|
||||||
|
@ -293,7 +293,7 @@ jobs:
|
||||||
codecov_token: ${{ secrets.CODECOV_TOKEN }}
|
codecov_token: ${{ secrets.CODECOV_TOKEN }}
|
||||||
test-pg-upgrade:
|
test-pg-upgrade:
|
||||||
name: PG${{ matrix.old_pg_major }}-PG${{ matrix.new_pg_major }} - check-pg-upgrade
|
name: PG${{ matrix.old_pg_major }}-PG${{ matrix.new_pg_major }} - check-pg-upgrade
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-latest
|
||||||
container:
|
container:
|
||||||
image: "${{ needs.params.outputs.pgupgrade_image_name }}:${{ needs.params.outputs.upgrade_pg_versions }}${{ needs.params.outputs.image_suffix }}"
|
image: "${{ needs.params.outputs.pgupgrade_image_name }}:${{ needs.params.outputs.upgrade_pg_versions }}${{ needs.params.outputs.image_suffix }}"
|
||||||
options: --user root
|
options: --user root
|
||||||
|
@ -346,7 +346,7 @@ jobs:
|
||||||
codecov_token: ${{ secrets.CODECOV_TOKEN }}
|
codecov_token: ${{ secrets.CODECOV_TOKEN }}
|
||||||
test-citus-upgrade:
|
test-citus-upgrade:
|
||||||
name: PG${{ fromJson(needs.params.outputs.pg15_version).major }} - check-citus-upgrade
|
name: PG${{ fromJson(needs.params.outputs.pg15_version).major }} - check-citus-upgrade
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-latest
|
||||||
container:
|
container:
|
||||||
image: "${{ needs.params.outputs.citusupgrade_image_name }}:${{ fromJson(needs.params.outputs.pg15_version).full }}${{ needs.params.outputs.image_suffix_citus_upgrade }}"
|
image: "${{ needs.params.outputs.citusupgrade_image_name }}:${{ fromJson(needs.params.outputs.pg15_version).full }}${{ needs.params.outputs.image_suffix_citus_upgrade }}"
|
||||||
options: --user root
|
options: --user root
|
||||||
|
@ -395,7 +395,7 @@ jobs:
|
||||||
if: always()
|
if: always()
|
||||||
env:
|
env:
|
||||||
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
|
CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-latest
|
||||||
container:
|
container:
|
||||||
image: ${{ needs.params.outputs.test_image_name }}:${{ fromJson(needs.params.outputs.pg17_version).full }}${{ needs.params.outputs.image_suffix }}
|
image: ${{ needs.params.outputs.test_image_name }}:${{ fromJson(needs.params.outputs.pg17_version).full }}${{ needs.params.outputs.image_suffix }}
|
||||||
needs:
|
needs:
|
||||||
|
@ -417,7 +417,7 @@ jobs:
|
||||||
ch_benchmark:
|
ch_benchmark:
|
||||||
name: CH Benchmark
|
name: CH Benchmark
|
||||||
if: startsWith(github.ref, 'refs/heads/ch_benchmark/')
|
if: startsWith(github.ref, 'refs/heads/ch_benchmark/')
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-latest
|
||||||
needs:
|
needs:
|
||||||
- build
|
- build
|
||||||
steps:
|
steps:
|
||||||
|
@ -435,7 +435,7 @@ jobs:
|
||||||
tpcc_benchmark:
|
tpcc_benchmark:
|
||||||
name: TPCC Benchmark
|
name: TPCC Benchmark
|
||||||
if: startsWith(github.ref, 'refs/heads/tpcc_benchmark/')
|
if: startsWith(github.ref, 'refs/heads/tpcc_benchmark/')
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-latest
|
||||||
needs:
|
needs:
|
||||||
- build
|
- build
|
||||||
steps:
|
steps:
|
||||||
|
@ -454,7 +454,7 @@ jobs:
|
||||||
name: Parallel 32
|
name: Parallel 32
|
||||||
if: ${{ needs.test-flakyness-pre.outputs.tests != ''}}
|
if: ${{ needs.test-flakyness-pre.outputs.tests != ''}}
|
||||||
needs: test-flakyness-pre
|
needs: test-flakyness-pre
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-latest
|
||||||
outputs:
|
outputs:
|
||||||
json: ${{ steps.parallelization.outputs.json }}
|
json: ${{ steps.parallelization.outputs.json }}
|
||||||
steps:
|
steps:
|
||||||
|
@ -466,7 +466,7 @@ jobs:
|
||||||
test-flakyness-pre:
|
test-flakyness-pre:
|
||||||
name: Detect regression tests need to be ran
|
name: Detect regression tests need to be ran
|
||||||
if: ${{ !inputs.skip_test_flakyness }}}
|
if: ${{ !inputs.skip_test_flakyness }}}
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-latest
|
||||||
needs: build
|
needs: build
|
||||||
outputs:
|
outputs:
|
||||||
tests: ${{ steps.detect-regression-tests.outputs.tests }}
|
tests: ${{ steps.detect-regression-tests.outputs.tests }}
|
||||||
|
@ -491,7 +491,7 @@ jobs:
|
||||||
test-flakyness:
|
test-flakyness:
|
||||||
if: false
|
if: false
|
||||||
name: Test flakyness
|
name: Test flakyness
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-latest
|
||||||
container:
|
container:
|
||||||
image: ${{ needs.params.outputs.fail_test_image_name }}:${{ needs.params.outputs.pg17_version }}${{ needs.params.outputs.image_suffix }}
|
image: ${{ needs.params.outputs.fail_test_image_name }}:${{ needs.params.outputs.pg17_version }}${{ needs.params.outputs.image_suffix }}
|
||||||
options: --user root
|
options: --user root
|
||||||
|
|
|
@ -2955,6 +2955,8 @@ CreateBackgroundJob(const char *jobType, const char *description)
|
||||||
/* insert new job */
|
/* insert new job */
|
||||||
Datum values[Natts_pg_dist_background_job] = { 0 };
|
Datum values[Natts_pg_dist_background_job] = { 0 };
|
||||||
bool isnull[Natts_pg_dist_background_job] = { 0 };
|
bool isnull[Natts_pg_dist_background_job] = { 0 };
|
||||||
|
|
||||||
|
NameData jobTypeName = { 0 };
|
||||||
memset(isnull, true, sizeof(isnull));
|
memset(isnull, true, sizeof(isnull));
|
||||||
|
|
||||||
int64 jobId = GetNextBackgroundJobsJobId();
|
int64 jobId = GetNextBackgroundJobsJobId();
|
||||||
|
@ -2967,7 +2969,6 @@ CreateBackgroundJob(const char *jobType, const char *description)
|
||||||
|
|
||||||
if (jobType)
|
if (jobType)
|
||||||
{
|
{
|
||||||
NameData jobTypeName = { 0 };
|
|
||||||
namestrcpy(&jobTypeName, jobType);
|
namestrcpy(&jobTypeName, jobType);
|
||||||
InitFieldValue(Anum_pg_dist_background_job_job_type, values, isnull,
|
InitFieldValue(Anum_pg_dist_background_job_job_type, values, isnull,
|
||||||
NameGetDatum(&jobTypeName));
|
NameGetDatum(&jobTypeName));
|
||||||
|
|
|
@ -2548,21 +2548,20 @@ HasUnresolvedExternParamsWalker(Node *expression, ParamListInfo boundParams)
|
||||||
/* check whether parameter is available (and valid) */
|
/* check whether parameter is available (and valid) */
|
||||||
if (boundParams && paramId > 0 && paramId <= boundParams->numParams)
|
if (boundParams && paramId > 0 && paramId <= boundParams->numParams)
|
||||||
{
|
{
|
||||||
ParamExternData *externParam = NULL;
|
Oid paramType = InvalidOid;
|
||||||
|
|
||||||
/* give hook a chance in case parameter is dynamic */
|
/* give hook a chance in case parameter is dynamic */
|
||||||
if (boundParams->paramFetch != NULL)
|
if (boundParams->paramFetch != NULL)
|
||||||
{
|
{
|
||||||
ParamExternData externParamPlaceholder;
|
ParamExternData externParamPlaceholder;
|
||||||
externParam = (*boundParams->paramFetch)(boundParams, paramId, false,
|
paramType = (*boundParams->paramFetch)(boundParams, paramId, false,
|
||||||
&externParamPlaceholder);
|
&externParamPlaceholder)->ptype;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
externParam = &boundParams->params[paramId - 1];
|
paramType = boundParams->params[paramId - 1].ptype;
|
||||||
}
|
}
|
||||||
|
|
||||||
Oid paramType = externParam->ptype;
|
|
||||||
if (OidIsValid(paramType))
|
if (OidIsValid(paramType))
|
||||||
{
|
{
|
||||||
return false;
|
return false;
|
||||||
|
|
Loading…
Reference in New Issue