This is an automated email from the ASF dual-hosted git repository. mmiller pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/accumulo.git
The following commit(s) were added to refs/heads/main by this push: new 146b1d3 Fix typo 'propogate' (#2212) 146b1d3 is described below commit 146b1d3d0dc2ade6f1888c9905d83e37d98aedbe Author: Dom G <47725857+domgargu...@users.noreply.github.com> AuthorDate: Fri Jul 23 14:48:42 2021 -0400 Fix typo 'propogate' (#2212) --- .../accumulo/core/metadata/schema/ExternalCompactionMetadata.java | 2 +- .../java/org/apache/accumulo/server/compaction/CompactionInfo.java | 2 +- .../java/org/apache/accumulo/server/compaction/FileCompactor.java | 2 +- .../java/org/apache/accumulo/tserver/tablet/CompactableImpl.java | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/main/java/org/apache/accumulo/core/metadata/schema/ExternalCompactionMetadata.java b/core/src/main/java/org/apache/accumulo/core/metadata/schema/ExternalCompactionMetadata.java index eada2c7..02d9797 100644 --- a/core/src/main/java/org/apache/accumulo/core/metadata/schema/ExternalCompactionMetadata.java +++ b/core/src/main/java/org/apache/accumulo/core/metadata/schema/ExternalCompactionMetadata.java @@ -94,7 +94,7 @@ public class ExternalCompactionMetadata { return ceid; } - public boolean getPropogateDeletes() { + public boolean getPropagateDeletes() { return propagateDeletes; } diff --git a/server/base/src/main/java/org/apache/accumulo/server/compaction/CompactionInfo.java b/server/base/src/main/java/org/apache/accumulo/server/compaction/CompactionInfo.java index f7c0354..3615e10 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/compaction/CompactionInfo.java +++ b/server/base/src/main/java/org/apache/accumulo/server/compaction/CompactionInfo.java @@ -81,7 +81,7 @@ public class CompactionInfo { type = TCompactionType.MERGE; else type = TCompactionType.MINOR; - else if (!compactor.willPropogateDeletes()) + else if (!compactor.willPropagateDeletes()) type = TCompactionType.FULL; else type = TCompactionType.MAJOR; diff --git a/server/base/src/main/java/org/apache/accumulo/server/compaction/FileCompactor.java b/server/base/src/main/java/org/apache/accumulo/server/compaction/FileCompactor.java index 9d77443..a093f24 100644 --- a/server/base/src/main/java/org/apache/accumulo/server/compaction/FileCompactor.java +++ b/server/base/src/main/java/org/apache/accumulo/server/compaction/FileCompactor.java @@ -418,7 +418,7 @@ public class FileCompactor implements Callable<CompactionStats> { return env.getIteratorScope() == IteratorScope.minc; } - boolean willPropogateDeletes() { + boolean willPropagateDeletes() { return propagateDeletes; } diff --git a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactableImpl.java b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactableImpl.java index ece9f44..d4562cc 100644 --- a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactableImpl.java +++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/CompactableImpl.java @@ -453,8 +453,8 @@ public class CompactableImpl implements Compactable { } if (propDel == null) { - propDel = ecMeta.getPropogateDeletes(); - } else if (propDel != ecMeta.getPropogateDeletes()) { + propDel = ecMeta.getPropagateDeletes(); + } else if (propDel != ecMeta.getPropagateDeletes()) { unexpectedExternal = true; reasons.add("Disagreement on propagateDeletes"); break; @@ -464,7 +464,7 @@ public class CompactableImpl implements Compactable { if (propDel != null && !propDel && count > 1) { unexpectedExternal = true; - reasons.add("Concurrent compactions not propogatingDeletes"); + reasons.add("Concurrent compactions not propagatingDeletes"); } Pair<Long,CompactionConfig> idAndCfg = null;