accumulo-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mmil...@apache.org
Subject [accumulo] branch 1.8 updated: ACCUMULO-3389 Fix name in tsBatchDeleter (#406)
Date Tue, 20 Mar 2018 20:32:34 GMT
This is an automated email from the ASF dual-hosted git repository.

mmiller pushed a commit to branch 1.8
in repository https://gitbox.apache.org/repos/asf/accumulo.git


The following commit(s) were added to refs/heads/1.8 by this push:
     new d0921d1  ACCUMULO-3389 Fix name in tsBatchDeleter (#406)
d0921d1 is described below

commit d0921d1b74532609e6a9d6b271aa674723645eac
Author: Mike Miller <mmiller@apache.org>
AuthorDate: Tue Mar 20 16:32:32 2018 -0400

    ACCUMULO-3389 Fix name in tsBatchDeleter (#406)
    
    * Also improved error message in IteratorSetting to include bad name
---
 core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java | 2 +-
 .../org/apache/accumulo/core/client/impl/TabletServerBatchDeleter.java  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java b/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
index a3c31ba..fdaacd7 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/IteratorSetting.java
@@ -89,7 +89,7 @@ public class IteratorSetting implements Writable {
    */
   public void setName(String name) {
     checkArgument(name != null, "name is null");
-    checkArgument(!name.contains("."), "Iterator name cannot contain a dot/period");
+    checkArgument(!name.contains("."), "Iterator name cannot contain a dot/period: " + name);
     this.name = name;
   }
 
diff --git a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchDeleter.java
b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchDeleter.java
index d3b26dc..5b2d93d 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchDeleter.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/TabletServerBatchDeleter.java
@@ -44,7 +44,7 @@ public class TabletServerBatchDeleter extends TabletServerBatchReader implements
     this.context = context;
     this.tableId = tableId;
     this.bwConfig = bwConfig;
-    super.addScanIterator(new IteratorSetting(Integer.MAX_VALUE, BatchDeleter.class.getName()
+ ".NOVALUE", SortedKeyIterator.class));
+    super.addScanIterator(new IteratorSetting(Integer.MAX_VALUE, BatchDeleter.class.getName().replaceAll("[.]",
"_") + "_NOVALUE", SortedKeyIterator.class));
   }
 
   @Override

-- 
To stop receiving notification emails like this one, please contact
mmiller@apache.org.

Mime
View raw message