Merge pull request #243 from eclipse-zenoh/pubcache_complete

adding `complete` option to publication_cache

.gitignore

@@ -6,6 +6,7 @@ target
 
 # vscode
 .vscode 
+out
 
 # IntelliJ / CLion 
 .idea 

Cargo.toml.in

@@ -49,10 +49,10 @@ log = "0.4.17"
 rand = "0.8.5"
 spin = "0.9.5"
 # shared-memory enabled for zenoh even if zenoh-c "shared-memory" feature is disabled. This is to make "std::mem::transmute" work for `ZSLice`
-zenoh = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = [ "shared-memory", "unstable" ], default-features = false }
-zenoh-protocol = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = [ "shared-memory" ] }
+zenoh = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = ["shared-memory", "unstable"], default-features = false }
+zenoh-protocol = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = ["shared-memory"] }
 zenoh-util = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main" }
-zenoh-ext = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = [ "unstable" ]}
+zenoh-ext = { version = "0.11.0-dev", git = "https://github.com/eclipse-zenoh/zenoh.git", branch = "main", features = ["unstable"] }
 
 [build-dependencies]
 cbindgen = "0.24.3"

examples/z_pub_cache.c

@@ -54,6 +54,7 @@ int main(int argc, char **argv) {
 
     ze_publication_cache_options_t pub_cache_opts = ze_publication_cache_options_default();
     pub_cache_opts.history = 42;
+    pub_cache_opts.queryable_complete = false;
 
     printf("Declaring publication cache on '%s'...\n", keyexpr);
     ze_owned_publication_cache_t pub_cache =

include/zenoh_commons.h

@@ -905,12 +905,14 @@ typedef struct ze_owned_publication_cache_t {
  *     z_keyexpr_t queryable_prefix: The prefix used for queryable
  *     zcu_locality_t queryable_origin: The restriction for the matching queries that will be receive by this
  *                       publication cache
+ *     bool queryable_complete: the `complete` option for the queryable
  *     size_t history: The the history size
  *     size_t resources_limit: The limit number of cached resources
  */
 typedef struct ze_publication_cache_options_t {
   struct z_keyexpr_t queryable_prefix;
   enum zcu_locality_t queryable_origin;
+  bool queryable_complete;
   size_t history;
   size_t resources_limit;
 } ze_publication_cache_options_t;

src/info.rs

@@ -13,6 +13,7 @@
 //
 use crate::{session::*, z_closure_zid_call, z_owned_closure_zid_t};
 use zenoh::prelude::sync::SyncResolve;
+use zenoh::SessionDeclarations;
 use zenoh_protocol::core::ZenohId;
 
 /// Represents a Zenoh ID.

src/publication_cache.rs

@@ -29,12 +29,14 @@ use crate::{
 ///     z_keyexpr_t queryable_prefix: The prefix used for queryable
 ///     zcu_locality_t queryable_origin: The restriction for the matching queries that will be receive by this
 ///                       publication cache
+///     bool queryable_complete: the `complete` option for the queryable
 ///     size_t history: The the history size
 ///     size_t resources_limit: The limit number of cached resources
 #[repr(C)]
 pub struct ze_publication_cache_options_t {
     pub queryable_prefix: z_keyexpr_t,
     pub queryable_origin: zcu_locality_t,
+    pub queryable_complete: bool,
     pub history: usize,
     pub resources_limit: usize,
 }
@@ -45,6 +47,7 @@ pub extern "C" fn ze_publication_cache_options_default() -> ze_publication_cache
     ze_publication_cache_options_t {
         queryable_prefix: z_keyexpr_t::null(),
         queryable_origin: zcu_locality_default(),
+        queryable_complete: false,
         history: 1,
         resources_limit: 0,
     }
@@ -133,6 +136,7 @@ pub extern "C" fn ze_declare_publication_cache(
                 if let Some(options) = options {
                     p = p.history(options.history);
                     p = p.queryable_allowed_origin(options.queryable_origin.into());
+                    p = p.queryable_complete(options.queryable_complete);
                     if options.resources_limit != 0 {
                         p = p.resources_limit(options.resources_limit)
                     }