Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/develop.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ on:
name: CI

env:
RUST_TOOLCHAIN: nightly-2022-12-20
RUST_TOOLCHAIN: nightly-2023-02-14

jobs:
typos:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ on:
name: Release

env:
RUST_TOOLCHAIN: nightly-2022-12-20
RUST_TOOLCHAIN: nightly-2023-02-14

# FIXME(zyy17): Would be better to use `gh release list -L 1 | cut -f 3` to get the latest release version tag, but for a long time, we will stay at 'v0.1.0-alpha-*'.
SCHEDULED_BUILD_VERSION_PREFIX: v0.1.0-alpha
Expand Down
32 changes: 26 additions & 6 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 rust-toolchain.toml
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
[toolchain]
channel = "nightly-2022-12-20"
channel = "nightly-2023-02-14"
2 changes: 1 addition & 1 deletion src/api/src/helper.rs
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ pub fn push_vals(column: &mut Column, origin_count: usize, vector: VectorRef) {
null_mask.reserve_exact(origin_count + len);
null_mask.extend(BitVec::repeat(false, len));

(0..len).into_iter().for_each(|idx| match vector.get(idx) {
(0..len).for_each(|idx| match vector.get(idx) {
Value::Null => null_mask.set(idx + origin_count, true),
Value::Boolean(val) => values.bool_values.push(val),
Value::UInt8(val) => values.u8_values.push(val.into()),
Expand Down
1 change: 1 addition & 0 deletions src/common/function-macro/tests/test_derive.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ use static_assertions::{assert_fields, assert_impl_all};
struct Foo {}

#[test]
#[allow(clippy::extra_unused_type_parameters)]
fn test_derive() {
Foo::default();
assert_fields!(Foo: input_types);
Expand Down
2 changes: 1 addition & 1 deletion src/common/function/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ num-traits = "0.2"
once_cell = "1.10"
paste = "1.0"
snafu.workspace = true
statrs = "0.15"
statrs = "0.16"

[dev-dependencies]
ron = "0.7"
Expand Down
2 changes: 1 addition & 1 deletion src/common/query/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ datafusion-common.workspace = true
datafusion-expr.workspace = true
datatypes = { path = "../../datatypes" }
snafu.workspace = true
statrs = "0.15"
statrs = "0.16"

[dev-dependencies]
common-base = { path = "../base" }
Expand Down
2 changes: 1 addition & 1 deletion src/log-store/src/raft_engine.rs
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ impl NamespaceImpl {
}
}

#[allow(clippy::derive_hash_xor_eq)]
#[allow(clippy::derived_hash_with_manual_eq)]
impl Hash for NamespaceImpl {
fn hash<H: Hasher>(&self, state: &mut H) {
self.id.hash(state);
Expand Down
2 changes: 1 addition & 1 deletion src/log-store/src/raft_engine/log_store.rs
Original file line number Diff line number Diff line change
Expand Up @@ -421,7 +421,7 @@ mod tests {
let vec = r.unwrap();
entries.extend(vec.into_iter().map(|e| e.id));
}
assert_eq!((0..cnt).into_iter().collect::<HashSet<_>>(), entries);
assert_eq!((0..cnt).collect::<HashSet<_>>(), entries);
}

async fn collect_entries(mut s: SendableEntryStream<'_, Entry, Error>) -> Vec<Entry> {
Expand Down
9 changes: 2 additions & 7 deletions src/meta-srv/src/selector.rs
Original file line number Diff line number Diff line change
Expand Up @@ -30,18 +30,13 @@ pub trait Selector: Send + Sync {
async fn select(&self, ns: Namespace, ctx: &Self::Context) -> Result<Self::Output>;
}

#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize)]
#[derive(Clone, Debug, PartialEq, Eq, Serialize, Deserialize, Default)]
pub enum SelectorType {
LoadBased,
#[default]
LeaseBased,
}

impl Default for SelectorType {
fn default() -> Self {
SelectorType::LeaseBased
}
}

impl TryFrom<&str> for SelectorType {
type Error = error::Error;

Expand Down
6 changes: 3 additions & 3 deletions src/object-store/src/cache_policy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,10 @@ impl CachePolicy for LruCachePolicy {
}
Ok(v)
}
Err(_) => return inner.read(&path, args).await,
Err(_) => inner.read(&path, args).await,
}
}
Err(_) => return inner.read(&path, args).await,
Err(_) => inner.read(&path, args).await,
}
})
}
Expand Down Expand Up @@ -117,7 +117,7 @@ impl CachePolicy for LruCachePolicy {
for file in cache_files {
let _ = cache.delete(&file, OpDelete::new()).await;
}
return inner.delete(&path, args).await;
inner.delete(&path, args).await
})
}
}
2 changes: 1 addition & 1 deletion src/query/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ num = "0.4"
num-traits = "0.2"
paste = "1.0"
rand = "0.8"
statrs = "0.15"
statrs = "0.16"
stats-cli = "3.0"
streaming-stats = "0.2"
tokio-stream = "0.1"
1 change: 0 additions & 1 deletion src/script/src/python/coprocessor.rs
Original file line number Diff line number Diff line change
Expand Up @@ -509,7 +509,6 @@ pub(crate) fn init_interpreter() -> Arc<Interpreter> {
// not using full stdlib to prevent security issue, instead filter out a few simple util module
vm.add_native_modules(
rustpython_stdlib::get_module_inits()
.into_iter()
.filter(|(k, _)| native_module_allow_list.contains(k.as_ref())),
);

Expand Down
2 changes: 0 additions & 2 deletions src/servers/src/line_writer.rs
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ impl LineWriter {
let rows = self.current_rows;
let mut builder = datatype.create_mutable_vector(self.expected_rows);
(0..rows)
.into_iter()
.try_for_each(|_| builder.push_value_ref(ValueRef::Null))
.context(VectorConversionSnafu)
.unwrap();
Expand All @@ -130,7 +129,6 @@ impl LineWriter {
self.current_rows += 1;
self.columns_builders
.values_mut()
.into_iter()
.try_for_each(|(builder, len)| {
if self.current_rows > *len {
builder.push_value_ref(ValueRef::Null)
Expand Down
1 change: 0 additions & 1 deletion src/storage/src/compaction/strategy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -301,7 +301,6 @@ mod tests {

// file with an large time range
let expected = (0..(TIME_BUCKETS[4] / TIME_BUCKETS[0]))
.into_iter()
.map(|b| (b * TIME_BUCKETS[0], &["a"] as _))
.collect::<Vec<_>>();
check_bucket_calculation(
Expand Down
1 change: 0 additions & 1 deletion src/storage/src/sst.rs
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ impl LevelMeta {

fn new_level_meta_vec() -> LevelMetaVec {
(0u8..MAX_LEVEL)
.into_iter()
.map(LevelMeta::new)
.collect::<Vec<_>>()
.try_into()
Expand Down