gaph, store: Rename PruningStrategy::Copy to Rebuild

Author: lutter

graph/src/components/store/mod.rs

@@ -1208,7 +1208,7 @@ pub enum PrunePhase {
 impl PrunePhase {
     pub fn strategy(&self) -> PruningStrategy {
         match self {
-            PrunePhase::CopyFinal | PrunePhase::CopyNonfinal => PruningStrategy::Copy,
+            PrunePhase::CopyFinal | PrunePhase::CopyNonfinal => PruningStrategy::Rebuild,
             PrunePhase::Delete => PruningStrategy::Delete,
         }
     }
@@ -1247,9 +1247,9 @@ pub trait PruneReporter: Send + 'static {
 /// Select how pruning should be done
 #[derive(Clone, Copy, Debug, Display, PartialEq)]
 pub enum PruningStrategy {
-    /// Copy the data we want to keep to new tables and swap them out for
-    /// the existing tables
-    Copy,
+    /// Rebuild by copying the data we want to keep to new tables and swap
+    /// them out for the existing tables
+    Rebuild,
     /// Delete unneeded data from the existing tables
     Delete,
 }
@@ -1357,7 +1357,7 @@ impl PruneRequest {
         // will remove.
         let removal_ratio = self.history_pct(stats) * (1.0 - stats.ratio);
         if removal_ratio >= self.copy_threshold {
-            Some(PruningStrategy::Copy)
+            Some(PruningStrategy::Rebuild)
         } else if removal_ratio >= self.delete_threshold {
             Some(PruningStrategy::Delete)
         } else {

store/postgres/src/deployment_store.rs

@@ -1969,7 +1969,7 @@ impl PruneReporter for OngoingPruneReporter {
 
     fn prune_batch(&mut self, _table: &str, rows: usize, phase: PrunePhase, _finished: bool) {
         match phase.strategy() {
-            PruningStrategy::Copy => self.rows_copied += rows,
+            PruningStrategy::Rebuild => self.rows_copied += rows,
             PruningStrategy::Delete => self.rows_deleted += rows,
         }
     }

store/postgres/src/relational/prune.rs

@@ -414,7 +414,7 @@ impl Layout {
         for (table, strat) in &prunable_tables {
             reporter.start_table(table.name.as_str());
             match strat {
-                PruningStrategy::Copy => {
+                PruningStrategy::Rebuild => {
                     if recreate_dst_nsp {
                         catalog::recreate_schema(conn, dst_nsp.as_str())?;
                         recreate_dst_nsp = false;

store/postgres/tests/graft.rs

@@ -569,7 +569,7 @@ fn prune() {
         );
     }
 
-    for strategy in [PruningStrategy::Copy, PruningStrategy::Delete] {
+    for strategy in [PruningStrategy::Rebuild, PruningStrategy::Delete] {
         run_test(move |store, src| async move {
             store
                 .set_history_blocks(&src, -3, 10)
@@ -612,7 +612,7 @@ fn prune() {
             let mut req = PruneRequest::new(&src, 3, 1, 0, 6)?;
             // Change the thresholds so that we select the desired strategy
             match strategy {
-                PruningStrategy::Copy => {
+                PruningStrategy::Rebuild => {
                     req.copy_threshold = 0.0;
                     req.delete_threshold = 0.0;
                 }