Merge branch 'selector_rework3' of github.com:eclipse-zenoh/zenoh int…

…o selector_rework3
eclipse-zenoh · Jun 10, 2024 · b84bd90 · b84bd90
2 parents 2f01adc + 634f09f
commit b84bd90
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/zenoh/src/api/encoding.rs b/zenoh/src/api/encoding.rs
@@ -638,10 +638,13 @@ impl From<&str> for Encoding {
         }
 
         // Everything before `;` may be mapped to a known id
-        let (id, schema) = t.split_once(Encoding::SCHEMA_SEP).unwrap_or((t, ""));
+        let (id, mut schema) = t.split_once(Encoding::SCHEMA_SEP).unwrap_or((t, ""));
         if let Some(id) = Encoding::STR_TO_ID.get(id).copied() {
             inner.id = id;
-        };
+        // if id is not recognized, e.g. `t == "my_encoding"`, put it in the schema
+        } else {
+            schema = t;
+        }
         if !schema.is_empty() {
             inner.schema = Some(ZSlice::from(schema.to_string().into_bytes()));
         }

diff --git a/zenoh/src/api/session.rs b/zenoh/src/api/session.rs
@@ -88,6 +88,7 @@ use super::{
     publisher::Publisher,
     publisher::{MatchingListenerState, MatchingStatus},
     sample::SourceInfo,
+    selector::TIME_RANGE_KEY,
 };
 use crate::{
     api::selector::PredefinedParameters,

diff --git a/zenohd/Cargo.toml b/zenohd/Cargo.toml
@@ -42,7 +42,7 @@ tracing = {workspace = true}
 tracing-subscriber = {workspace = true}
 tracing-loki = {workspace = true, optional = true }
 url = {workspace = true, optional = true }
-zenoh = { workspace = true, features = ["unstable", "plugins"] }
+zenoh = { workspace = true, features = ["unstable", "internal", "plugins"] }
 
 [dev-dependencies]
 rand = { workspace = true, features = ["default"] }