Skip to content

Commit

Permalink
chore: bump toolchain to nightly-2023-04-07 (#9051)
Browse files Browse the repository at this point in the history
  • Loading branch information
xxchan authored Apr 11, 2023
1 parent 07cd8b7 commit 5a61944
Show file tree
Hide file tree
Showing 34 changed files with 76 additions and 64 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ci/build-ci-image.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ export RUST_TOOLCHAIN=$(cat ../rust-toolchain)
# !!! CHANGE THIS WHEN YOU WANT TO BUMP CI IMAGE !!! #
# AND ALSO docker-compose.yml #
######################################################
export BUILD_ENV_VERSION=v20230403
export BUILD_ENV_VERSION=v20230407

export BUILD_TAG="public.ecr.aws/x5u3w5h6/rw-build-env:${BUILD_ENV_VERSION}"

Expand Down
8 changes: 4 additions & 4 deletions ci/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -34,28 +34,28 @@ services:
retries: 5

source-test-env:
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230403
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230407
depends_on:
- mysql
- db
volumes:
- ..:/risingwave

sink-test-env:
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230403
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230407
depends_on:
- mysql
- db
volumes:
- ..:/risingwave

rw-build-env:
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230403
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230407
volumes:
- ..:/risingwave

regress-test-env:
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230403
image: public.ecr.aws/x5u3w5h6/rw-build-env:v20230407
depends_on:
db:
condition: service_healthy
Expand Down
2 changes: 1 addition & 1 deletion docs/developer-guide.md
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ RiseDev is the development mode of RisingWave. To develop RisingWave, you need t
* OpenSSL
* PostgreSQL (psql) (>= 14.1)
* Tmux (>= v3.2a)
* LLVM 15 (For macOS only, to workaround some bugs in macOS toolchain. See https://github.com/risingwavelabs/risingwave/issues/6205).
* LLVM 16 (For macOS only, to workaround some bugs in macOS toolchain. See https://github.com/risingwavelabs/risingwave/issues/6205).

To install the dependencies on macOS, run:

Expand Down
2 changes: 1 addition & 1 deletion rust-toolchain
Original file line number Diff line number Diff line change
@@ -1 +1 @@
nightly-2023-03-01
nightly-2023-04-07
8 changes: 2 additions & 6 deletions src/batch/src/executor/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -237,9 +237,7 @@ mod tests {

#[test]
fn test_clone_for_plan() {
let plan_node = PlanNode {
..Default::default()
};
let plan_node = PlanNode::default();
let task_id = &TaskId {
task_id: 1,
stage_id: 1,
Expand All @@ -251,9 +249,7 @@ mod tests {
ComputeNodeContext::for_test(),
to_committed_batch_query_epoch(u64::MAX),
);
let child_plan = &PlanNode {
..Default::default()
};
let child_plan = &PlanNode::default();
let cloned_builder = builder.clone_for_plan(child_plan);
assert_eq!(builder.task_id, cloned_builder.task_id);
}
Expand Down
2 changes: 1 addition & 1 deletion src/cmd_all/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#![feature(once_cell)]
#![feature(lazy_cell)]

pub mod playground;
pub use playground::*;
2 changes: 1 addition & 1 deletion src/common/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
#![feature(lint_reasons)]
#![feature(generators)]
#![feature(map_try_insert)]
#![feature(once_cell)]
#![feature(lazy_cell)]
#![feature(error_generic_member_access)]
#![feature(provide_any)]
#![feature(let_chains)]
Expand Down
38 changes: 31 additions & 7 deletions src/connector/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,26 @@ normal = ["workspace-hack"]

[dependencies]
anyhow = "1"
apache-avro = { git = "https://github.com/risingwavelabs/avro", branch = "waruto/modify-decimal", features = ["snappy", "zstandard", "bzip", "xz"] }
apache-avro = { git = "https://github.com/risingwavelabs/avro", branch = "waruto/modify-decimal", features = [
"snappy",
"zstandard",
"bzip",
"xz",
] }
async-trait = "0.1"
aws-config = { workspace = true }
aws-sdk-ec2 = { workspace = true }
aws-sdk-kinesis = { workspace = true }
aws-sdk-kinesis = { workspace = true }
aws-sdk-s3 = { workspace = true }
aws-smithy-http = { workspace = true }
aws-types = { workspace = true }
bincode = "1"
byteorder = "1"
bytes = { version = "1", features = ["serde"] }
chrono = { version = "0.4", default-features = false, features = ["clock", "std"] }
chrono = { version = "0.4", default-features = false, features = [
"clock",
"std",
] }
csv = "1.2"
duration-str = "0.5.0"
enum-as-inner = "0.5"
Expand All @@ -49,8 +57,16 @@ prometheus = { version = "0.13", features = ["process"] }
prost = { version = "0.11.0", features = ["no-recursion-limit"] }
prost-reflect = "0.9.2"
protobuf-native = "0.2.1"
pulsar = { version = "4.2", default-features = false, features = ["tokio-runtime", "telemetry", "auth-oauth2"] }
rdkafka = { package = "madsim-rdkafka", version = "=0.2.14-alpha", features = ["cmake-build", "ssl-vendored", "gssapi"] }
pulsar = { version = "4.2", default-features = false, features = [
"tokio-runtime",
"telemetry",
"auth-oauth2",
] }
rdkafka = { package = "madsim-rdkafka", version = "=0.2.14-alpha", features = [
"cmake-build",
"ssl-vendored",
"gssapi",
] }
reqwest = { version = "0.11", features = ["json"] }
risingwave_common = { path = "../common" }
risingwave_expr = { path = "../expr" }
Expand All @@ -61,9 +77,17 @@ serde = { version = "1", features = ["derive", "rc"] }
serde_derive = "1"
serde_json = "1"
serde_with = { version = "2", features = ["json"] }
simd-json = "0.7"
simd-json = "0.8"
thiserror = "1"
tokio = { version = "0.2", package = "madsim-tokio", features = ["rt", "rt-multi-thread", "sync", "macros", "time", "signal", "fs"] }
tokio = { version = "0.2", package = "madsim-tokio", features = [
"rt",
"rt-multi-thread",
"sync",
"macros",
"time",
"signal",
"fs",
] }
tokio-retry = "0.3"
tokio-stream = "0.1"
tokio-util = { version = "0.7", features = ["codec", "io"] }
Expand Down
2 changes: 1 addition & 1 deletion src/connector/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#![feature(trait_alias)]
#![feature(binary_heap_drain_sorted)]
#![feature(lint_reasons)]
#![feature(once_cell)]
#![feature(lazy_cell)]
#![feature(result_option_inspect)]
#![feature(let_chains)]
#![feature(box_into_inner)]
Expand Down
4 changes: 4 additions & 0 deletions src/expr/macro/src/gen.rs
Original file line number Diff line number Diff line change
Expand Up @@ -115,6 +115,10 @@ impl FunctionAttr {
let exprs = (0..num_args)
.map(|i| format_ident!("e{i}"))
.collect::<Vec<_>>();
#[expect(
clippy::redundant_clone,
reason = "false positive https://github.com/rust-lang/rust-clippy/issues/10545"
)]
let exprs0 = exprs.clone();

let build_expr = if self.ret == "varchar" && self.user_fn.is_writer_style() {
Expand Down
2 changes: 2 additions & 0 deletions src/expr/macro/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,8 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#![feature(lint_reasons)]

use proc_macro::TokenStream;
use proc_macro2::TokenStream as TokenStream2;
use quote::ToTokens;
Expand Down
2 changes: 1 addition & 1 deletion src/expr/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
#![feature(lint_reasons)]
#![feature(iterator_try_collect)]
#![feature(exclusive_range_pattern)]
#![feature(once_cell)]
#![feature(lazy_cell)]
#![feature(try_blocks)]

mod error;
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
#![feature(assert_matches)]
#![feature(lint_reasons)]
#![feature(box_patterns)]
#![feature(once_cell)]
#![feature(lazy_cell)]
#![feature(result_option_inspect)]
#![feature(macro_metavar_expr)]
#![feature(slice_internals)]
Expand Down
4 changes: 4 additions & 0 deletions src/frontend/src/optimizer/rule/index_selection_rule.rs
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,10 @@ impl Rule for IndexSelectionRule {
);

let mut final_plan: PlanRef = logical_scan.clone().into();
#[expect(
clippy::redundant_clone,
reason = "false positive https://github.com/rust-lang/rust-clippy/issues/10545"
)]
let mut min_cost = primary_cost.clone();

for index in indexes {
Expand Down
4 changes: 1 addition & 3 deletions src/frontend/src/scheduler/distributed/query.rs
Original file line number Diff line number Diff line change
Expand Up @@ -368,9 +368,7 @@ impl QueryRunner {
let root_stage_result = QueryResultFetcher::new(
root_task_output_id,
// Execute in local, so no need to fill meaningful address.
HostAddress {
..Default::default()
},
HostAddress::default(),
chunk_rx,
self.query.query_id.clone(),
self.query_execution_info.clone(),
Expand Down
2 changes: 1 addition & 1 deletion src/java_binding/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#![feature(error_generic_member_access)]
#![feature(provide_any)]
#![feature(once_cell)]
#![feature(lazy_cell)]
#![feature(type_alias_impl_trait)]

mod hummock_iterator;
Expand Down
4 changes: 1 addition & 3 deletions src/meta/src/hummock/manager/tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -847,9 +847,7 @@ async fn test_trigger_manual_compaction() {
{
let option = ManualCompactionOption {
level: 6,
key_range: KeyRange {
..Default::default()
},
key_range: KeyRange::default(),
..Default::default()
};

Expand Down
3 changes: 1 addition & 2 deletions src/meta/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#![allow(clippy::derive_partial_eq_without_eq)]
#![feature(trait_alias)]
#![feature(binary_heap_drain_sorted)]
#![feature(option_result_contains)]
#![feature(type_alias_impl_trait)]
#![feature(drain_filter)]
#![feature(custom_test_frameworks)]
Expand All @@ -25,7 +24,7 @@
#![feature(is_some_and)]
#![feature(btree_drain_filter)]
#![feature(result_option_inspect)]
#![feature(once_cell)]
#![feature(lazy_cell)]
#![feature(let_chains)]
#![feature(error_generic_member_access)]
#![feature(provide_any)]
Expand Down
4 changes: 1 addition & 3 deletions src/meta/src/rpc/service/hummock_service.rs
Original file line number Diff line number Diff line change
Expand Up @@ -299,9 +299,7 @@ where
}

None => {
option.key_range = KeyRange {
..Default::default()
}
option.key_range = KeyRange::default();
}
}

Expand Down
4 changes: 1 addition & 3 deletions src/meta/src/stream/stream_manager.rs
Original file line number Diff line number Diff line change
Expand Up @@ -646,9 +646,7 @@ mod tests {
&self,
_request: Request<BarrierCompleteRequest>,
) -> std::result::Result<Response<BarrierCompleteResponse>, Status> {
Ok(Response::new(BarrierCompleteResponse {
..Default::default()
}))
Ok(Response::new(BarrierCompleteResponse::default()))
}

async fn wait_epoch_commit(
Expand Down
2 changes: 1 addition & 1 deletion src/object_store/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

#![feature(trait_alias)]
#![feature(type_alias_impl_trait)]
#![feature(once_cell)]
#![feature(lazy_cell)]
#![feature(lint_reasons)]
#![feature(error_generic_member_access)]
#![feature(provide_any)]
Expand Down
8 changes: 2 additions & 6 deletions src/sqlparser/tests/sqlparser_common.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1715,9 +1715,7 @@ fn parse_explain_analyze_with_simple_select() {
run_explain_analyze(
"EXPLAIN SELECT sqrt(id) FROM foo",
false,
ExplainOptions {
..Default::default()
},
ExplainOptions::default(),
);
run_explain_analyze(
"EXPLAIN (VERBOSE) SELECT sqrt(id) FROM foo",
Expand All @@ -1730,9 +1728,7 @@ fn parse_explain_analyze_with_simple_select() {
run_explain_analyze(
"EXPLAIN ANALYZE SELECT sqrt(id) FROM foo",
true,
ExplainOptions {
..Default::default()
},
ExplainOptions::default(),
);
run_explain_analyze(
"EXPLAIN (TRACE) SELECT sqrt(id) FROM foo",
Expand Down
3 changes: 1 addition & 2 deletions src/storage/backup/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
#![allow(clippy::derive_partial_eq_without_eq)]
#![feature(trait_alias)]
#![feature(binary_heap_drain_sorted)]
#![feature(option_result_contains)]
#![feature(type_alias_impl_trait)]
#![feature(drain_filter)]
#![feature(custom_test_frameworks)]
Expand All @@ -25,7 +24,7 @@
#![feature(is_some_and)]
#![feature(btree_drain_filter)]
#![feature(result_option_inspect)]
#![feature(once_cell)]
#![feature(lazy_cell)]
#![feature(let_chains)]
#![feature(error_generic_member_access)]
#![feature(provide_any)]
Expand Down
2 changes: 1 addition & 1 deletion src/storage/benches/bench_block_iter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// See the License for the specific language governing permissions and
// limitations under the License.

#![feature(once_cell)]
#![feature(lazy_cell)]
use std::sync::LazyLock;

use bytes::{BufMut, Bytes, BytesMut};
Expand Down
2 changes: 1 addition & 1 deletion src/storage/hummock_test/src/hummock_storage_tests.rs
Original file line number Diff line number Diff line change
Expand Up @@ -428,7 +428,7 @@ async fn test_state_store_sync() {

let read_version = hummock_storage.read_version();

let epoch1: _ = read_version.read().committed().max_committed_epoch() + 1;
let epoch1 = read_version.read().committed().max_committed_epoch() + 1;
hummock_storage.init(epoch1);

// ingest 16B batch
Expand Down
2 changes: 1 addition & 1 deletion src/storage/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
#![feature(is_sorted)]
#![feature(btree_drain_filter)]
#![feature(exact_size_is_empty)]
#![feature(once_cell)]
#![feature(lazy_cell)]
#![cfg_attr(coverage, feature(no_coverage))]
#![recursion_limit = "256"]
#![feature(error_generic_member_access)]
Expand Down
4 changes: 1 addition & 3 deletions src/storage/src/memory.rs
Original file line number Diff line number Diff line change
Expand Up @@ -636,9 +636,7 @@ impl<R: RangeKv> StateStore for RangeKvStateStore<R> {
async move {
self.inner.flush()?;
// memory backend doesn't need to push to S3, so this is a no-op
Ok(SyncResult {
..Default::default()
})
Ok(SyncResult::default())
}
}

Expand Down
Loading

0 comments on commit 5a61944

Please sign in to comment.