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

Merge pull request #4702 from citusdata/metadata_changes 

Move stripe.chunk_count to last position
pull/4685/head
Hadi Moshayedi 2021-02-11 21:06:57 -08:00 committed by GitHub
parent 1c4081ea5f e690d8b79b
commit 0f613ac31c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 49 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/backend/columnar/cstore_metadata_tables.c
View File

@ -139,9 +139,9 @@ typedef FormData_columnar_options *Form_columnar_options;
#define Anum_columnar_stripe_file_offset 3
#define Anum_columnar_stripe_data_length 4
#define Anum_columnar_stripe_column_count 5
#define Anum_columnar_stripe_chunk_count 6
#define Anum_columnar_stripe_chunk_row_count 7
#define Anum_columnar_stripe_row_count 8
#define Anum_columnar_stripe_chunk_row_count 6
#define Anum_columnar_stripe_row_count 7
#define Anum_columnar_stripe_chunk_count 8
/* constants for columnar.chunk_group */
#define Natts_columnar_chunkgroup 4
@ -633,9 +633,9 @@ InsertStripeMetadataRow(uint64 storageId, StripeMetadata *stripe)
Int64GetDatum(stripe->fileOffset),
Int64GetDatum(stripe->dataLength),
Int32GetDatum(stripe->columnCount),
Int32GetDatum(stripe->chunkCount),
Int32GetDatum(stripe->chunkRowCount),
Int64GetDatum(stripe->rowCount)
Int64GetDatum(stripe->rowCount),
Int32GetDatum(stripe->chunkCount)
};
Oid columnarStripesOid = ColumnarStripeRelationId();

2
src/backend/columnar/sql/columnar--9.5-1--10.0-1.sql
View File

@ -21,9 +21,9 @@ CREATE TABLE stripe (
file_offset bigint NOT NULL,
data_length bigint NOT NULL,
column_count int NOT NULL,
chunk_count int NOT NULL,
chunk_row_count int NOT NULL,
row_count bigint NOT NULL,
chunk_group_count int NOT NULL,
PRIMARY KEY (storage_id, stripe_num)
) WITH (user_catalog_table = true);

12
src/test/regress/expected/am_create.out
View File

@ -55,5 +55,15 @@ WITH a as (
), c as (
(TABLE a EXCEPT TABLE b) UNION (TABLE b EXCEPT TABLE a) UNION
(TABLE a EXCEPT TABLE columnar.chunk_group) UNION (TABLE columnar.chunk_group EXCEPT TABLE a)
), d as (
SELECT storage_id, stripe_num, count(*) as chunk_group_count
FROM columnar.chunk_group
GROUP BY 1,2
), e as (
SELECT storage_id, stripe_num, chunk_group_count
FROM columnar.stripe
), f as (
(TABLE d EXCEPT TABLE d) UNION (TABLE e EXCEPT TABLE d)
)
SELECT count(*) = 0 AS consistent FROM c;
SELECT (SELECT count(*) = 0 FROM c) AND
(SELECT count(*) = 0 FROM f) as consistent;

38
src/test/regress/expected/am_insert.out
View File

@ -173,16 +173,16 @@ INSERT INTO zero_col_heap SELECT * FROM zero_col_heap;
INSERT INTO zero_col_heap SELECT * FROM zero_col_heap;
INSERT INTO zero_col_heap SELECT * FROM zero_col_heap;
INSERT INTO zero_col SELECT * FROM zero_col_heap;
SELECT relname, stripe_num, row_count FROM columnar.stripe a, pg_class b
SELECT relname, stripe_num, chunk_group_count, row_count FROM columnar.stripe a, pg_class b
WHERE columnar_relation_storageid(b.oid)=a.storage_id AND relname = 'zero_col'
ORDER BY 1,2,3;
relname | stripe_num | row_count
ORDER BY 1,2,3,4;
relname | stripe_num | chunk_group_count | row_count
---------------------------------------------------------------------
zero_col | 1 | 1
zero_col | 2 | 1
zero_col | 3 | 1
zero_col | 4 | 1
zero_col | 5 | 64
zero_col | 1 | 1 | 1
zero_col | 2 | 1 | 1
zero_col | 3 | 1 | 1
zero_col | 4 | 1 | 1
zero_col | 5 | 7 | 64
(5 rows)
SELECT relname, stripe_num, value_count FROM columnar.chunk a, pg_class b
@ -197,17 +197,17 @@ WHERE columnar_relation_storageid(b.oid)=a.storage_id AND relname = 'zero_col'
ORDER BY 1,2,3,4;
relname | stripe_num | chunk_group_num | row_count
---------------------------------------------------------------------
zero_col | 1 | 0 | 1
zero_col | 2 | 0 | 1
zero_col | 3 | 0 | 1
zero_col | 4 | 0 | 1
zero_col | 5 | 0 | 10
zero_col | 5 | 1 | 10
zero_col | 5 | 2 | 10
zero_col | 5 | 3 | 10
zero_col | 5 | 4 | 10
zero_col | 5 | 5 | 10
zero_col | 5 | 6 | 4
zero_col | 1 | 0 | 1
zero_col | 2 | 0 | 1
zero_col | 3 | 0 | 1
zero_col | 4 | 0 | 1
zero_col | 5 | 0 | 10
zero_col | 5 | 1 | 10
zero_col | 5 | 2 | 10
zero_col | 5 | 3 | 10
zero_col | 5 | 4 | 10
zero_col | 5 | 5 | 10
zero_col | 5 | 6 | 4
(11 rows)
DROP TABLE zero_col;

12
src/test/regress/sql/am_create.sql
View File

@ -59,5 +59,15 @@ WITH a as (
), c as (
(TABLE a EXCEPT TABLE b) UNION (TABLE b EXCEPT TABLE a) UNION
(TABLE a EXCEPT TABLE columnar.chunk_group) UNION (TABLE columnar.chunk_group EXCEPT TABLE a)
), d as (
SELECT storage_id, stripe_num, count(*) as chunk_group_count
FROM columnar.chunk_group
GROUP BY 1,2
), e as (
SELECT storage_id, stripe_num, chunk_group_count
FROM columnar.stripe
), f as (
(TABLE d EXCEPT TABLE d) UNION (TABLE e EXCEPT TABLE d)
)
SELECT count(*) = 0 AS consistent FROM c;
SELECT (SELECT count(*) = 0 FROM c) AND
(SELECT count(*) = 0 FROM f) as consistent;

4
src/test/regress/sql/am_insert.sql
View File

@ -128,9 +128,9 @@ INSERT INTO zero_col_heap SELECT * FROM zero_col_heap;
INSERT INTO zero_col SELECT * FROM zero_col_heap;
SELECT relname, stripe_num, row_count FROM columnar.stripe a, pg_class b
SELECT relname, stripe_num, chunk_group_count, row_count FROM columnar.stripe a, pg_class b
WHERE columnar_relation_storageid(b.oid)=a.storage_id AND relname = 'zero_col'
ORDER BY 1,2,3;
ORDER BY 1,2,3,4;
SELECT relname, stripe_num, value_count FROM columnar.chunk a, pg_class b
WHERE columnar_relation_storageid(b.oid)=a.storage_id AND relname = 'zero_col'