rust/greptimedb
1
0
Fork 0
mirror of https://github.com/GreptimeTeam/greptimedb.git synced 2026-01-06 05:12:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: alter table procedure forgets to update next column id (#2385)

Browse Source 
* feat: add more info to error messages

* feat: store next column id in procedure

* fix: update next column id for table info

* test: fix add col test

* chore: remove location from invalid request error

* test: update test

* test: fix test
This commit is contained in:
Yingwen
2023-09-14 10:06:57 +08:00
committed by GitHub
parent cc7eb3d317
commit da54a0c139
12 changed files with 214 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

179
src/common/meta/src/ddl/alter_table.rs
View File

@@ -30,7 +30,7 @@ use common_telemetry::{debug, info};
use futures::future;
use serde::{Deserialize, Serialize};
use snafu::{ensure, OptionExt, ResultExt};
use store_api::storage::RegionId;
use store_api::storage::{ColumnId, RegionId};
use strum::AsRefStr;
use table::engine::TableReference;
use table::metadata::{RawTableInfo, TableId, TableInfo};
@@ -54,6 +54,8 @@ use crate::table_name::TableName;
pub struct AlterTableProcedure {
context: DdlContext,
data: AlterTableData,
/// proto alter Kind.
kind: alter_request::Kind,
}
impl AlterTableProcedure {
@@ -64,17 +66,50 @@ impl AlterTableProcedure {
task: AlterTableTask,
table_info_value: TableInfoValue,
context: DdlContext,
) -> Self {
Self {
) -> Result<Self> {
let alter_kind = task
.alter_table
.kind
.as_ref()
.context(InvalidProtoMsgSnafu {
err_msg: "'kind' is absent",
})?;
let (kind, next_column_id) =
create_proto_alter_kind(&table_info_value.table_info, alter_kind)?;
debug!(
"New AlterTableProcedure, kind: {:?}, next_column_id: {:?}",
kind, next_column_id
);
Ok(Self {
context,
data: AlterTableData::new(task, table_info_value, cluster_id),
}
data: AlterTableData::new(task, table_info_value, cluster_id, next_column_id),
kind,
})
}
pub fn from_json(json: &str, context: DdlContext) -> ProcedureResult<Self> {
let data = serde_json::from_str(json).context(FromJsonSnafu)?;
let data: AlterTableData = serde_json::from_str(json).context(FromJsonSnafu)?;
let alter_kind = data
.task
.alter_table
.kind
.as_ref()
.context(InvalidProtoMsgSnafu {
err_msg: "'kind' is absent",
})
.map_err(ProcedureError::external)?;
let (kind, next_column_id) =
create_proto_alter_kind(&data.table_info_value.table_info, alter_kind)
.map_err(ProcedureError::external)?;
assert_eq!(data.next_column_id, next_column_id);
Ok(AlterTableProcedure { context, data })
Ok(AlterTableProcedure {
context,
data,
kind,
})
}
// Checks whether the table exists.
@@ -133,56 +168,10 @@ impl AlterTableProcedure {
pub fn create_alter_region_request(&self, region_id: RegionId) -> Result<AlterRequest> {
let table_info = self.data.table_info();
let kind =
match self.alter_kind()? {
Kind::AddColumns(x) => {
let mut next_column_id = table_info.meta.next_column_id;
let add_columns =
x.add_columns
.iter()
.map(|add_column| {
let column_def = add_column.column_def.as_ref().context(
InvalidProtoMsgSnafu {
err_msg: "'column_def' is absent",
},
)?;
let column_id = next_column_id;
next_column_id += 1;
let column_def = RegionColumnDef {
column_def: Some(column_def.clone()),
column_id,
};
Ok(AddColumn {
column_def: Some(column_def),
location: add_column.location.clone(),
})
})
.collect::<Result<Vec<_>>>()?;
alter_request::Kind::AddColumns(AddColumns { add_columns })
}
Kind::DropColumns(x) => {
let drop_columns = x
.drop_columns
.iter()
.map(|x| DropColumn {
name: x.name.clone(),
})
.collect::<Vec<_>>();
alter_request::Kind::DropColumns(DropColumns { drop_columns })
}
Kind::RenameTable(_) => unreachable!(),
};
Ok(AlterRequest {
region_id: region_id.as_u64(),
schema_version: table_info.ident.version,
kind: Some(kind),
kind: Some(self.kind.clone()),
})
}
@@ -279,8 +268,11 @@ impl AlterTableProcedure {
})?;
let mut new_info = table_info.clone();
new_info.ident.version = table_info.ident.version + 1;
new_info.meta = new_meta;
new_info.ident.version = table_info.ident.version + 1;
if let Some(column_id) = self.data.next_column_id {
new_info.meta.next_column_id = new_info.meta.next_column_id.max(column_id);
}
if let AlterKind::RenameTable { new_table_name } = &request.alter_kind {
new_info.name = new_table_name.to_string();
@@ -308,7 +300,7 @@ impl AlterTableProcedure {
self.on_update_metadata_for_alter(new_info.into()).await?;
}
info!("Updated table metadata for table {table_id}");
info!("Updated table metadata for table {table_ref}, table_id: {table_id}");
self.data.state = AlterTableState::InvalidateTableCache;
Ok(Status::executing(true))
@@ -424,17 +416,26 @@ enum AlterTableState {
pub struct AlterTableData {
state: AlterTableState,
task: AlterTableTask,
/// Table info value before alteration.
table_info_value: TableInfoValue,
cluster_id: u64,
/// Next column id of the table if the task adds columns to the table.
next_column_id: Option<ColumnId>,
}
impl AlterTableData {
pub fn new(task: AlterTableTask, table_info_value: TableInfoValue, cluster_id: u64) -> Self {
pub fn new(
task: AlterTableTask,
table_info_value: TableInfoValue,
cluster_id: u64,
next_column_id: Option<ColumnId>,
) -> Self {
Self {
state: AlterTableState::Prepare,
task,
table_info_value,
cluster_id,
next_column_id,
}
}
@@ -450,3 +451,67 @@ impl AlterTableData {
&self.table_info_value.table_info
}
}
/// Creates region proto alter kind from `table_info` and `alter_kind`.
///
/// Returns the kind and next column id if it adds new columns.
///
/// # Panics
/// Panics if kind is rename.
pub fn create_proto_alter_kind(
table_info: &RawTableInfo,
alter_kind: &Kind,
) -> Result<(alter_request::Kind, Option<ColumnId>)> {
match alter_kind {
Kind::AddColumns(x) => {
let mut next_column_id = table_info.meta.next_column_id;
let add_columns = x
.add_columns
.iter()
.map(|add_column| {
let column_def =
add_column
.column_def
.as_ref()
.context(InvalidProtoMsgSnafu {
err_msg: "'column_def' is absent",
})?;
let column_id = next_column_id;
next_column_id += 1;
let column_def = RegionColumnDef {
column_def: Some(column_def.clone()),
column_id,
};
Ok(AddColumn {
column_def: Some(column_def),
location: add_column.location.clone(),
})
})
.collect::<Result<Vec<_>>>()?;
Ok((
alter_request::Kind::AddColumns(AddColumns { add_columns }),
Some(next_column_id),
))
}
Kind::DropColumns(x) => {
let drop_columns = x
.drop_columns
.iter()
.map(|x| DropColumn {
name: x.name.clone(),
})
.collect::<Vec<_>>();
Ok((
alter_request::Kind::DropColumns(DropColumns { drop_columns }),
None,
))
}
Kind::RenameTable(_) => unreachable!(),
}
}

2
src/common/meta/src/ddl_manager.rs
View File

@@ -134,7 +134,7 @@ impl DdlManager {
let context = self.create_context();
let procedure =
AlterTableProcedure::new(cluster_id, alter_table_task, table_info_value, context);
AlterTableProcedure::new(cluster_id, alter_table_task, table_info_value, context)?;
let procedure_with_id = ProcedureWithId::with_random_id(Box::new(procedure));

6
src/frontend/src/statement/ddl.rs
View File

@@ -259,6 +259,12 @@ impl StatementExecutor {
let engine = table.table_info().meta.engine.to_string();
self.verify_alter(table_id, table.table_info(), expr.clone())?;
info!(
"Table info before alter is {:?}, expr: {:?}",
table.table_info(),
expr
);
let req = SubmitDdlTaskRequest {
task: DdlTask::new_alter_table(expr.clone()),
};

6
src/meta-srv/src/procedure/tests.rs
View File

@@ -295,7 +295,8 @@ fn test_create_alter_region_request() {
alter_table_task,
TableInfoValue::new(test_data::new_table_info()),
test_data::new_ddl_context(Arc::new(DatanodeClients::default())),
);
)
.unwrap();
let region_id = RegionId::new(42, 1);
let alter_region_request = procedure.create_alter_region_request(region_id).unwrap();
@@ -358,7 +359,8 @@ async fn test_submit_alter_region_requests() {
alter_table_task,
TableInfoValue::new(table_info),
context,
);
)
.unwrap();
let expected_altered_regions = Arc::new(Mutex::new(HashSet::from([
RegionId::new(42, 1),

7
src/mito2/src/error.rs
View File

@@ -186,12 +186,7 @@ pub enum Error {
location: Location,
},
#[snafu(display(
"Invalid request to region {}, location: {}, reason: {}",
region_id,
location,
reason
))]
#[snafu(display("Invalid request to region {}, reason: {}", region_id, reason))]
InvalidRequest {
region_id: RegionId,
reason: String,

7
src/mito2/src/request.rs
View File

@@ -213,7 +213,10 @@ impl WriteRequest {
!has_null || column.column_schema.is_nullable(),
InvalidRequestSnafu {
region_id,
reason: format!("column {} is not null", column.column_schema.name),
reason: format!(
"column {} is not null but input has null",
column.column_schema.name
),
}
);
} else {
@@ -805,7 +808,7 @@ mod tests {
let request = WriteRequest::new(RegionId::new(1, 1), OpType::Put, rows).unwrap();
let err = request.check_schema(&metadata).unwrap_err();
check_invalid_request(&err, "column ts is not null");
check_invalid_request(&err, "column ts is not null but input has null");
}
#[test]

2
src/sql/src/error.rs
View File

@@ -50,7 +50,7 @@ pub enum Error {
},
#[snafu(display(
"Unsupported expr in default constraint: {} for column: {}",
"Unsupported expr in default constraint: {:?} for column: {}",
expr,
column_name
))]

4
src/store-api/src/metadata.rs
View File

@@ -255,8 +255,8 @@ impl RegionMetadata {
!id_names.contains_key(&col.column_id),
InvalidMetaSnafu {
reason: format!(
"column {} and {} have the same column id",
id_names[&col.column_id], col.column_schema.name
"column {} and {} have the same column id {}",
id_names[&col.column_id], col.column_schema.name, col.column_id,
),
}
);

68
tests/cases/standalone/common/alter/add_col.result
View File

@@ -2,6 +2,15 @@ CREATE TABLE test(i INTEGER, j TIMESTAMP TIME INDEX);
Affected Rows: 0
DESC TABLE test;
+--------+----------------------+-----+------+---------+---------------+
| Column | Type | Key | Null | Default | Semantic Type |
+--------+----------------------+-----+------+---------+---------------+
| i | Int32 | | YES | | FIELD |
| j | TimestampMillisecond | PRI | NO | | TIMESTAMP |
+--------+----------------------+-----+------+---------+---------------+
INSERT INTO test VALUES (1, 1), (2, 2);
Affected Rows: 2
@@ -19,6 +28,65 @@ SELECT * FROM test;
| 2 | 1970-01-01T00:00:00.002 | |
+---+-------------------------+---+
DESC TABLE test;
+--------+----------------------+-----+------+---------+---------------+
| Column | Type | Key | Null | Default | Semantic Type |
+--------+----------------------+-----+------+---------+---------------+
| i | Int32 | | YES | | FIELD |
| j | TimestampMillisecond | PRI | NO | | TIMESTAMP |
| k | Int32 | | YES | | FIELD |
+--------+----------------------+-----+------+---------+---------------+
ALTER TABLE test ADD COLUMN host STRING PRIMARY KEY;
Affected Rows: 0
SELECT * FROM test;
+---+-------------------------+---+------+
| i | j | k | host |
+---+-------------------------+---+------+
| 1 | 1970-01-01T00:00:00.001 | | |
| 2 | 1970-01-01T00:00:00.002 | | |
+---+-------------------------+---+------+
DESC TABLE test;
+--------+----------------------+-----+------+---------+---------------+
| Column | Type | Key | Null | Default | Semantic Type |
+--------+----------------------+-----+------+---------+---------------+
| i | Int32 | | YES | | FIELD |
| j | TimestampMillisecond | PRI | NO | | TIMESTAMP |
| k | Int32 | | YES | | FIELD |
| host | String | | YES | | FIELD |
+--------+----------------------+-----+------+---------+---------------+
ALTER TABLE test ADD COLUMN idc STRING default 'idc' PRIMARY KEY;
Affected Rows: 0
SELECT * FROM test;
+---+-------------------------+---+------+-----+
| i | j | k | host | idc |
+---+-------------------------+---+------+-----+
| 1 | 1970-01-01T00:00:00.001 | | | idc |
| 2 | 1970-01-01T00:00:00.002 | | | idc |
+---+-------------------------+---+------+-----+
DESC TABLE test;
+--------+----------------------+-----+------+---------+---------------+
| Column | Type | Key | Null | Default | Semantic Type |
+--------+----------------------+-----+------+---------+---------------+
| i | Int32 | | YES | | FIELD |
| j | TimestampMillisecond | PRI | NO | | TIMESTAMP |
| k | Int32 | | YES | | FIELD |
| host | String | | YES | | FIELD |
| idc | String | | YES | idc | FIELD |
+--------+----------------------+-----+------+---------+---------------+
DROP TABLE test;
Affected Rows: 1

2
tests/cases/standalone/common/alter/add_col.sql
View File

@@ -16,7 +16,7 @@ SELECT * FROM test;
DESC TABLE test;
ALTER TABLE test ADD COLUMN idc STRING default "idc" PRIMARY KEY;
ALTER TABLE test ADD COLUMN idc STRING default 'idc' PRIMARY KEY;
SELECT * FROM test;

3
tests/cases/standalone/common/alter/drop_col_not_null_next.result
View File

@@ -19,9 +19,10 @@ ALTER TABLE test DROP COLUMN j;
Affected Rows: 0
-- SQLNESS REPLACE (region\s\d+\(\d+\,\s\d+\)) region
INSERT INTO test VALUES (3, NULL);
Error: 1004(InvalidArguments), Column k is not null but input has null
Error: 1004(InvalidArguments), Invalid request to region, reason: column k is not null but input has null
INSERT INTO test VALUES (3, 13);

1
tests/cases/standalone/common/alter/drop_col_not_null_next.sql
View File

@@ -6,6 +6,7 @@ SELECT * FROM test;
ALTER TABLE test DROP COLUMN j;
-- SQLNESS REPLACE (region\s\d+\(\d+\,\s\d+\)) region
INSERT INTO test VALUES (3, NULL);
INSERT INTO test VALUES (3, 13);