Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix dist_query dist_partial_agg on PG 15 #4964

Merged
merged 1 commit into from Nov 21, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/gh_matrix_builder.py
Expand Up @@ -155,7 +155,7 @@ def macos_config(overrides):
# below tests are tracked as part of #4972
"installcheck_args": "SKIPS='dist_move_chunk' "
# below tests are tracked as part of #4835
"IGNORES='telemetry_stats dist_query dist_partial_agg plan_hashagg partialize_finalize dist_fetcher_type "
"IGNORES='telemetry_stats plan_hashagg partialize_finalize dist_fetcher_type "
# below tests are tracked as part of #4837
"remote_txn'",
}
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/windows-build-and-test.yaml
Expand Up @@ -44,17 +44,19 @@ jobs:
os: [ windows-2022 ]
build_type: ${{ fromJson(needs.config.outputs.build_type) }}
ignores: ["chunk_adaptive metadata"]
tsl_ignores: ["compression_algos dist_partial_agg remote_connection"]
tsl_ignores: ["compression_algos remote_connection"]
tsl_skips: ["bgw_db_scheduler bgw_db_scheduler_fixed cagg_ddl_dist_ht data_fetcher dist_compression dist_move_chunk dist_remote_error remote_txn"]
pg_config: ["-cfsync=off -cstatement_timeout=60s"]
include:
- pg: 12
pkg_version: ${{ fromJson(needs.config.outputs.pg12_latest) }}.1
tsl_skips_version: dist_partial_agg-12
- pg: 13
pkg_version: ${{ fromJson(needs.config.outputs.pg13_latest) }}.1
tsl_skips_version: dist_grant-13
tsl_skips_version: dist_grant-13 dist_partial_agg-13
- pg: 14
pkg_version: ${{ fromJson(needs.config.outputs.pg14_latest) }}.1
tsl_skips_version: dist_partial_agg-14
env:
# PostgreSQL configuration
PGPORT: 55432
Expand Down
4 changes: 2 additions & 2 deletions CMakeLists.txt
Expand Up @@ -343,9 +343,9 @@ set(PG_VERSION "${PG_VERSION_MAJOR}.${PG_VERSION_MINOR}")
# Ensure that PostgreSQL version is supported and consistent with src/compat.h
# version check
if((${PG_VERSION_MAJOR} LESS "12")
OR (${PG_VERSION_MAJOR} GREATER "14")
OR (${PG_VERSION_MAJOR} GREATER "15")
AND NOT (${EXPERIMENTAL}))
message(FATAL_ERROR "TimescaleDB only supports PostgreSQL 12, 13 and 14")
message(FATAL_ERROR "TimescaleDB only supports PostgreSQL 12, 13, 14 and 15")
else()
message(STATUS "Compiling against PostgreSQL version ${PG_VERSION}")
endif()
Expand Down
Expand Up @@ -73,6 +73,7 @@ NOTICE: [db_dist_partial_agg_3]:

(1 row)

GRANT CREATE ON SCHEMA public TO :ROLE_1;
SET ROLE :ROLE_1;
SELECT table_name FROM create_distributed_hypertable( 'conditions', 'timec', 'location', 3, chunk_time_interval => INTERVAL '1 day');
table_name
Expand Down
601 changes: 601 additions & 0 deletions tsl/test/expected/dist_partial_agg-13.out

Large diffs are not rendered by default.

601 changes: 601 additions & 0 deletions tsl/test/expected/dist_partial_agg-14.out

Large diffs are not rendered by default.

625 changes: 625 additions & 0 deletions tsl/test/expected/dist_partial_agg-15.out

Large diffs are not rendered by default.

Expand Up @@ -51,6 +51,7 @@ FROM (
(3 rows)

GRANT USAGE ON FOREIGN SERVER :DATA_NODE_1, :DATA_NODE_2, :DATA_NODE_3 TO :ROLE_1;
GRANT CREATE ON SCHEMA public TO :ROLE_1;
SET ROLE :ROLE_1;
-- Create a "normal" PG table as reference, one two-dimensional
-- distributed hypertable, and a one-dimensional distributed
Expand Down Expand Up @@ -88,7 +89,7 @@ SELECT * FROM reference
WHERE time < '2019-01-02 05:10'::timestamptz
ORDER BY time;
SELECT * FROM set_number_partitions('hyper', 2);
psql:include/dist_query_load.sql:46: WARNING: insufficient number of partitions for dimension "device"
psql:include/dist_query_load.sql:47: WARNING: insufficient number of partitions for dimension "device"
set_number_partitions
-----------------------

Expand Down
5,951 changes: 5,951 additions & 0 deletions tsl/test/expected/dist_query-13.out

Large diffs are not rendered by default.

5,951 changes: 5,951 additions & 0 deletions tsl/test/expected/dist_query-14.out

Large diffs are not rendered by default.

6,085 changes: 6,085 additions & 0 deletions tsl/test/expected/dist_query-15.out

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions tsl/test/sql/.gitignore
Expand Up @@ -8,6 +8,7 @@
/compression_permissions-*.sql
/continuous_aggs-*.sql
/dist_grant-*.sql
/dist_query-*.sql
/dist_hypertable-*.sql
/dist_partial_agg-*.sql
/hypertable_distributed-*.sql
Expand Down
4 changes: 2 additions & 2 deletions tsl/test/sql/CMakeLists.txt
Expand Up @@ -85,9 +85,7 @@ if(CMAKE_BUILD_TYPE MATCHES Debug)
dist_copy_long.sql
dist_ddl.sql
dist_move_chunk.sql
dist_partial_agg.sql
dist_policy.sql
dist_query.sql
dist_util.sql
dist_triggers.sql
dist_backup.sql
Expand Down Expand Up @@ -162,6 +160,8 @@ if(CMAKE_BUILD_TYPE MATCHES Debug)
dist_hypertable.sql.in
remote_copy.sql.in
dist_grant.sql.in
dist_partial_agg.sql.in
dist_query.sql.in
cagg_invalidation_dist_ht.sql.in
continuous_aggs.sql.in)
endif(CMAKE_BUILD_TYPE MATCHES Debug)
Expand Down
Expand Up @@ -27,7 +27,7 @@ SELECT * FROM test.remote_exec('{ db_dist_partial_agg_1, db_dist_partial_agg_2,
$$
CREATE TYPE custom_type AS (high int, low int);
$$);

GRANT CREATE ON SCHEMA public TO :ROLE_1;
SET ROLE :ROLE_1;
SELECT table_name FROM create_distributed_hypertable( 'conditions', 'timec', 'location', 3, chunk_time_interval => INTERVAL '1 day');

Expand Down
File renamed without changes.
1 change: 1 addition & 0 deletions tsl/test/sql/include/dist_query_load.sql
Expand Up @@ -17,6 +17,7 @@ FROM (
) a;
GRANT USAGE ON FOREIGN SERVER :DATA_NODE_1, :DATA_NODE_2, :DATA_NODE_3 TO :ROLE_1;

GRANT CREATE ON SCHEMA public TO :ROLE_1;
SET ROLE :ROLE_1;

-- Create a "normal" PG table as reference, one two-dimensional
Expand Down