external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into gokhangulbiz/tenant-stats-perf-improvements

pull/6868/head
Gokhan Gulbiz 2023-05-09 16:44:44 +03:00
parent 7649b9dfff e3c6b8a10e
commit 301c258849
No known key found for this signature in database
GPG Key ID: 608EF06B6BD1B45B
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/test/regress/bin/normalize.sed
View File

@ -309,3 +309,6 @@ s/(NOTICE: issuing SET LOCAL application_name TO 'citus_rebalancer gpid=)[0-9]+
s/improvement of 0.1[0-9]* is lower/improvement of 0.1xxxxx is lower/g s/improvement of 0.1[0-9]* is lower/improvement of 0.1xxxxx is lower/g
# normalize tenants statistics annotations # normalize tenants statistics annotations
s/\/\*\{"tId":.*\*\///g s/\/\*\{"tId":.*\*\///g
# Notice message that contains current columnar version that makes it harder to bump versions
s/(NOTICE: issuing CREATE EXTENSION IF NOT EXISTS citus_columnar WITH SCHEMA pg_catalog VERSION )"[0-9]+\.[0-9]+-[0-9]+"/\1 "x.y-z"/

2
src/test/regress/expected/columnar_permissions.out
View File

@ -123,7 +123,7 @@ select relation, stripe_num, row_count, first_row_number
select relation, stripe_num, attr_num, chunk_group_num, value_count select relation, stripe_num, attr_num, chunk_group_num, value_count
from columnar.chunk from columnar.chunk
where relation in ('no_access'::regclass, 'columnar_permissions'::regclass) where relation in ('no_access'::regclass, 'columnar_permissions'::regclass)
order by relation, stripe_num; order by relation, stripe_num, attr_num;
relation | stripe_num | attr_num | chunk_group_num | value_count relation | stripe_num | attr_num | chunk_group_num | value_count
--------------------------------------------------------------------- ---------------------------------------------------------------------
no_access | 1 | 1 | 0 | 1 no_access | 1 | 1 | 0 | 1

4
src/test/regress/expected/multi_fix_partition_shard_index_names.out
View File

@ -650,7 +650,7 @@ NOTICE: issuing BEGIN TRANSACTION ISOLATION LEVEL READ COMMITTED;SELECT assign_
DETAIL: on server postgres@localhost:xxxxx connectionId: xxxxxxx DETAIL: on server postgres@localhost:xxxxx connectionId: xxxxxxx
NOTICE: issuing SET citus.enable_ddl_propagation TO 'off' NOTICE: issuing SET citus.enable_ddl_propagation TO 'off'
DETAIL: on server postgres@localhost:xxxxx connectionId: xxxxxxx DETAIL: on server postgres@localhost:xxxxx connectionId: xxxxxxx
NOTICE: issuing CREATE EXTENSION IF NOT EXISTS citus_columnar WITH SCHEMA pg_catalog VERSION "11.3-1"; NOTICE: issuing CREATE EXTENSION IF NOT EXISTS citus_columnar WITH SCHEMA pg_catalog VERSION "x.y-z";
DETAIL: on server postgres@localhost:xxxxx connectionId: xxxxxxx DETAIL: on server postgres@localhost:xxxxx connectionId: xxxxxxx
NOTICE: issuing COMMIT NOTICE: issuing COMMIT
DETAIL: on server postgres@localhost:xxxxx connectionId: xxxxxxx DETAIL: on server postgres@localhost:xxxxx connectionId: xxxxxxx
@ -658,7 +658,7 @@ NOTICE: issuing BEGIN TRANSACTION ISOLATION LEVEL READ COMMITTED;SELECT assign_
DETAIL: on server postgres@localhost:xxxxx connectionId: xxxxxxx DETAIL: on server postgres@localhost:xxxxx connectionId: xxxxxxx
NOTICE: issuing SET citus.enable_ddl_propagation TO 'off' NOTICE: issuing SET citus.enable_ddl_propagation TO 'off'
DETAIL: on server postgres@localhost:xxxxx connectionId: xxxxxxx DETAIL: on server postgres@localhost:xxxxx connectionId: xxxxxxx
NOTICE: issuing CREATE EXTENSION IF NOT EXISTS citus_columnar WITH SCHEMA pg_catalog VERSION "11.3-1"; NOTICE: issuing CREATE EXTENSION IF NOT EXISTS citus_columnar WITH SCHEMA pg_catalog VERSION "x.y-z";
DETAIL: on server postgres@localhost:xxxxx connectionId: xxxxxxx DETAIL: on server postgres@localhost:xxxxx connectionId: xxxxxxx
NOTICE: issuing COMMIT NOTICE: issuing COMMIT
DETAIL: on server postgres@localhost:xxxxx connectionId: xxxxxxx DETAIL: on server postgres@localhost:xxxxx connectionId: xxxxxxx

2
src/test/regress/sql/columnar_permissions.sql
View File

@ -75,7 +75,7 @@ select relation, stripe_num, row_count, first_row_number
select relation, stripe_num, attr_num, chunk_group_num, value_count select relation, stripe_num, attr_num, chunk_group_num, value_count
from columnar.chunk from columnar.chunk
where relation in ('no_access'::regclass, 'columnar_permissions'::regclass) where relation in ('no_access'::regclass, 'columnar_permissions'::regclass)
order by relation, stripe_num; order by relation, stripe_num, attr_num;
select relation, stripe_num, chunk_group_num, row_count select relation, stripe_num, chunk_group_num, row_count
from columnar.chunk_group from columnar.chunk_group
where relation in ('no_access'::regclass, 'columnar_permissions'::regclass) where relation in ('no_access'::regclass, 'columnar_permissions'::regclass)