Remove include/exclude options

CHANGELOG.md

@@ -7,6 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Breaking changes:
+
+- Remove include/exclude options from `reduct-cli cp` and `reduct-cli replica` commands, [PR-122](https://github.com/reductstore/reduct-cli/pull/122)
+
 ## [0.7.0] - 2025-06-11
 
 ### Breaking changes:

src/cmd/cp.rs

@@ -12,8 +12,7 @@ use crate::cmd::cp::b2f::cp_bucket_to_folder;
 use crate::cmd::ALIAS_OR_URL_HELP;
 use crate::context::CliContext;
 use crate::parse::widely_used_args::{
-    make_each_n, make_each_s, make_entries_arg, make_exclude_arg, make_ext_arg, make_include_arg,
-    make_strict_arg, make_when_arg,
+    make_each_n, make_each_s, make_entries_arg, make_ext_arg, make_strict_arg, make_when_arg,
 };
 use crate::parse::ResourcePathParser;
 use clap::ArgAction::SetTrue;
@@ -49,8 +48,6 @@ pub(crate) fn cp_cmd() -> Command {
                 .help("Export records with timestamps newer than this time point in ISO format or Unix timestamp in microseconds.\nIf not specified, the export will end at the last record in an entry.")
                 .required(false)
         )
-        .arg(make_include_arg())
-        .arg(make_exclude_arg())
         .arg(make_entries_arg())
         .arg(make_when_arg())
         .arg(make_strict_arg())

src/cmd/cp/helpers.rs

@@ -131,8 +131,6 @@ fn build_query(src_bucket: &Bucket, entry: &EntryInfo, query_params: &QueryParam
         query_builder = query_builder.ext(ext.clone());
     }
 
-    query_builder = query_builder.include(query_params.include_labels.clone());
-    query_builder = query_builder.exclude(query_params.exclude_labels.clone());
     query_builder = query_builder.strict(query_params.strict);
 
     if let Some(limit) = query_params.limit {
@@ -458,62 +456,5 @@ mod tests {
 
             start_loading(src_bucket, params, visitor).await.unwrap();
         }
-
-        #[rstest]
-        #[tokio::test]
-        async fn test_downloading_include(#[future] src_bucket: Bucket, mut visitor: MockVisitor) {
-            let src_bucket = src_bucket.await;
-            visitor
-                .expect_visit()
-                .times(1)
-                .with(eq("entry-1"), always())
-                .return_const(Ok(()));
-
-            src_bucket
-                .write_record("entry-1")
-                .data(Bytes::from_static(b"rec-3"))
-                .add_label("key1", "value1")
-                .send()
-                .await
-                .unwrap();
-
-            let params = QueryParams {
-                include_labels: Labels::from_iter(vec![("key1".to_string(), "value1".to_string())]),
-                ..Default::default()
-            };
-
-            start_loading(src_bucket, params, visitor).await.unwrap();
-        }
-
-        #[rstest]
-        #[tokio::test]
-        async fn test_downloading_exclude(#[future] src_bucket: Bucket, mut visitor: MockVisitor) {
-            let src_bucket = src_bucket.await;
-            visitor
-                .expect_visit()
-                .times(1)
-                .with(eq("entry-1"), always())
-                .return_const(Ok(()));
-            visitor
-                .expect_visit()
-                .times(1)
-                .with(eq("entry-2"), always())
-                .return_const(Ok(()));
-
-            src_bucket
-                .write_record("entry-1")
-                .data(Bytes::from_static(b"rec-3"))
-                .add_label("key1", "value1")
-                .send()
-                .await
-                .unwrap();
-
-            let params = QueryParams {
-                exclude_labels: Labels::from_iter(vec![("key1".to_string(), "value1".to_string())]),
-                ..Default::default()
-            };
-
-            start_loading(src_bucket, params, visitor).await.unwrap();
-        }
     }
 }

src/cmd/replica/create.rs

@@ -5,10 +5,7 @@
 
 use crate::cmd::RESOURCE_PATH_HELP;
 use crate::io::reduct::{build_client, parse_url_and_token};
-use crate::parse::widely_used_args::{
-    make_each_n, make_each_s, make_entries_arg, make_exclude_arg, make_include_arg, make_when_arg,
-    parse_label_args,
-};
+use crate::parse::widely_used_args::{make_each_n, make_each_s, make_entries_arg, make_when_arg};
 use crate::parse::ResourcePathParser;
 use clap::{Arg, Command};
 use reduct_rs::Labels;
@@ -34,8 +31,6 @@ pub(super) fn create_replica_cmd() -> Command {
                 .value_parser(ResourcePathParser::new())
                 .required(true),
         )
-        .arg(make_include_arg())
-        .arg(make_exclude_arg())
         .arg(make_entries_arg())
         .arg(make_each_n())
         .arg(make_each_s())
@@ -59,8 +54,6 @@ pub(super) async fn create_replica(
         .map(|s| s.to_string())
         .collect::<Vec<String>>();
 
-    let include = parse_label_args(args.get_many::<String>("include"))?.unwrap_or_default();
-    let exclude = parse_label_args(args.get_many::<String>("exclude"))?.unwrap_or_default();
     let each_n = args.get_one::<u64>("each-n");
     let each_s = args.get_one::<f64>("each-s");
     let when = args.get_one::<String>("when");
@@ -74,8 +67,6 @@ pub(super) async fn create_replica(
         .dst_bucket(dest_bucket_name)
         .dst_host(dest_url.as_str())
         .dst_token(&token)
-        .include(Labels::from_iter(include))
-        .exclude(Labels::from_iter(exclude))
         .entries(entries_filter);
 
     if let Some(when) = when {
@@ -123,10 +114,6 @@ mod tests {
             format!("local/{}", test_replica).as_str(),
             &bucket,
             format!("local/{}", bucket2).as_str(),
-            "--include",
-            "key1=value2",
-            "--exclude",
-            "key2=value3",
             "--entries",
             "entry1",
             "entry2",
@@ -144,18 +131,6 @@ mod tests {
         assert_eq!(replica.settings.dst_bucket, bucket2);
         assert_eq!(replica.settings.dst_host, "http://localhost:8383/");
         assert_eq!(replica.settings.dst_token, "***");
-        assert_eq!(
-            replica.settings.include,
-            Labels::from_iter(vec![("key1".to_string(), "value2".to_string())])
-        );
-        assert_eq!(
-            replica.settings.exclude,
-            Labels::from_iter(vec![("key2".to_string(), "value3".to_string())])
-        );
-        assert_eq!(
-            replica.settings.entries,
-            vec!["entry1".to_string(), "entry2".to_string()]
-        );
         assert_eq!(replica.settings.each_n, Some(10));
         assert_eq!(replica.settings.each_s, Some(0.5));
         assert_eq!(

src/cmd/replica/update.rs

@@ -6,10 +6,7 @@
 use crate::cmd::RESOURCE_PATH_HELP;
 use crate::context::CliContext;
 use crate::io::reduct::{build_client, parse_url_and_token};
-use crate::parse::widely_used_args::{
-    make_each_n, make_each_s, make_entries_arg, make_exclude_arg, make_include_arg, make_when_arg,
-    parse_label_args,
-};
+use crate::parse::widely_used_args::{make_each_n, make_each_s, make_entries_arg, make_when_arg};
 use crate::parse::ResourcePathParser;
 
 use clap::{Arg, ArgMatches, Command};
@@ -38,8 +35,6 @@ pub(super) fn update_replica_cmd() -> Command {
                 .help("Source bucket on the replicated instance")
                 .required(false),
         )
-        .arg(make_include_arg())
-        .arg(make_exclude_arg())
         .arg(make_entries_arg())
         .arg(make_each_n())
         .arg(make_each_s())
@@ -80,8 +75,6 @@ fn update_replication_settings(
         .get_many::<String>("entries")
         .map(|s| s.map(|s| s.to_string()).collect::<Vec<String>>());
 
-    let include = parse_label_args(args.get_many::<String>("include"))?;
-    let exclude = parse_label_args(args.get_many::<String>("exclude"))?;
     let each_n = args.get_one::<u64>("each-n");
     let each_s = args.get_one::<f64>("each-s");
     let when = args.get_one::<String>("when");
@@ -95,14 +88,6 @@ fn update_replication_settings(
         current_settings.src_bucket = source_bucket_name.clone();
     }
 
-    if let Some(include) = include {
-        current_settings.include = include;
-    }
-
-    if let Some(exclude) = exclude {
-        current_settings.exclude = exclude;
-    }
-
     if let Some(entries_filter) = entries_filter {
         current_settings.entries = entries_filter;
     }
@@ -151,8 +136,6 @@ mod tests {
                 "update",
                 format!("local/{}", test_replica).as_str(),
                 format!("local/{}", &bucket2).as_str(),
-                "--include",
-                "key1=value2",
                 "--each-n",
                 "10",
                 "--each-s",
@@ -167,11 +150,6 @@ mod tests {
         assert_eq!(replica.settings.dst_bucket, bucket2);
         assert_eq!(replica.settings.dst_host, "http://localhost:8383/");
         assert_eq!(replica.settings.dst_token, "***");
-        assert_eq!(
-            replica.settings.include,
-            Labels::from_iter(vec![("key1".to_string(), "value2".to_string())])
-        );
-        assert!(replica.settings.exclude.is_empty());
         assert!(replica.settings.entries.is_empty());
         assert_eq!(replica.settings.each_n, Some(10));
         assert_eq!(replica.settings.each_s, Some(0.5));

src/cmd/rm.rs

@@ -12,8 +12,7 @@ use crate::cmd::ALIAS_OR_URL_HELP;
 use crate::context::CliContext;
 use crate::io::reduct::build_client;
 use crate::parse::widely_used_args::{
-    make_each_n, make_each_s, make_entries_arg, make_exclude_arg, make_include_arg,
-    make_strict_arg, make_when_arg,
+    make_each_n, make_each_s, make_entries_arg, make_strict_arg, make_when_arg,
 };
 use crate::parse::{fetch_and_filter_entries, parse_query_params, QueryParams, ResourcePathParser};
 use async_trait::async_trait;
@@ -48,8 +47,6 @@ pub(crate) fn rm_cmd() -> Command {
                 .help("Remove records with timestamps newer than this time point in ISO format or Unix timestamp in microseconds.\nIf not specified, the export will end at the last record in an entry.")
                 .required(false)
         )
-        .arg(make_include_arg())
-        .arg(make_exclude_arg())
         .arg(make_entries_arg())
         .arg(make_each_n())
         .arg(make_each_s())

src/cmd/rm/query_remover.rs

@@ -49,9 +49,6 @@ impl QueryRemover {
             query_builder = query_builder.each_s(each_s);
         }
 
-        query_builder = query_builder.include(self.query_params.include_labels.clone());
-        query_builder = query_builder.exclude(self.query_params.exclude_labels.clone());
-
         if let Some(when) = &self.query_params.when {
             query_builder = query_builder.when(when.clone());
         }
@@ -85,8 +82,6 @@ mod tests {
             limit: None,
             entry_filter: vec![],
             parallel: 0,
-            include_labels: HashMap::new(),
-            exclude_labels: HashMap::new(),
             ttl: Default::default(),
             when: None,
             strict: false,