Skip to content

Commit 4c430bb

Browse files
authored
Merge branch 'main' into fix-left-join-null
2 parents 560525e + 6bd5904 commit 4c430bb

File tree

125 files changed

+1395
-2183
lines changed

Some content is hidden

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

125 files changed

+1395
-2183
lines changed

Cargo.lock

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

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ Databend uses the latest techniques in vectorized query processing to allow you
6565
Databend leverages data-level parallelism(Vectorized Query Execution) and instruction-level parallelism(SIMD) technology, offering blazing performance data analytics.
6666

6767

68-
- __Git-like Storage__
68+
- __Git-like MVCC Storage__
6969

7070
Databend stores data with snapshots. It's easy to query, clone, and restore historical data in tables.
7171

docs/doc/00-overview/index.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Databend uses the latest techniques in vectorized query processing to allow you
2525

2626
- __Easy to Use__
2727

28-
Databend has no indexes to build, no manual tuning required, no manual figuring out partitions or shard data, it’s all done for you as data is loaded into the table.
28+
No manual tuning is required. You don't need to manually index, partition, or shard the data. Once you load your data into a table, Databend will handle everything else.
2929

3030
## Design Overview
3131

scripts/ci/deploy/databend-query-cluster-3-nodes.sh

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,21 @@ echo 'Start Meta service HA cluster(3 nodes)...'
3030
nohup ./target/${BUILD_PROFILE}/databend-meta -c scripts/ci/deploy/config/databend-meta-node-1.toml &
3131
python3 scripts/ci/wait_tcp.py --timeout 10 --port 9191
3232

33+
# wait for cluster formation to complete.
34+
sleep 1
35+
3336
nohup ./target/${BUILD_PROFILE}/databend-meta -c scripts/ci/deploy/config/databend-meta-node-2.toml &
3437
python3 scripts/ci/wait_tcp.py --timeout 10 --port 28202
3538

39+
# wait for cluster formation to complete.
40+
sleep 1
41+
3642
nohup ./target/${BUILD_PROFILE}/databend-meta -c scripts/ci/deploy/config/databend-meta-node-3.toml &
3743
python3 scripts/ci/wait_tcp.py --timeout 10 --port 28302
3844

45+
# wait for cluster formation to complete.
46+
sleep 1
47+
3948
echo 'Start databend-query node-1'
4049
env "RUST_BACKTRACE=1" nohup target/${BUILD_PROFILE}/databend-query -c scripts/ci/deploy/config/databend-query-node-1.toml &
4150

src/binaries/query/main.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414

1515
use std::env;
1616

17-
use common_base::base::Runtime;
18-
use common_base::base::GLOBAL_MEM_STAT;
17+
use common_base::runtime::Runtime;
18+
use common_base::runtime::GLOBAL_MEM_STAT;
1919
use common_config::Config;
2020
use common_config::DATABEND_COMMIT_VERSION;
2121
use common_config::QUERY_SEMVER;
@@ -180,9 +180,9 @@ async fn main_entrypoint() -> Result<()> {
180180

181181
// Cluster register.
182182
{
183-
let cluster_discovery = ClusterDiscovery::instance();
184-
let register_to_metastore = cluster_discovery.register_to_metastore(&conf);
185-
register_to_metastore.await?;
183+
ClusterDiscovery::instance()
184+
.register_to_metastore(&conf)
185+
.await?;
186186
info!(
187187
"Databend query has been registered:{:?} to metasrv:{:?}.",
188188
conf.query.cluster_id, conf.meta.endpoints

src/common/base/Cargo.toml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@ async-channel = "1.7.1"
3030
async-trait = "0.1.57"
3131
bytesize = "1.1.0"
3232
ctrlc = { version = "3.2.3", features = ["termination"] }
33+
enquote = "1.1.0"
3334
futures = "0.3.24"
3435
libc = "0.2.133"
3536
num_cpus = "1.13.1"
3637
once_cell = "1.15.0"
38+
parking_lot = "0.12"
3739
pin-project-lite = "0.2.9"
3840
pprof = { version = "0.10.1", features = [
3941
"flamegraph",
@@ -42,6 +44,7 @@ pprof = { version = "0.10.1", features = [
4244
] }
4345
semver = "1.0.10"
4446
serde = { workspace = true }
47+
state = "0.5"
4548
tikv-jemalloc-ctl = { version = "0.5.0", optional = true }
4649
tikv-jemalloc-sys = "0.5.2"
4750
tokio = { version = "1.21.1", features = ["full"] }

src/common/base/src/base/mod.rs

Lines changed: 9 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -12,55 +12,38 @@
1212
// See the License for the specific language governing permissions and
1313
// limitations under the License.
1414

15-
mod catch_unwind;
16-
mod global_runtime;
1715
mod net;
1816
mod profiling;
1917
mod progress;
20-
mod runtime;
21-
mod runtime_tracker;
2218
mod select;
2319
mod shutdown_signal;
2420
mod singleton_instance;
2521
mod stop_handle;
2622
mod stoppable;
27-
mod string_func;
28-
mod thread;
29-
mod thread_pool;
23+
mod string;
3024
mod uniq_id;
3125

32-
pub use catch_unwind::catch_unwind;
33-
pub use global_runtime::GlobalIORuntime;
3426
pub use net::get_free_tcp_port;
3527
pub use net::get_free_udp_port;
3628
pub use profiling::Profiling;
3729
pub use progress::Progress;
3830
pub use progress::ProgressValues;
39-
pub use runtime::Dropper;
40-
pub use runtime::Runtime;
41-
pub use runtime::TrySpawn;
42-
pub use runtime_tracker::MemStat;
43-
pub use runtime_tracker::ThreadTracker;
44-
pub use runtime_tracker::TrackedFuture;
45-
pub use runtime_tracker::GLOBAL_MEM_STAT;
4631
pub use select::select3;
4732
pub use select::Select3Output;
4833
pub use shutdown_signal::signal_stream;
4934
pub use shutdown_signal::DummySignalStream;
5035
pub use shutdown_signal::SignalStream;
5136
pub use shutdown_signal::SignalType;
52-
pub use singleton_instance::Singleton;
53-
pub use singleton_instance::SingletonImpl;
37+
pub use singleton_instance::GlobalInstance;
5438
pub use stop_handle::StopHandle;
5539
pub use stoppable::Stoppable;
56-
pub use string_func::escape_for_key;
57-
pub use string_func::mask_string;
58-
pub use string_func::replace_nth_char;
59-
pub use string_func::unescape_for_key;
60-
pub use thread::Thread;
61-
pub use thread::ThreadJoinHandle;
62-
pub use thread_pool::TaskJoinHandler;
63-
pub use thread_pool::ThreadPool;
40+
pub use string::convert_byte_size;
41+
pub use string::convert_number_size;
42+
pub use string::escape_for_key;
43+
pub use string::mask_string;
44+
pub use string::replace_nth_char;
45+
pub use string::unescape_for_key;
46+
pub use string::unescape_string;
6447
pub use tokio;
6548
pub use uniq_id::GlobalSequence;
6649
pub use uniq_id::GlobalUniqName;

0 commit comments

Comments
 (0)