Rename grpc field interval to interval_secs

quickwit-oss · Sep 19, 2024 · 44290ef · 44290ef
1 parent 4da6215
commit 44290ef
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 14 deletions.
diff --git a/quickwit/quickwit-control-plane/src/control_plane.rs b/quickwit/quickwit-control-plane/src/control_plane.rs
@@ -789,8 +789,8 @@ impl Handler<PruneShardsRequest> for ControlPlane {
         _ctx: &ActorContext<Self>,
     ) -> Result<ControlPlaneResult<EmptyResponse>, ActorExitStatus> {
         let interval = request
-            .interval
-            .map(|interval| Duration::from_secs(interval as u64))
+            .interval_secs
+            .map(|interval_secs| Duration::from_secs(interval_secs as u64))
             .unwrap_or_else(|| PRUNE_SHARDS_DEFAULT_COOLDOWN_PERIOD);
 
         // A very basic debounce is enough here, missing one call to the pruning API is fine

diff --git a/quickwit/quickwit-indexing/src/source/queue_sources/shared_state.rs b/quickwit/quickwit-indexing/src/source/queue_sources/shared_state.rs
@@ -100,7 +100,7 @@ impl QueueSharedState {
                         source_id: source_id.clone(),
                         max_age_secs,
                         max_count,
-                        interval: Some(pruning_interval.as_secs() as u32),
+                        interval_secs: Some(pruning_interval.as_secs() as u32),
                     })
                     .await;
                 if let Err(err) = result {

diff --git a/quickwit/quickwit-metastore/src/metastore/file_backed/file_backed_index/shards.rs b/quickwit/quickwit-metastore/src/metastore/file_backed/file_backed_index/shards.rs
@@ -642,7 +642,7 @@ mod tests {
             source_id: source_id.clone(),
             max_age_secs: None,
             max_count: None,
-            interval: None,
+            interval_secs: None,
         };
         let MutationOccurred::No(()) = shards.prune_shards(request).unwrap() else {
             panic!("expected `MutationOccurred::No`");
@@ -653,7 +653,7 @@ mod tests {
             source_id: source_id.clone(),
             max_age_secs: Some(50),
             max_count: None,
-            interval: None,
+            interval_secs: None,
         };
         let MutationOccurred::No(()) = shards.prune_shards(request).unwrap() else {
             panic!("expected `MutationOccurred::No`");
@@ -690,7 +690,7 @@ mod tests {
             source_id: source_id.clone(),
             max_age_secs: Some(150),
             max_count: None,
-            interval: None,
+            interval_secs: None,
         };
         let MutationOccurred::Yes(()) = shards.prune_shards(request).unwrap() else {
             panic!("expected `MutationOccurred::Yes`");
@@ -701,7 +701,7 @@ mod tests {
             source_id: source_id.clone(),
             max_age_secs: Some(150),
             max_count: None,
-            interval: None,
+            interval_secs: None,
         };
         let MutationOccurred::No(()) = shards.prune_shards(request).unwrap() else {
             panic!("expected `MutationOccurred::No`");

diff --git a/quickwit/quickwit-metastore/src/tests/shard.rs b/quickwit/quickwit-metastore/src/tests/shard.rs
@@ -654,7 +654,7 @@ pub async fn test_metastore_prune_shards<
             source_id: test_index.source_id.clone(),
             max_age_secs: None,
             max_count: None,
-            interval: None,
+            interval_secs: None,
         };
         metastore.prune_shards(prune_index_request).await.unwrap();
         let all_shards = metastore
@@ -670,7 +670,7 @@ pub async fn test_metastore_prune_shards<
             source_id: test_index.source_id.clone(),
             max_age_secs: Some(oldest_shard_age - 350),
             max_count: None,
-            interval: None,
+            interval_secs: None,
         };
         metastore.prune_shards(prune_index_request).await.unwrap();
 
@@ -690,7 +690,7 @@ pub async fn test_metastore_prune_shards<
             source_id: test_index.source_id.clone(),
             max_age_secs: None,
             max_count: Some(90),
-            interval: None,
+            interval_secs: None,
         };
         metastore.prune_shards(prune_index_request).await.unwrap();
         let mut all_shards = metastore
@@ -708,7 +708,7 @@ pub async fn test_metastore_prune_shards<
         source_id: test_index.source_id.clone(),
         max_age_secs: Some(oldest_shard_age - 2950),
         max_count: Some(80),
-        interval: None,
+        interval_secs: None,
     };
     metastore.prune_shards(prune_index_request).await.unwrap();
     let all_shards = metastore
@@ -722,7 +722,7 @@ pub async fn test_metastore_prune_shards<
         source_id: test_index.source_id.clone(),
         max_age_secs: Some(oldest_shard_age - 4000),
         max_count: Some(50),
-        interval: None,
+        interval_secs: None,
     };
     metastore.prune_shards(prune_index_request).await.unwrap();
     let all_shards = metastore

diff --git a/quickwit/quickwit-proto/protos/quickwit/metastore.proto b/quickwit/quickwit-proto/protos/quickwit/metastore.proto
@@ -462,7 +462,7 @@ message PruneShardsRequest {
   // The maximum number of the shards to keep. Delete older shards first.
   optional uint32 max_count = 6;
   // The interval between two pruning operations, in seconds.
-  optional uint32 interval = 7;
+  optional uint32 interval_secs = 7;
 }
 
 message ListShardsRequest {

diff --git a/quickwit/quickwit-proto/src/codegen/quickwit/quickwit.metastore.rs b/quickwit/quickwit-proto/src/codegen/quickwit/quickwit.metastore.rs