Move chunk.value_count to last position

pull/4681/head
Hadi Moshayedi 2021-02-09 19:42:32 -08:00
parent ba937bf316
commit 9114fd4050
2 changed files with 13 additions and 13 deletions

View File

@ -153,16 +153,16 @@ typedef FormData_columnar_options *Form_columnar_options;
#define Anum_columnar_chunk_stripe 2 #define Anum_columnar_chunk_stripe 2
#define Anum_columnar_chunk_attr 3 #define Anum_columnar_chunk_attr 3
#define Anum_columnar_chunk_chunk 4 #define Anum_columnar_chunk_chunk 4
#define Anum_columnar_chunk_value_count 5 #define Anum_columnar_chunk_minimum_value 5
#define Anum_columnar_chunk_minimum_value 6 #define Anum_columnar_chunk_maximum_value 6
#define Anum_columnar_chunk_maximum_value 7 #define Anum_columnar_chunk_value_stream_offset 7
#define Anum_columnar_chunk_value_stream_offset 8 #define Anum_columnar_chunk_value_stream_length 8
#define Anum_columnar_chunk_value_stream_length 9 #define Anum_columnar_chunk_exists_stream_offset 9
#define Anum_columnar_chunk_exists_stream_offset 10 #define Anum_columnar_chunk_exists_stream_length 10
#define Anum_columnar_chunk_exists_stream_length 11 #define Anum_columnar_chunk_value_compression_type 11
#define Anum_columnar_chunk_value_compression_type 12 #define Anum_columnar_chunk_value_compression_level 12
#define Anum_columnar_chunk_value_compression_level 13 #define Anum_columnar_chunk_value_decompressed_size 13
#define Anum_columnar_chunk_value_decompressed_size 14 #define Anum_columnar_chunk_value_count 14
/* /*
@ -430,7 +430,6 @@ SaveStripeSkipList(RelFileNode relfilenode, uint64 stripe, StripeSkipList *chunk
Int64GetDatum(stripe), Int64GetDatum(stripe),
Int32GetDatum(columnIndex + 1), Int32GetDatum(columnIndex + 1),
Int32GetDatum(chunkIndex), Int32GetDatum(chunkIndex),
Int64GetDatum(chunk->rowCount),
0, /* to be filled below */ 0, /* to be filled below */
0, /* to be filled below */ 0, /* to be filled below */
Int64GetDatum(chunk->valueChunkOffset), Int64GetDatum(chunk->valueChunkOffset),
@ -439,7 +438,8 @@ SaveStripeSkipList(RelFileNode relfilenode, uint64 stripe, StripeSkipList *chunk
Int64GetDatum(chunk->existsLength), Int64GetDatum(chunk->existsLength),
Int32GetDatum(chunk->valueCompressionType), Int32GetDatum(chunk->valueCompressionType),
Int32GetDatum(chunk->valueCompressionLevel), Int32GetDatum(chunk->valueCompressionLevel),
Int64GetDatum(chunk->decompressedValueSize) Int64GetDatum(chunk->decompressedValueSize),
Int64GetDatum(chunk->rowCount)
}; };
bool nulls[Natts_columnar_chunk] = { false }; bool nulls[Natts_columnar_chunk] = { false };

View File

@ -45,7 +45,6 @@ CREATE TABLE chunk (
stripeid bigint NOT NULL, stripeid bigint NOT NULL,
attnum int NOT NULL, attnum int NOT NULL,
chunkid int NOT NULL, chunkid int NOT NULL,
value_count bigint NOT NULL,
minimum_value bytea, minimum_value bytea,
maximum_value bytea, maximum_value bytea,
value_stream_offset bigint NOT NULL, value_stream_offset bigint NOT NULL,
@ -55,6 +54,7 @@ CREATE TABLE chunk (
value_compression_type int NOT NULL, value_compression_type int NOT NULL,
value_compression_level int NOT NULL, value_compression_level int NOT NULL,
value_decompressed_length bigint NOT NULL, value_decompressed_length bigint NOT NULL,
value_count bigint NOT NULL,
PRIMARY KEY (storageid, stripeid, attnum, chunkid), PRIMARY KEY (storageid, stripeid, attnum, chunkid),
FOREIGN KEY (storageid, stripeid, chunkid) REFERENCES chunk_group(storageid, stripeid, chunkid) ON DELETE CASCADE FOREIGN KEY (storageid, stripeid, chunkid) REFERENCES chunk_group(storageid, stripeid, chunkid) ON DELETE CASCADE
) WITH (user_catalog_table = true); ) WITH (user_catalog_table = true);