Skip to content

Commit f89ef80

Browse files
JackTan25JackTan25
committed
Merge branch 'main' of https://github.com/datafuselabs/databend into import_upper_optimizer_for_merge_into
2 parents 805efcd + 629ee7b commit f89ef80

File tree

1,982 files changed

+21047
-20792
lines changed

Some content is hidden

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

1,982 files changed

+21047
-20792
lines changed

‎Cargo.lock

+2,022-2,022
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/bendpy/Cargo.toml

+6-6
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,12 @@ crate-type = ["cdylib"]
1919
arrow = { workspace = true, features = ["pyarrow"] }
2020
arrow-schema = { workspace = true }
2121

22-
common-config = { path = "../query/config" }
23-
common-exception = { path = "../common/exception" }
24-
common-expression = { path = "../query/expression" }
25-
common-license = { path = "../common/license" }
26-
common-meta-app = { path = "../meta/app" }
27-
common-meta-embedded = { path = "../meta/embedded" }
22+
databend-common-config = { path = "../query/config" }
23+
databend-common-exception = { path = "../common/exception" }
24+
databend-common-expression = { path = "../query/expression" }
25+
databend-common-license = { path = "../common/license" }
26+
databend-common-meta-app = { path = "../meta/app" }
27+
databend-common-meta-embedded = { path = "../meta/embedded" }
2828
databend-query = { path = "../query/service", features = [
2929
"simd",
3030
"disable_initial_exec_tls",

‎src/bendpy/src/context.rs

+4-4
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@
1414

1515
use std::sync::Arc;
1616

17-
use common_exception::Result;
18-
use common_meta_app::principal::GrantObject;
19-
use common_meta_app::principal::UserInfo;
20-
use common_meta_app::principal::UserPrivilegeSet;
17+
use databend_common_exception::Result;
18+
use databend_common_meta_app::principal::GrantObject;
19+
use databend_common_meta_app::principal::UserInfo;
20+
use databend_common_meta_app::principal::UserPrivilegeSet;
2121
use databend_query::sessions::QueryContext;
2222
use databend_query::sessions::Session;
2323
use databend_query::sessions::SessionManager;

‎src/bendpy/src/datablock.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
use common_expression::block_debug::box_render;
16-
use common_expression::DataBlock;
17-
use common_expression::DataSchemaRef;
15+
use databend_common_expression::block_debug::box_render;
16+
use databend_common_expression::DataBlock;
17+
use databend_common_expression::DataSchemaRef;
1818
use pyo3::prelude::*;
1919

2020
use crate::dataframe::PyBoxSize;

‎src/bendpy/src/dataframe.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ use std::sync::Arc;
1717
use arrow::pyarrow::PyArrowType;
1818
use arrow::pyarrow::ToPyArrow;
1919
use arrow_schema::Schema as ArrowSchema;
20-
use common_exception::Result;
21-
use common_expression::DataBlock;
20+
use databend_common_exception::Result;
21+
use databend_common_expression::DataBlock;
2222
use databend_query::interpreters::InterpreterFactory;
2323
use databend_query::sessions::QueryContext;
2424
use databend_query::sql::plans::Plan;

‎src/bendpy/src/lib.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ mod utils;
2323
use std::env;
2424
use std::path::Path;
2525

26-
use common_config::Config;
27-
use common_config::InnerConfig;
28-
use common_license::license_manager::LicenseManager;
29-
use common_license::license_manager::OssLicenseManager;
30-
use common_meta_app::storage::StorageFsConfig;
31-
use common_meta_app::storage::StorageParams;
32-
use common_meta_embedded::MetaEmbedded;
26+
use databend_common_config::Config;
27+
use databend_common_config::InnerConfig;
28+
use databend_common_license::license_manager::LicenseManager;
29+
use databend_common_license::license_manager::OssLicenseManager;
30+
use databend_common_meta_app::storage::StorageFsConfig;
31+
use databend_common_meta_app::storage::StorageParams;
32+
use databend_common_meta_embedded::MetaEmbedded;
3333
use databend_query::clusters::ClusterDiscovery;
3434
use databend_query::GlobalServices;
3535
use pyo3::prelude::*;

‎src/bendpy/src/schema.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
use common_expression::DataSchemaRef;
15+
use databend_common_expression::DataSchemaRef;
1616
use pyo3::prelude::*;
1717

1818
#[pyclass(name = "Schema", module = "databend", subclass)]

‎src/binaries/Cargo.toml

+31-27
Original file line numberDiff line numberDiff line change
@@ -9,48 +9,52 @@ edition = { workspace = true }
99

1010
[features]
1111
default = ["simd", "jemalloc", "z3-prove"]
12-
memory-profiling = ["databend-meta/memory-profiling", "databend-query/memory-profiling", "common-base/memory-profiling"]
12+
memory-profiling = [
13+
"databend-meta/memory-profiling",
14+
"databend-query/memory-profiling",
15+
"databend-common-base/memory-profiling",
16+
]
1317
simd = ["databend-meta/simd", "databend-query/simd"]
1418
z3-prove = ["databend-query/z3-prove"]
15-
jemalloc = ["common-base/jemalloc"]
19+
jemalloc = ["databend-common-base/jemalloc"]
1620
tokio-console = [
1721
"databend-meta/tokio-console",
1822
"databend-query/io-uring",
19-
"common-base/tracing",
20-
"common-tracing/console",
23+
"databend-common-base/tracing",
24+
"databend-common-tracing/console",
2125
]
2226
io-uring = [
2327
"databend-meta/io-uring",
2428
"databend-query/io-uring",
25-
"common-meta-store/io-uring",
26-
"common-meta-sled-store/io-uring",
27-
"common-meta-raft-store/io-uring",
29+
"databend-common-meta-store/io-uring",
30+
"databend-common-meta-sled-store/io-uring",
31+
"databend-common-meta-raft-store/io-uring",
2832
]
2933

3034
[dependencies]
3135
# Workspace dependencies
32-
common-base = { path = "../common/base" }
33-
common-config = { path = "../query/config" }
34-
common-exception = { path = "../common/exception" }
35-
common-grpc = { path = "../common/grpc" }
36-
common-license = { path = "../common/license" }
37-
common-meta-api = { path = "../meta/api" }
38-
common-meta-app = { path = "../meta/app" }
39-
common-meta-client = { path = "../meta/client" }
40-
common-meta-kvapi = { path = "../meta/kvapi" }
41-
common-meta-raft-store = { path = "../meta/raft-store" }
42-
common-meta-sled-store = { path = "../meta/sled-store" }
43-
common-meta-store = { path = "../meta/store" }
44-
common-meta-types = { path = "../meta/types" }
45-
common-storage = { path = "../common/storage" }
46-
common-tracing = { path = "../common/tracing" }
36+
databend-common-base = { path = "../common/base" }
37+
databend-common-config = { path = "../query/config" }
38+
databend-common-exception = { path = "../common/exception" }
39+
databend-common-grpc = { path = "../common/grpc" }
40+
databend-common-license = { path = "../common/license" }
41+
databend-common-meta-api = { path = "../meta/api" }
42+
databend-common-meta-app = { path = "../meta/app" }
43+
databend-common-meta-client = { path = "../meta/client" }
44+
databend-common-meta-kvapi = { path = "../meta/kvapi" }
45+
databend-common-meta-raft-store = { path = "../meta/raft-store" }
46+
databend-common-meta-sled-store = { path = "../meta/sled-store" }
47+
databend-common-meta-store = { path = "../meta/store" }
48+
databend-common-meta-types = { path = "../meta/types" }
49+
databend-common-storage = { path = "../common/storage" }
50+
databend-common-tracing = { path = "../common/tracing" }
51+
databend-enterprise-query = { path = "../query/ee" }
4752
databend-meta = { path = "../meta/service" }
4853
databend-query = { path = "../query/service" }
49-
enterprise-query = { path = "../query/ee" }
50-
# enterprise-meta = { path = "../meta/ee" }
51-
background-service = { path = "../query/ee_features/background_service" }
52-
sharing-endpoint = { path = "../query/sharing_endpoint" }
53-
storages-common-table-meta = { path = "../query/storages/common/table_meta" }
54+
# databend-enterprise-meta = { path = "../meta/ee" }
55+
databend-enterprise-background-service = { path = "../query/ee_features/background_service" }
56+
databend-sharing-endpoint = { path = "../query/sharing_endpoint" }
57+
databend-storages-common-table-meta = { path = "../query/storages/common/table_meta" }
5458
# Crates.io dependencies
5559
anyerror = { workspace = true }
5660
anyhow = { workspace = true }

‎src/binaries/meta/ee_main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
mod entry;
1717
mod kvapi;
1818

19-
use common_base::mem_allocator::GlobalAllocator;
19+
use databend_common_base::mem_allocator::GlobalAllocator;
2020
use databend_meta::configs::Config;
2121

2222
#[global_allocator]

‎src/binaries/meta/entry.rs

+16-16
Original file line numberDiff line numberDiff line change
@@ -19,21 +19,21 @@ use std::sync::Arc;
1919
use std::time::Duration;
2020

2121
use anyerror::AnyError;
22-
use common_base::base::StopHandle;
23-
use common_base::base::Stoppable;
24-
use common_grpc::RpcClientConf;
25-
use common_meta_raft_store::ondisk::OnDisk;
26-
use common_meta_raft_store::ondisk::DATA_VERSION;
27-
use common_meta_sled_store::get_sled_db;
28-
use common_meta_sled_store::init_sled_db;
29-
use common_meta_sled_store::openraft::MessageSummary;
30-
use common_meta_store::MetaStoreProvider;
31-
use common_meta_types::Cmd;
32-
use common_meta_types::LogEntry;
33-
use common_meta_types::MetaAPIError;
34-
use common_meta_types::Node;
35-
use common_tracing::init_logging;
36-
use common_tracing::set_panic_hook;
22+
use databend_common_base::base::StopHandle;
23+
use databend_common_base::base::Stoppable;
24+
use databend_common_grpc::RpcClientConf;
25+
use databend_common_meta_raft_store::ondisk::OnDisk;
26+
use databend_common_meta_raft_store::ondisk::DATA_VERSION;
27+
use databend_common_meta_sled_store::get_sled_db;
28+
use databend_common_meta_sled_store::init_sled_db;
29+
use databend_common_meta_sled_store::openraft::MessageSummary;
30+
use databend_common_meta_store::MetaStoreProvider;
31+
use databend_common_meta_types::Cmd;
32+
use databend_common_meta_types::LogEntry;
33+
use databend_common_meta_types::MetaAPIError;
34+
use databend_common_meta_types::Node;
35+
use databend_common_tracing::init_logging;
36+
use databend_common_tracing::set_panic_hook;
3737
use databend_meta::api::GrpcServer;
3838
use databend_meta::api::HttpService;
3939
use databend_meta::configs::Config;
@@ -66,7 +66,7 @@ pub async fn entry(conf: Config) -> anyhow::Result<()> {
6666
.unwrap_or_else(|_| panic!("`{}` was defined but could not be parsed", s))
6767
});
6868
_sentry_guard = Some(sentry::init((bend_sentry_env, sentry::ClientOptions {
69-
release: common_tracing::databend_semver!(),
69+
release: databend_common_tracing::databend_semver!(),
7070
traces_sample_rate,
7171
..Default::default()
7272
})));

‎src/binaries/meta/kvapi.rs

+6-6
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,12 @@
1414

1515
use std::sync::Arc;
1616

17-
use common_meta_kvapi::kvapi;
18-
use common_meta_kvapi::kvapi::UpsertKVReq;
19-
use common_meta_types::KVMeta;
20-
use common_meta_types::MetaError;
21-
use common_meta_types::SeqV;
22-
use common_meta_types::With;
17+
use databend_common_meta_kvapi::kvapi;
18+
use databend_common_meta_kvapi::kvapi::UpsertKVReq;
19+
use databend_common_meta_types::KVMeta;
20+
use databend_common_meta_types::MetaError;
21+
use databend_common_meta_types::SeqV;
22+
use databend_common_meta_types::With;
2323
use databend_meta::configs::Config;
2424

2525
pub enum KvApiCommand {

‎src/binaries/meta/oss_main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
mod entry;
1616
mod kvapi;
1717

18-
use common_base::mem_allocator::GlobalAllocator;
18+
use databend_common_base::mem_allocator::GlobalAllocator;
1919
use databend_meta::configs::Config;
2020

2121
#[global_allocator]

‎src/binaries/metabench/main.rs

+24-24
Original file line numberDiff line numberDiff line change
@@ -23,29 +23,29 @@ use std::time::Instant;
2323

2424
use chrono::Utc;
2525
use clap::Parser;
26-
use common_base::base::tokio;
27-
use common_meta_api::serialize_struct;
28-
use common_meta_api::txn_op_put;
29-
use common_meta_api::SchemaApi;
30-
use common_meta_app::schema::CreateDatabaseReq;
31-
use common_meta_app::schema::CreateTableReq;
32-
use common_meta_app::schema::DatabaseNameIdent;
33-
use common_meta_app::schema::DropTableByIdReq;
34-
use common_meta_app::schema::GetTableReq;
35-
use common_meta_app::schema::TableCopiedFileInfo;
36-
use common_meta_app::schema::TableCopiedFileNameIdent;
37-
use common_meta_app::schema::TableNameIdent;
38-
use common_meta_app::schema::UpsertTableOptionReq;
39-
use common_meta_client::ClientHandle;
40-
use common_meta_client::MetaGrpcClient;
41-
use common_meta_kvapi::kvapi::KVApi;
42-
use common_meta_kvapi::kvapi::UpsertKVReq;
43-
use common_meta_types::MatchSeq;
44-
use common_meta_types::Operation;
45-
use common_meta_types::TxnRequest;
46-
use common_tracing::init_logging;
47-
use common_tracing::FileConfig;
48-
use common_tracing::StderrConfig;
26+
use databend_common_base::base::tokio;
27+
use databend_common_meta_api::serialize_struct;
28+
use databend_common_meta_api::txn_op_put;
29+
use databend_common_meta_api::SchemaApi;
30+
use databend_common_meta_app::schema::CreateDatabaseReq;
31+
use databend_common_meta_app::schema::CreateTableReq;
32+
use databend_common_meta_app::schema::DatabaseNameIdent;
33+
use databend_common_meta_app::schema::DropTableByIdReq;
34+
use databend_common_meta_app::schema::GetTableReq;
35+
use databend_common_meta_app::schema::TableCopiedFileInfo;
36+
use databend_common_meta_app::schema::TableCopiedFileNameIdent;
37+
use databend_common_meta_app::schema::TableNameIdent;
38+
use databend_common_meta_app::schema::UpsertTableOptionReq;
39+
use databend_common_meta_client::ClientHandle;
40+
use databend_common_meta_client::MetaGrpcClient;
41+
use databend_common_meta_kvapi::kvapi::KVApi;
42+
use databend_common_meta_kvapi::kvapi::UpsertKVReq;
43+
use databend_common_meta_types::MatchSeq;
44+
use databend_common_meta_types::Operation;
45+
use databend_common_meta_types::TxnRequest;
46+
use databend_common_tracing::init_logging;
47+
use databend_common_tracing::FileConfig;
48+
use databend_common_tracing::StderrConfig;
4949
use databend_meta::version::METASRV_COMMIT_VERSION;
5050
use serde::Deserialize;
5151
use serde::Serialize;
@@ -83,7 +83,7 @@ struct Config {
8383
async fn main() {
8484
let config = Config::parse();
8585

86-
let log_config = common_tracing::Config {
86+
let log_config = databend_common_tracing::Config {
8787
file: FileConfig {
8888
on: true,
8989
level: config.log_level.clone(),

‎src/binaries/metactl/grpc.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ use std::fs::File;
1616
use std::io::Write;
1717
use std::time::Duration;
1818

19-
use common_meta_client::MetaGrpcClient;
20-
use common_meta_raft_store::key_spaces::RaftStoreEntry;
21-
use common_meta_types::protobuf::Empty;
19+
use databend_common_meta_client::MetaGrpcClient;
20+
use databend_common_meta_raft_store::key_spaces::RaftStoreEntry;
21+
use databend_common_meta_types::protobuf::Empty;
2222
use tokio_stream::StreamExt;
2323

2424
pub async fn export_meta(addr: &str, save: String) -> anyhow::Result<()> {

‎src/binaries/metactl/main.rs

+7-7
Original file line numberDiff line numberDiff line change
@@ -23,13 +23,13 @@ use std::collections::BTreeMap;
2323
use std::time::Duration;
2424

2525
use clap::Parser;
26-
use common_base::base::tokio;
27-
use common_meta_client::MetaGrpcClient;
28-
use common_meta_kvapi::kvapi::KVApi;
29-
use common_meta_raft_store::config::RaftConfig;
30-
use common_tracing::init_logging;
31-
use common_tracing::Config as LogConfig;
32-
use common_tracing::FileConfig;
26+
use databend_common_base::base::tokio;
27+
use databend_common_meta_client::MetaGrpcClient;
28+
use databend_common_meta_kvapi::kvapi::KVApi;
29+
use databend_common_meta_raft_store::config::RaftConfig;
30+
use databend_common_tracing::init_logging;
31+
use databend_common_tracing::Config as LogConfig;
32+
use databend_common_tracing::FileConfig;
3333
use databend_meta::version::METASRV_COMMIT_VERSION;
3434
use serde::Deserialize;
3535
use serde::Serialize;

0 commit comments

Comments
 (0)