Skip to content

Commit

Permalink
Merge remote-tracking branch 'eclipse-zenoh/dev/1.0.0' into dev/1.0.0…
Browse files Browse the repository at this point in the history
…_timestamp_rework
  • Loading branch information
Charles-Schleich committed Jul 3, 2024
2 parents 43205f0 + 53b9fa0 commit 594fadd
Show file tree
Hide file tree
Showing 3 changed files with 22 additions and 16 deletions.
3 changes: 1 addition & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,7 @@ jobs:
rustup component add rustfmt clippy
- name: Code format check
run: cargo fmt --check

run: cargo fmt --check -- --config "unstable_features=true,imports_granularity=Crate,group_imports=StdExternalCrate"
- name: Clippy
run: cargo clippy --all --examples -- -D warnings

Expand Down
8 changes: 8 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
repos:
- repo: local
hooks:
- id: fmt
name: fmt
entry: cargo fmt -- --config "unstable_features=true,imports_granularity=Crate,group_imports=StdExternalCrate"
language: system
types: [rust]
27 changes: 13 additions & 14 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,23 +14,22 @@

use async_std::sync::{Arc, Mutex};
use async_trait::async_trait;
use config::VolumeConfig;
use rocksdb::{ColumnFamilyDescriptor, Options, WriteBatch, DB};
use std::borrow::Cow;
use std::collections::HashMap;
use std::path::PathBuf;
use std::time::Duration;
use std::{borrow::Cow, collections::HashMap, path::PathBuf, time::Duration};
use tracing::{debug, error, trace, warn};
use uhlc::NTP64;
use zenoh::bytes::{Encoding, ZBytes};
use zenoh::internal::{bail, zenoh_home, zerror, Value};
use zenoh::key_expr::OwnedKeyExpr;
use zenoh::query::Parameters;
// use zenoh::selector::Parameters;
use zenoh::time::Timestamp;
use zenoh::{try_init_log_from_env, Error, Result as ZResult};
use zenoh_backend_traits::config::StorageConfig;
use zenoh_backend_traits::*;
use zenoh::{
bytes::{Encoding, ZBytes},
internal::{bail, zenoh_home, zerror, Value},
key_expr::OwnedKeyExpr,
query::Parameters,
time::Timestamp,
try_init_log_from_env, Error, Result as ZResult,
};
use zenoh_backend_traits::{
config::{StorageConfig, VolumeConfig},
*,
};
use zenoh_plugin_trait::{plugin_long_version, plugin_version, Plugin};

/// The environement variable used to configure the root of all storages managed by this RocksdbBackend.
Expand Down

0 comments on commit 594fadd

Please sign in to comment.