Skip to content

Commit b588980

Browse files
b41shb41sh
authored
chore(query): Clean up legacy virtual column codes (#17896)
* chore(query): Clean up legacy virtual column codes * fix * fix
1 parent e05fcca commit b588980

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+156
-3044
lines changed

‎Cargo.lock

Lines changed: 0 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/meta/api/src/schema_api.rs

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ use databend_common_meta_app::schema::CreateLockRevReq;
3737
use databend_common_meta_app::schema::CreateTableIndexReq;
3838
use databend_common_meta_app::schema::CreateTableReply;
3939
use databend_common_meta_app::schema::CreateTableReq;
40-
use databend_common_meta_app::schema::CreateVirtualColumnReq;
4140
use databend_common_meta_app::schema::DBIdTableName;
4241
use databend_common_meta_app::schema::DatabaseInfo;
4342
use databend_common_meta_app::schema::DeleteLockRevReq;
@@ -47,7 +46,6 @@ use databend_common_meta_app::schema::DropDatabaseReq;
4746
use databend_common_meta_app::schema::DropTableByIdReq;
4847
use databend_common_meta_app::schema::DropTableIndexReq;
4948
use databend_common_meta_app::schema::DropTableReply;
50-
use databend_common_meta_app::schema::DropVirtualColumnReq;
5149
use databend_common_meta_app::schema::ExtendLockRevReq;
5250
use databend_common_meta_app::schema::GcDroppedTableReq;
5351
use databend_common_meta_app::schema::GetDatabaseReq;
@@ -69,7 +67,6 @@ use databend_common_meta_app::schema::ListIndexesReq;
6967
use databend_common_meta_app::schema::ListLockRevReq;
7068
use databend_common_meta_app::schema::ListLocksReq;
7169
use databend_common_meta_app::schema::ListTableReq;
72-
use databend_common_meta_app::schema::ListVirtualColumnsReq;
7370
use databend_common_meta_app::schema::LockInfo;
7471
use databend_common_meta_app::schema::LockMeta;
7572
use databend_common_meta_app::schema::RenameDatabaseReply;
@@ -93,10 +90,8 @@ use databend_common_meta_app::schema::UpdateDictionaryReply;
9390
use databend_common_meta_app::schema::UpdateDictionaryReq;
9491
use databend_common_meta_app::schema::UpdateMultiTableMetaReq;
9592
use databend_common_meta_app::schema::UpdateMultiTableMetaResult;
96-
use databend_common_meta_app::schema::UpdateVirtualColumnReq;
9793
use databend_common_meta_app::schema::UpsertTableOptionReply;
9894
use databend_common_meta_app::schema::UpsertTableOptionReq;
99-
use databend_common_meta_app::schema::VirtualColumnMeta;
10095
use databend_common_meta_app::tenant::Tenant;
10196
use databend_common_meta_kvapi::kvapi;
10297
use databend_common_meta_types::seq_value::SeqV;
@@ -189,19 +184,6 @@ pub trait SchemaApi: Send + Sync {
189184
req: ListIndexesReq,
190185
) -> Result<Vec<(String, IndexId, IndexMeta)>, KVAppError>;
191186

192-
// virtual column
193-
194-
async fn create_virtual_column(&self, req: CreateVirtualColumnReq) -> Result<(), KVAppError>;
195-
196-
async fn update_virtual_column(&self, req: UpdateVirtualColumnReq) -> Result<(), KVAppError>;
197-
198-
async fn drop_virtual_column(&self, req: DropVirtualColumnReq) -> Result<(), KVAppError>;
199-
200-
async fn list_virtual_columns(
201-
&self,
202-
req: ListVirtualColumnsReq,
203-
) -> Result<Vec<VirtualColumnMeta>, KVAppError>;
204-
205187
// table
206188

207189
async fn create_table(&self, req: CreateTableReq) -> Result<CreateTableReply, KVAppError>;

‎src/meta/api/src/schema_api_impl.rs

Lines changed: 0 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ use databend_common_meta_app::schema::CreateOption;
9595
use databend_common_meta_app::schema::CreateTableIndexReq;
9696
use databend_common_meta_app::schema::CreateTableReply;
9797
use databend_common_meta_app::schema::CreateTableReq;
98-
use databend_common_meta_app::schema::CreateVirtualColumnReq;
9998
use databend_common_meta_app::schema::DBIdTableName;
10099
use databend_common_meta_app::schema::DatabaseId;
101100
use databend_common_meta_app::schema::DatabaseIdHistoryIdent;
@@ -112,7 +111,6 @@ use databend_common_meta_app::schema::DropDatabaseReq;
112111
use databend_common_meta_app::schema::DropTableByIdReq;
113112
use databend_common_meta_app::schema::DropTableIndexReq;
114113
use databend_common_meta_app::schema::DropTableReply;
115-
use databend_common_meta_app::schema::DropVirtualColumnReq;
116114
use databend_common_meta_app::schema::DroppedId;
117115
use databend_common_meta_app::schema::ExtendLockRevReq;
118116
use databend_common_meta_app::schema::GcDroppedTableReq;
@@ -136,7 +134,6 @@ use databend_common_meta_app::schema::ListIndexesReq;
136134
use databend_common_meta_app::schema::ListLockRevReq;
137135
use databend_common_meta_app::schema::ListLocksReq;
138136
use databend_common_meta_app::schema::ListTableReq;
139-
use databend_common_meta_app::schema::ListVirtualColumnsReq;
140137
use databend_common_meta_app::schema::LockInfo;
141138
use databend_common_meta_app::schema::LockMeta;
142139
use databend_common_meta_app::schema::MarkedDeletedIndexMeta;
@@ -170,11 +167,8 @@ use databend_common_meta_app::schema::UpdateDictionaryReq;
170167
use databend_common_meta_app::schema::UpdateMultiTableMetaReq;
171168
use databend_common_meta_app::schema::UpdateMultiTableMetaResult;
172169
use databend_common_meta_app::schema::UpdateTableMetaReply;
173-
use databend_common_meta_app::schema::UpdateVirtualColumnReq;
174170
use databend_common_meta_app::schema::UpsertTableOptionReply;
175171
use databend_common_meta_app::schema::UpsertTableOptionReq;
176-
use databend_common_meta_app::schema::VirtualColumnIdent;
177-
use databend_common_meta_app::schema::VirtualColumnMeta;
178172
use databend_common_meta_app::tenant::Tenant;
179173
use databend_common_meta_app::tenant_key::errors::ExistError;
180174
use databend_common_meta_app::tenant_key::errors::UnknownError;
@@ -218,7 +212,6 @@ use crate::kv_pb_crud_api::KVPbCrudApi;
218212
use crate::list_u64_value;
219213
use crate::meta_txn_error::MetaTxnError;
220214
use crate::name_id_value_api::NameIdValueApi;
221-
use crate::name_value_api::NameValueApi;
222215
use crate::send_txn;
223216
use crate::serialize_struct;
224217
use crate::serialize_u64;
@@ -925,107 +918,6 @@ impl<KV: kvapi::KVApi<Error = MetaError> + ?Sized> SchemaApi for KV {
925918
Ok(index_metas)
926919
}
927920

928-
// virtual column
929-
930-
#[logcall::logcall]
931-
#[fastrace::trace]
932-
async fn create_virtual_column(&self, req: CreateVirtualColumnReq) -> Result<(), KVAppError> {
933-
debug!(req :? =(&req); "SchemaApi: {}", func_name!());
934-
935-
let virtual_column_meta = VirtualColumnMeta {
936-
table_id: req.name_ident.table_id(),
937-
virtual_columns: req.virtual_columns.clone(),
938-
created_on: Utc::now(),
939-
updated_on: None,
940-
auto_generated: req.auto_generated,
941-
};
942-
943-
self.insert_name_value_with_create_option(
944-
req.name_ident.clone(),
945-
virtual_column_meta,
946-
req.create_option,
947-
)
948-
.await?
949-
.map_err(AppError::from)?;
950-
951-
Ok(())
952-
}
953-
954-
#[logcall::logcall]
955-
#[fastrace::trace]
956-
async fn update_virtual_column(&self, req: UpdateVirtualColumnReq) -> Result<(), KVAppError> {
957-
debug!(req :? =(&req); "SchemaApi: {}", func_name!());
958-
959-
let not_found = || {
960-
if req.if_exists {
961-
Ok(())
962-
} else {
963-
Err(AppError::from(req.name_ident.unknown_error(func_name!())))
964-
}
965-
};
966-
967-
self.crud_update_existing(
968-
&req.name_ident,
969-
|mut meta| {
970-
meta.virtual_columns = req.virtual_columns.clone();
971-
meta.updated_on = Some(Utc::now());
972-
meta.auto_generated = req.auto_generated;
973-
Some((meta, None))
974-
},
975-
not_found,
976-
)
977-
.await??;
978-
Ok(())
979-
}
980-
981-
#[logcall::logcall]
982-
#[fastrace::trace]
983-
async fn drop_virtual_column(&self, req: DropVirtualColumnReq) -> Result<(), KVAppError> {
984-
debug!(req :? =(&req); "SchemaApi: {}", func_name!());
985-
986-
let not_found = || {
987-
if req.if_exists {
988-
Ok(())
989-
} else {
990-
Err(AppError::from(req.name_ident.unknown_error(func_name!())))
991-
}
992-
};
993-
994-
self.crud_remove(&req.name_ident, not_found).await??;
995-
996-
Ok(())
997-
}
998-
999-
#[logcall::logcall]
1000-
#[fastrace::trace]
1001-
async fn list_virtual_columns(
1002-
&self,
1003-
req: ListVirtualColumnsReq,
1004-
) -> Result<Vec<VirtualColumnMeta>, KVAppError> {
1005-
debug!(req :? =(&req); "SchemaApi: {}", func_name!());
1006-
1007-
if let Some(table_id) = req.table_id {
1008-
let name_ident = VirtualColumnIdent::new(&req.tenant, table_id);
1009-
1010-
let seq_meta = self.get_pb(&name_ident).await?;
1011-
let x = seq_meta
1012-
.map(|seq_v| seq_v.data)
1013-
.into_iter()
1014-
.collect::<Vec<_>>();
1015-
1016-
return Ok(x);
1017-
}
1018-
1019-
// Get virtual columns list by `prefix_list` "<prefix>/<tenant>"
1020-
let ident = VirtualColumnIdent::new(&req.tenant, 0u64);
1021-
let dir = DirName::new(ident);
1022-
1023-
let strm = self.list_pb_values(&dir).await?;
1024-
let vs = strm.try_collect::<Vec<_>>().await?;
1025-
1026-
Ok(vs)
1027-
}
1028-
1029921
#[logcall::logcall]
1030922
#[fastrace::trace]
1031923
async fn create_table(&self, req: CreateTableReq) -> Result<CreateTableReply, KVAppError> {

0 commit comments

Comments
 (0)