accumulo-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From GitBox <...@apache.org>
Subject [GitHub] milleruntime closed pull request #406: ACCUMULO-3389 Fix name in tsBatchDeleter
Date Tue, 20 Mar 2018 20:32:34 GMT
milleruntime closed pull request #406: ACCUMULO-3389 Fix name in tsBatchDeleter
URL: https://github.com/apache/accumulo/pull/406
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

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 a3c31bae91..fdaacd7f7f 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 String getName() {
    */
   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 d3b26dc9f5..5b2d93d04b 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 TabletServerBatchDeleter(ClientContext context, String tableId, Authoriza
     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


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

Mime
View raw message