diff options
author | petr-tik <petr-tik@users.noreply.github.com> | 2019-04-16 00:05:53 +0100 |
---|---|---|
committer | petr-tik <petr-tik@users.noreply.github.com> | 2019-04-24 20:46:28 +0100 |
commit | 8e509213634ccbf82c3380e1b660ec1ffb735301 (patch) | |
tree | ccabf983d387fd1fd7dc48b5f9932e7a968f0db7 /src/indexer/merge_operation.rs | |
parent | 96a4f503ecd8f138862bf0a22948a600faf2b120 (diff) |
Tidied up the Stamper module and upgraded to a 1.34 dependency
Added stamper.revert method to be used for rollback - rolling back to a previous
commit in case of deleting all documents or rolling operations back should reset
the stamper as well
Added type alias for Opstamp - helps code readibility instead of seeing u64
returned by functions.
Moved to AtomicU64 on stable rust (since 1.34) - where possible use standard
library interfaces.
Diffstat (limited to 'src/indexer/merge_operation.rs')
-rw-r--r-- | src/indexer/merge_operation.rs | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/indexer/merge_operation.rs b/src/indexer/merge_operation.rs index 9d7bcbc..5bf84f1 100644 --- a/src/indexer/merge_operation.rs +++ b/src/indexer/merge_operation.rs @@ -1,4 +1,5 @@ use census::{Inventory, TrackedObject}; +use indexer::Opstamp; use std::collections::HashSet; use SegmentId; @@ -35,14 +36,14 @@ pub struct MergeOperation { } struct InnerMergeOperation { - target_opstamp: u64, + target_opstamp: Opstamp, segment_ids: Vec<SegmentId>, } impl MergeOperation { pub fn new( inventory: &MergeOperationInventory, - target_opstamp: u64, + target_opstamp: Opstamp, segment_ids: Vec<SegmentId>, ) -> MergeOperation { let inner_merge_operation = InnerMergeOperation { @@ -54,7 +55,7 @@ impl MergeOperation { } } - pub fn target_opstamp(&self) -> u64 { + pub fn target_opstamp(&self) -> Opstamp { self.inner.target_opstamp } |