This is an automated email from the ASF dual-hosted git repository.
jiacai2050 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/horaedb.git
The following commit(s) were added to refs/heads/main by this push:
new 9e81c4ed chore: bump to v2.2.0-dev (#1598)
9e81c4ed is described below
commit 9e81c4ed5df1998cbd210dc48fc67b6b7405a553
Author: Jiacai Liu <d...@liujiacai.net>
AuthorDate: Fri Nov 22 11:13:12 2024 +0800
chore: bump to v2.2.0-dev (#1598)
## Rationale
Begin next dev cycle
## Detailed Changes
- WAL default to local disk
## Test Plan
CI
---
Cargo.lock | 124 ++++++++++-----------
Cargo.toml | 2 +-
integration_tests/cases/env/cluster/config.toml | 50 ---------
.../cases/env/compaction_offload/config.toml | 44 --------
integration_tests/cases/env/local/config.toml | 39 -------
src/analytic_engine/src/lib.rs | 3 +-
src/components/object_store/src/disk_cache.rs | 1 +
src/wal/src/config.rs | 2 +-
8 files changed, 67 insertions(+), 198 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index ce8fd3f3..273a8968 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -67,7 +67,7 @@ dependencies = [
[[package]]
name = "alloc_tracker"
-version = "2.1.0"
+version = "2.2.0-dev"
[[package]]
name = "allocator-api2"
@@ -77,7 +77,7 @@ checksum =
"0942ffc6dcaadf03badf6e6a2d0228460359d5e34b57ccdc720b7382dfbd5ec5"
[[package]]
name = "analytic_engine"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"anyhow",
"arc-swap 1.6.0",
@@ -110,7 +110,7 @@ dependencies = [
"message_queue",
"meta_client",
"metric_ext",
- "object_store 2.1.0",
+ "object_store 2.2.0-dev",
"parquet",
"parquet_ext",
"pin-project-lite",
@@ -243,7 +243,7 @@ checksum =
"bddcadddf5e9015d310179a59bb28c4d4b9920ad0f11e8e14dbadf654890c9a6"
[[package]]
name = "arena"
-version = "2.1.0"
+version = "2.2.0-dev"
[[package]]
name = "array-init"
@@ -688,7 +688,7 @@ dependencies = [
[[package]]
name = "arrow_ext"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"arrow 49.0.0",
"serde",
@@ -957,7 +957,7 @@ dependencies = [
[[package]]
name = "benchmarks"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"analytic_engine",
"arena",
@@ -972,7 +972,7 @@ dependencies = [
"generic_error",
"logger",
"macros",
- "object_store 2.1.0",
+ "object_store 2.2.0-dev",
"parquet",
"parquet_ext",
"pprof",
@@ -1244,7 +1244,7 @@ checksum =
"8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
[[package]]
name = "bytes_ext"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"bytes",
"snafu 0.6.10",
@@ -1310,7 +1310,7 @@ checksum =
"37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5"
[[package]]
name = "catalog"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"async-trait",
"common_types",
@@ -1325,7 +1325,7 @@ dependencies = [
[[package]]
name = "catalog_impls"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"analytic_engine",
"async-trait",
@@ -1496,7 +1496,7 @@ checksum =
"b8191fa7302e03607ff0e237d4246cc043ff5b3cb9409d995172ba3bea16b807"
[[package]]
name = "cluster"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"async-trait",
"bytes_ext",
@@ -1531,7 +1531,7 @@ dependencies = [
[[package]]
name = "codec"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"bytes_ext",
"common_types",
@@ -1580,7 +1580,7 @@ dependencies = [
[[package]]
name = "common_types"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"arrow 49.0.0",
"arrow_ext",
@@ -2364,7 +2364,7 @@ dependencies = [
[[package]]
name = "df_engine_extensions"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"arrow 49.0.0",
"async-recursion",
@@ -2389,7 +2389,7 @@ dependencies = [
[[package]]
name = "df_operator"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"arrow 49.0.0",
"base64 0.13.1",
@@ -2749,7 +2749,7 @@ checksum =
"e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
[[package]]
name = "future_ext"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"futures 0.3.28",
"lazy_static",
@@ -2921,7 +2921,7 @@ dependencies = [
[[package]]
name = "generic_error"
-version = "2.1.0"
+version = "2.2.0-dev"
[[package]]
name = "getrandom"
@@ -3004,7 +3004,7 @@ dependencies = [
[[package]]
name = "hash_ext"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"ahash 0.8.3",
"byteorder",
@@ -3134,7 +3134,7 @@ dependencies = [
[[package]]
name = "horaectl"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"anyhow",
"chrono",
@@ -3149,7 +3149,7 @@ dependencies = [
[[package]]
name = "horaedb"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"analytic_engine",
"catalog",
@@ -3201,7 +3201,7 @@ dependencies = [
[[package]]
name = "horaedb-test"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"anyhow",
"async-trait",
@@ -3466,7 +3466,7 @@ dependencies = [
[[package]]
name = "id_allocator"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"generic_error",
"tokio",
@@ -3581,7 +3581,7 @@ checksum =
"8bb03732005da905c88227371639bf1ad885cc712789c011c31c5fb3ab3ccf02"
[[package]]
name = "interpreters"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"analytic_engine",
"arrow 49.0.0",
@@ -3990,7 +3990,7 @@ dependencies = [
[[package]]
name = "logger"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"chrono",
"log",
@@ -4071,7 +4071,7 @@ dependencies = [
[[package]]
name = "macros"
-version = "2.1.0"
+version = "2.2.0-dev"
[[package]]
name = "matchers"
@@ -4148,7 +4148,7 @@ dependencies = [
[[package]]
name = "message_queue"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"async-trait",
"chrono",
@@ -4165,7 +4165,7 @@ dependencies = [
[[package]]
name = "meta_client"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"async-trait",
"common_types",
@@ -4188,7 +4188,7 @@ dependencies = [
[[package]]
name = "metric_ext"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"crossbeam-utils",
"serde",
@@ -4517,7 +4517,7 @@ dependencies = [
[[package]]
name = "notifier"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"tokio",
]
@@ -4700,7 +4700,7 @@ dependencies = [
[[package]]
name = "object_store"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"async-trait",
"bytes",
@@ -4885,7 +4885,7 @@ checksum =
"b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
[[package]]
name = "panic_ext"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"backtrace",
"gag",
@@ -4997,7 +4997,7 @@ dependencies = [
[[package]]
name = "parquet_ext"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"arrow 49.0.0",
"arrow_ext",
@@ -5007,7 +5007,7 @@ dependencies = [
"futures 0.3.28",
"generic_error",
"logger",
- "object_store 2.1.0",
+ "object_store 2.2.0-dev",
"parquet",
"tokio",
]
@@ -5023,7 +5023,7 @@ dependencies = [
[[package]]
name = "partition_table_engine"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"analytic_engine",
"arrow 49.0.0",
@@ -5044,7 +5044,7 @@ dependencies = [
[[package]]
name = "partitioned_lock"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"hash_ext",
"tokio",
@@ -5463,7 +5463,7 @@ dependencies = [
[[package]]
name = "profile"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"jemalloc-ctl",
"jemalloc-sys",
@@ -5686,7 +5686,7 @@ checksum =
"9653c3ed92974e34c5a6e0a510864dab979760481714c172e0a34e437cb98804"
[[package]]
name = "proxy"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"arrow 49.0.0",
"arrow_ext",
@@ -5787,7 +5787,7 @@ dependencies = [
[[package]]
name = "query_engine"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"arrow 49.0.0",
"async-trait",
@@ -5817,7 +5817,7 @@ dependencies = [
[[package]]
name = "query_frontend"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"arrow 49.0.0",
"async-trait",
@@ -6116,7 +6116,7 @@ checksum =
"c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
[[package]]
name = "remote_engine_client"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"arrow_ext",
"async-trait",
@@ -6333,7 +6333,7 @@ dependencies = [
[[package]]
name = "router"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"async-trait",
"cluster",
@@ -6376,7 +6376,7 @@ dependencies = [
[[package]]
name = "runtime"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"lazy_static",
"macros",
@@ -6413,7 +6413,7 @@ dependencies = [
[[package]]
name = "rust-sdk-test"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"horaedb-client",
"tokio",
@@ -6610,7 +6610,7 @@ dependencies = [
[[package]]
name = "sampling_cache"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"chrono",
]
@@ -6755,7 +6755,7 @@ dependencies = [
[[package]]
name = "server"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"analytic_engine",
"arc-swap 1.6.0",
@@ -6918,7 +6918,7 @@ dependencies = [
[[package]]
name = "size_ext"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"serde",
"toml 0.7.3",
@@ -6941,7 +6941,7 @@ dependencies = [
[[package]]
name = "skiplist"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"arena",
"bytes",
@@ -7336,7 +7336,7 @@ dependencies = [
[[package]]
name = "system_catalog"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"arrow 49.0.0",
"async-trait",
@@ -7358,7 +7358,7 @@ dependencies = [
[[package]]
name = "system_stats"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"sysinfo",
"tokio",
@@ -7366,7 +7366,7 @@ dependencies = [
[[package]]
name = "table_engine"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"arrow 49.0.0",
"arrow_ext",
@@ -7398,7 +7398,7 @@ dependencies = [
[[package]]
name = "table_kv"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"lazy_static",
"logger",
@@ -7500,7 +7500,7 @@ dependencies = [
[[package]]
name = "test_util"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"arrow 49.0.0",
"chrono",
@@ -7590,7 +7590,7 @@ dependencies = [
[[package]]
name = "time_ext"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"chrono",
"common_types",
@@ -7604,7 +7604,7 @@ dependencies = [
[[package]]
name = "timed_task"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"logger",
"runtime",
@@ -7814,7 +7814,7 @@ dependencies = [
[[package]]
name = "toml_ext"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"macros",
"serde",
@@ -7900,7 +7900,7 @@ dependencies = [
[[package]]
name = "tools"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"analytic_engine",
"anyhow",
@@ -7909,7 +7909,7 @@ dependencies = [
"futures 0.3.28",
"generic_error",
"num_cpus",
- "object_store 2.1.0",
+ "object_store 2.2.0-dev",
"parquet",
"parquet_ext",
"runtime",
@@ -7954,14 +7954,14 @@ checksum =
"b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
[[package]]
name = "trace_metric"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"trace_metric_derive",
]
[[package]]
name = "trace_metric_derive"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"proc-macro2",
"quote",
@@ -7970,7 +7970,7 @@ dependencies = [
[[package]]
name = "trace_metric_derive_tests"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"trace_metric",
]
@@ -8061,7 +8061,7 @@ dependencies = [
[[package]]
name = "tracing_util"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"console-subscriber",
"lazy_static",
@@ -8272,7 +8272,7 @@ checksum =
"9d5b2c62b4012a3e1eca5a7e077d13b3bf498c4073e33ccd58626607748ceeca"
[[package]]
name = "wal"
-version = "2.1.0"
+version = "2.2.0-dev"
dependencies = [
"anyhow",
"async-scoped",
diff --git a/Cargo.toml b/Cargo.toml
index 1008359e..987ed4b1 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -16,7 +16,7 @@
# under the License.
[workspace.package]
-version = "2.1.0"
+version = "2.2.0-dev"
authors = ["HoraeDB Authors"]
edition = "2021"
license = "Apache-2.0"
diff --git a/integration_tests/cases/env/cluster/config.toml
b/integration_tests/cases/env/cluster/config.toml
deleted file mode 100644
index 4a882697..00000000
--- a/integration_tests/cases/env/cluster/config.toml
+++ /dev/null
@@ -1,50 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-[server]
-bind_addr = "127.0.0.1"
-http_port = 5440
-grpc_port = 8831
-log_level = "debug"
-
-[query]
-read_parallelism = 8
-
-[analytic]
-wal_path = "/tmp/horaedb"
-sst_meta_cache_cap = 10000
-
-[analytic.storage]
-mem_cache_capacity = '1G'
-mem_cache_partition_bits = 0
-disk_cache_path = "/tmp/horaedb"
-disk_cache_capacity = '2G'
-disk_cache_page_size = '1M'
-
-[analytic.storage.object_store]
-type = "Local"
-data_path = "/tmp/horaedb"
-
-[[meta_client.cluster_view.schema_shards]]
-schema = 'public'
-
-[[meta_client.cluster_view.schema_shards.shard_views]]
-shard_id = 0
-
-[meta_client.cluster_view.schema_shards.shard_views.node]
-addr = "127.0.0.1"
-port = 8831
diff --git a/integration_tests/cases/env/compaction_offload/config.toml
b/integration_tests/cases/env/compaction_offload/config.toml
deleted file mode 100644
index 044e6af1..00000000
--- a/integration_tests/cases/env/compaction_offload/config.toml
+++ /dev/null
@@ -1,44 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-[server]
-bind_addr = "127.0.0.1"
-http_port = 5440
-grpc_port = 8831
-
-[query_engine]
-read_parallelism = 8
-
-[analytic.wal]
-type = "RocksDB"
-data_dir = "/tmp/horaedb"
-
-[analytic.storage]
-mem_cache_capacity = '1G'
-mem_cache_partition_bits = 0
-disk_cache_dir = "/tmp/horaedb"
-disk_cache_capacity = '2G'
-disk_cache_page_size = '1M'
-
-[analytic.storage.object_store]
-type = "Local"
-data_dir = "/tmp/horaedb"
-
-[analytic.compaction_mode]
-compaction_mode = "Offload"
-node_picker = "Local"
-endpoint = "127.0.0.1:8831"
diff --git a/integration_tests/cases/env/local/config.toml
b/integration_tests/cases/env/local/config.toml
deleted file mode 100644
index 2f766e71..00000000
--- a/integration_tests/cases/env/local/config.toml
+++ /dev/null
@@ -1,39 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-
-[server]
-bind_addr = "127.0.0.1"
-http_port = 5440
-grpc_port = 8831
-
-[query_engine]
-read_parallelism = 8
-
-[analytic.wal]
-type = "RocksDB"
-data_dir = "/tmp/horaedb"
-
-[analytic.storage]
-mem_cache_capacity = '1G'
-mem_cache_partition_bits = 0
-disk_cache_dir = "/tmp/horaedb"
-disk_cache_capacity = '2G'
-disk_cache_page_size = '1M'
-
-[analytic.storage.object_store]
-type = "Local"
-data_dir = "/tmp/horaedb"
diff --git a/src/analytic_engine/src/lib.rs b/src/analytic_engine/src/lib.rs
index 687bcf63..d83ec341 100644
--- a/src/analytic_engine/src/lib.rs
+++ b/src/analytic_engine/src/lib.rs
@@ -145,7 +145,8 @@ pub struct Config {
/// Wal storage config
///
- /// Now, following three storages are supported:
+ /// Now, following storages are supported:
+ /// + Local Disk
/// + RocksDB
/// + OBKV
/// + Kafka
diff --git a/src/components/object_store/src/disk_cache.rs
b/src/components/object_store/src/disk_cache.rs
index a89fd428..13a32f01 100644
--- a/src/components/object_store/src/disk_cache.rs
+++ b/src/components/object_store/src/disk_cache.rs
@@ -1167,6 +1167,7 @@ mod test {
}
#[test]
+ #[ignore = "https://github.com/apache/horaedb/issues/1215";]
fn test_disk_cache_multi_thread_fetch_same_block() {
let rt = Arc::new(Builder::default().build().unwrap());
rt.block_on(async {
diff --git a/src/wal/src/config.rs b/src/wal/src/config.rs
index 3169a7cb..f5fd8df1 100644
--- a/src/wal/src/config.rs
+++ b/src/wal/src/config.rs
@@ -56,7 +56,7 @@ pub struct Config {
impl Default for Config {
fn default() -> Self {
Self {
- storage: StorageConfig::RocksDB(Box::default()),
+ storage: StorageConfig::Local(Box::default()),
disable_data: false,
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@horaedb.apache.org
For additional commands, e-mail: commits-h...@horaedb.apache.org
