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.

Sign up for GitHub

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: update pk_cache in compat reader #3576

Merged
merged 5 commits into from
Mar 26, 2024
Merged

fix: update pk_cache in compat reader #3576

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
560478d
fix: update pk_cache in compat reader
waynexia Mar 25, 2024
467706b
add sqlness case
waynexia Mar 25, 2024
e6074a7
update document
waynexia Mar 25, 2024
f497f29
add more sqlness case
waynexia Mar 25, 2024
8d48088
avoid mysterious bug
waynexia Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/mito2/src/read.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,9 @@ impl Batch {
}

/// Replaces the primary key of the batch.
///
/// Notice that this [Batch] also contains a maybe-exist `pk_values`.
/// Be sure to update that field as well.
pub fn set_primary_key(&mut self, primary_key: Vec<u8>) {
self.primary_key = primary_key;
}
Expand Down
8 changes: 8 additions & 0 deletions src/mito2/src/read/compat.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,14 @@ impl CompatPrimaryKey {
)?;

batch.set_primary_key(buffer);

// update cache
if let Some(pk_values) = &mut batch.pk_values {
for value in &self.values {
pk_values.push(value.clone());
}
}

Ok(batch)
}
}
Expand Down
40 changes: 33 additions & 7 deletions tests/cases/standalone/common/alter/alter_table.result
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
CREATE TABLE test_alt_table(i INTEGER, j TIMESTAMP TIME INDEX);
CREATE TABLE test_alt_table(h INTEGER, i INTEGER, j TIMESTAMP TIME INDEX, PRIMARY KEY (h, i));

Affected Rows: 0

Expand All @@ -7,11 +7,18 @@ DESC TABLE test_alt_table;
+--------+----------------------+-----+------+---------+---------------+
| Column | Type | Key | Null | Default | Semantic Type |
+--------+----------------------+-----+------+---------+---------------+
| i | Int32 | | YES | | FIELD |
| h | Int32 | PRI | YES | | TAG |
| i | Int32 | PRI | YES | | TAG |
| j | TimestampMillisecond | PRI | NO | | TIMESTAMP |
+--------+----------------------+-----+------+---------+---------------+

ALTER TABLE test_alt_table ADD COLUMN k INTEGER;
INSERT INTO test_alt_table VALUES (1, 1, 0), (2, 2, 1);

Affected Rows: 2

-- TODO: It may result in an error if `k` is with type INTEGER.
-- Error: 3001(EngineExecuteQuery), Invalid argument error: column types must match schema types, expected Int32 but found Utf8 at column index 3
ALTER TABLE test_alt_table ADD COLUMN k STRING PRIMARY KEY;

Affected Rows: 0

Expand All @@ -20,11 +27,29 @@ DESC TABLE test_alt_table;
+--------+----------------------+-----+------+---------+---------------+
| Column | Type | Key | Null | Default | Semantic Type |
+--------+----------------------+-----+------+---------+---------------+
| i | Int32 | | YES | | FIELD |
| h | Int32 | PRI | YES | | TAG |
| i | Int32 | PRI | YES | | TAG |
| j | TimestampMillisecond | PRI | NO | | TIMESTAMP |
| k | Int32 | | YES | | FIELD |
| k | String | PRI | YES | | TAG |
+--------+----------------------+-----+------+---------+---------------+

SELECT * FROM test_alt_table;

+---+---+-------------------------+---+
| h | i | j | k |
+---+---+-------------------------+---+
| 1 | 1 | 1970-01-01T00:00:00 | |
| 2 | 2 | 1970-01-01T00:00:00.001 | |
+---+---+-------------------------+---+

SELECT * FROM test_alt_table WHERE i = 1;

+---+---+---------------------+---+
| h | i | j | k |
+---+---+---------------------+---+
| 1 | 1 | 1970-01-01T00:00:00 | |
+---+---+---------------------+---+

-- SQLNESS ARG restart=true
ALTER TABLE test_alt_table ADD COLUMN m INTEGER;

Expand All @@ -35,9 +60,10 @@ DESC TABLE test_alt_table;
+--------+----------------------+-----+------+---------+---------------+
| Column | Type | Key | Null | Default | Semantic Type |
+--------+----------------------+-----+------+---------+---------------+
| i | Int32 | | YES | | FIELD |
| h | Int32 | PRI | YES | | TAG |
| i | Int32 | PRI | YES | | TAG |
| j | TimestampMillisecond | PRI | NO | | TIMESTAMP |
| k | Int32 | | YES | | FIELD |
| k | String | PRI | YES | | TAG |
| m | Int32 | | YES | | FIELD |
+--------+----------------------+-----+------+---------+---------------+

Expand Down
12 changes: 10 additions & 2 deletions tests/cases/standalone/common/alter/alter_table.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,19 @@
CREATE TABLE test_alt_table(i INTEGER, j TIMESTAMP TIME INDEX);
CREATE TABLE test_alt_table(h INTEGER, i INTEGER, j TIMESTAMP TIME INDEX, PRIMARY KEY (h, i));

DESC TABLE test_alt_table;

ALTER TABLE test_alt_table ADD COLUMN k INTEGER;
INSERT INTO test_alt_table VALUES (1, 1, 0), (2, 2, 1);

-- TODO: It may result in an error if `k` is with type INTEGER.
-- Error: 3001(EngineExecuteQuery), Invalid argument error: column types must match schema types, expected Int32 but found Utf8 at column index 3
ALTER TABLE test_alt_table ADD COLUMN k STRING PRIMARY KEY;

DESC TABLE test_alt_table;

SELECT * FROM test_alt_table;

SELECT * FROM test_alt_table WHERE i = 1;

-- SQLNESS ARG restart=true
ALTER TABLE test_alt_table ADD COLUMN m INTEGER;

Expand Down