Skip to content

Commit a3dfc01

Browse files
authored
chore: Enable Advanced Indexing Features for Community Edition (#18917)
* chore: Enable Advanced Indexing Features for Community Edition * fix * fix tests
1 parent e2d6afa commit a3dfc01

File tree

64 files changed

+958
-1772
lines changed

Some content is hidden

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

64 files changed

+958
-1772
lines changed

Cargo.lock

Lines changed: 2 additions & 34 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -75,11 +75,9 @@ members = [
7575
"src/query/users",
7676
"src/query/ee_features/attach_table",
7777
"src/query/ee_features/vacuum_handler",
78-
"src/query/ee_features/aggregating_index",
7978
"src/query/ee_features/data_mask",
8079
"src/query/ee_features/storage_encryption",
8180
"src/query/ee_features/stream_handler",
82-
"src/query/ee_features/table_index",
8381
"src/query/ee_features/virtual_column",
8482
"src/query/ee_features/resources_management",
8583
"src/query/service",
@@ -185,7 +183,6 @@ databend-common-tracing = { path = "src/common/tracing" }
185183
databend-common-users = { path = "src/query/users" }
186184
databend-common-vector = { path = "src/common/vector" }
187185
databend-common-version = { path = "src/common/version" }
188-
databend-enterprise-aggregating-index = { path = "src/query/ee_features/aggregating_index" }
189186
databend-enterprise-attach-table = { path = "src/query/ee_features/attach_table" }
190187
databend-enterprise-data-mask-feature = { path = "src/query/ee_features/data_mask" }
191188
databend-enterprise-fail-safe = { path = "src/query/ee_features/fail_safe" }
@@ -196,7 +193,6 @@ databend-enterprise-resources-management = { path = "src/query/ee_features/resou
196193
databend-enterprise-row-access-policy-feature = { path = "src/query/ee_features/row_access_policy" }
197194
databend-enterprise-storage-encryption = { path = "src/query/ee_features/storage_encryption" }
198195
databend-enterprise-stream-handler = { path = "src/query/ee_features/stream_handler" }
199-
databend-enterprise-table-index = { path = "src/query/ee_features/table_index" }
200196
databend-enterprise-vacuum-handler = { path = "src/query/ee_features/vacuum_handler" }
201197
databend-enterprise-virtual-column = { path = "src/query/ee_features/virtual_column" }
202198
databend-functions-scalar-arithmetic = { path = "src/query/functions/src/scalars/arithmetic" }

src/common/license/src/license.rs

Lines changed: 2 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,6 @@ pub enum Feature {
3333
VirtualColumn,
3434
#[serde(alias = "data_mask", alias = "DATA_MASK")]
3535
DataMask,
36-
#[serde(alias = "aggregate_index", alias = "AGGREGATE_INDEX")]
37-
AggregateIndex,
38-
#[serde(alias = "inverted_index", alias = "INVERTED_INDEX")]
39-
InvertedIndex,
4036
#[serde(alias = "computed_column", alias = "COMPUTED_COLUMN")]
4137
ComputedColumn,
4238
#[serde(alias = "storage_encryption", alias = "STORAGE_ENCRYPTION")]
@@ -51,14 +47,10 @@ pub enum Feature {
5147
HilbertClustering,
5248
#[serde(alias = "system_management", alias = "SYSTEM_MANAGEMENT")]
5349
SystemManagement,
54-
#[serde(alias = "ngram_index", alias = "NGRAM_INDEX")]
55-
NgramIndex,
5650
#[serde(alias = "workload_group", alias = "WORKLOAD_GROUP")]
5751
WorkloadGroup,
5852
#[serde(alias = "system_history", alias = "SYSTEM_HISTORY")]
5953
SystemHistory,
60-
#[serde(alias = "vector_index", alias = "VECTOR_INDEX")]
61-
VectorIndex,
6254
#[serde(alias = "private_task", alias = "PRIVATE_TASK")]
6355
PrivateTask,
6456
#[serde(alias = "max_node_quota", alias = "MAX_NODE_QUOTA")]
@@ -85,19 +77,15 @@ impl fmt::Display for Feature {
8577
Feature::Test => write!(f, "test"),
8678
Feature::VirtualColumn => write!(f, "virtual_column"),
8779
Feature::DataMask => write!(f, "data_mask"),
88-
Feature::AggregateIndex => write!(f, "aggregate_index"),
89-
Feature::InvertedIndex => write!(f, "inverted_index"),
9080
Feature::ComputedColumn => write!(f, "computed_column"),
9181
Feature::StorageEncryption => write!(f, "storage_encryption"),
9282
Feature::Stream => write!(f, "stream"),
9383
Feature::AttacheTable => write!(f, "attach_table"),
9484
Feature::AmendTable => write!(f, "amend_table"),
9585
Feature::SystemManagement => write!(f, "system_management"),
9686
Feature::HilbertClustering => write!(f, "hilbert_clustering"),
97-
Feature::NgramIndex => write!(f, "ngram_index"),
9887
Feature::WorkloadGroup => write!(f, "workload_group"),
9988
Feature::SystemHistory => write!(f, "system_history"),
100-
Feature::VectorIndex => write!(f, "vector_index"),
10189
Feature::PrivateTask => write!(f, "private_task"),
10290
Feature::RowAccessPolicy => write!(f, "row_access_policy"),
10391
Feature::Unknown => write!(f, "unknown"),
@@ -126,20 +114,16 @@ impl Feature {
126114
false => Ok(VerifyResult::Failure),
127115
},
128116
(Feature::Test, Feature::Test)
129-
| (Feature::AggregateIndex, Feature::AggregateIndex)
130117
| (Feature::ComputedColumn, Feature::ComputedColumn)
131118
| (Feature::Vacuum, Feature::Vacuum)
132119
| (Feature::LicenseInfo, Feature::LicenseInfo)
133120
| (Feature::Stream, Feature::Stream)
134121
| (Feature::DataMask, Feature::DataMask)
135122
| (Feature::RowAccessPolicy, Feature::RowAccessPolicy)
136-
| (Feature::InvertedIndex, Feature::InvertedIndex)
137123
| (Feature::VirtualColumn, Feature::VirtualColumn)
138124
| (Feature::AttacheTable, Feature::AttacheTable)
139125
| (Feature::StorageEncryption, Feature::StorageEncryption)
140-
| (Feature::HilbertClustering, Feature::HilbertClustering)
141-
| (Feature::NgramIndex, Feature::NgramIndex)
142-
| (Feature::VectorIndex, Feature::VectorIndex) => Ok(VerifyResult::Success),
126+
| (Feature::HilbertClustering, Feature::HilbertClustering) => Ok(VerifyResult::Success),
143127
(_, _) => Ok(VerifyResult::MissMatch),
144128
}
145129
}
@@ -230,14 +214,6 @@ mod tests {
230214
Feature::DataMask,
231215
serde_json::from_str::<Feature>("\"DataMask\"").unwrap()
232216
);
233-
assert_eq!(
234-
Feature::AggregateIndex,
235-
serde_json::from_str::<Feature>("\"AggregateIndex\"").unwrap()
236-
);
237-
assert_eq!(
238-
Feature::InvertedIndex,
239-
serde_json::from_str::<Feature>("\"InvertedIndex\"").unwrap()
240-
);
241217
assert_eq!(
242218
Feature::ComputedColumn,
243219
serde_json::from_str::<Feature>("\"ComputedColumn\"").unwrap()
@@ -265,11 +241,6 @@ mod tests {
265241
serde_json::from_str::<Feature>("\"hilbert_clustering\"").unwrap()
266242
);
267243

268-
assert_eq!(
269-
Feature::NgramIndex,
270-
serde_json::from_str::<Feature>("\"NgramIndex\"").unwrap()
271-
);
272-
273244
assert_eq!(
274245
Feature::WorkloadGroup,
275246
serde_json::from_str::<Feature>("\"workload_group\"").unwrap()
@@ -280,11 +251,6 @@ mod tests {
280251
serde_json::from_str::<Feature>("\"system_history\"").unwrap()
281252
);
282253

283-
assert_eq!(
284-
Feature::VectorIndex,
285-
serde_json::from_str::<Feature>("\"VectorIndex\"").unwrap()
286-
);
287-
288254
assert_eq!(
289255
Feature::PrivateTask,
290256
serde_json::from_str::<Feature>("\"private_task\"").unwrap()
@@ -318,15 +284,12 @@ mod tests {
318284
Feature::Test,
319285
Feature::VirtualColumn,
320286
Feature::DataMask,
321-
Feature::AggregateIndex,
322-
Feature::InvertedIndex,
323287
Feature::ComputedColumn,
324288
Feature::StorageEncryption,
325289
Feature::Stream,
326290
Feature::AttacheTable,
327291
Feature::AmendTable,
328292
Feature::HilbertClustering,
329-
Feature::NgramIndex,
330293
Feature::WorkloadGroup,
331294
Feature::SystemHistory,
332295
Feature::PrivateTask,
@@ -335,7 +298,7 @@ mod tests {
335298
};
336299

337300
assert_eq!(
338-
"LicenseInfo{ type: enterprise, org: databend, tenants: [databend_tenant,foo], features: [aggregate_index,amend_table,attach_table,computed_column,data_mask,hilbert_clustering,inverted_index,license_info,ngram_index,private_task,row_access_policy,storage_encryption,stream,system_history,vacuum,virtual_column,workload_group] }",
301+
"LicenseInfo{ type: enterprise, org: databend, tenants: [databend_tenant,foo], features: [amend_table,attach_table,computed_column,data_mask,hilbert_clustering,license_info,private_task,row_access_policy,storage_encryption,stream,system_history,vacuum,virtual_column,workload_group] }",
339302
license_info.to_string()
340303
);
341304
}

src/query/ee/Cargo.toml

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ async-trait = { workspace = true }
1313
base64 = { workspace = true }
1414
chrono = { workspace = true }
1515
dashmap = { workspace = true }
16-
databend-common-ast = { workspace = true }
1716
databend-common-base = { workspace = true }
1817
databend-common-catalog = { workspace = true }
1918
databend-common-config = { workspace = true }
@@ -36,7 +35,6 @@ databend-common-storages-fuse = { workspace = true }
3635
databend-common-storages-stream = { workspace = true }
3736
databend-common-tracing = { workspace = true }
3837
databend-common-version = { workspace = true }
39-
databend-enterprise-aggregating-index = { workspace = true }
4038
databend-enterprise-attach-table = { workspace = true }
4139
databend-enterprise-data-mask-feature = { workspace = true }
4240
databend-enterprise-fail-safe = { workspace = true }
@@ -45,15 +43,12 @@ databend-enterprise-resources-management = { workspace = true }
4543
databend-enterprise-row-access-policy-feature = { workspace = true }
4644
databend-enterprise-storage-encryption = { workspace = true }
4745
databend-enterprise-stream-handler = { workspace = true }
48-
databend-enterprise-table-index = { workspace = true }
4946
databend-enterprise-vacuum-handler = { workspace = true }
5047
databend-enterprise-virtual-column = { workspace = true }
5148
databend-query = { workspace = true }
5249
databend-storages-common-cache = { workspace = true }
5350
databend-storages-common-io = { workspace = true }
54-
databend-storages-common-pruner = { workspace = true }
5551
databend-storages-common-table-meta = { workspace = true }
56-
derive-visitor = { workspace = true }
5752
futures = { workspace = true }
5853
futures-util = { workspace = true }
5954
jwt-simple = { workspace = true }

src/query/ee/src/aggregating_index/aggregating_index_handler.rs

Lines changed: 0 additions & 74 deletions
This file was deleted.

src/query/ee/src/aggregating_index/mod.rs

Lines changed: 0 additions & 16 deletions
This file was deleted.

0 commit comments

Comments
 (0)