[accumulo] 01/02: Merge branch '1.9'

[ctubbsii]

This is an automated email from the ASF dual-hosted git repository.

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

commit 0773eca7ab92487ce8dbbed7b16d6375c5f55782
Merge: dfb74d8 da198ba
Author: Christopher Tubbs <ctubb...@apache.org>
AuthorDate: Thu Jan 30 14:47:13 2020 -0500

    Merge branch '1.9'

 .../main/java/org/apache/accumulo/core/conf/PropertyType.java | 11 ++++-------
 .../java/org/apache/accumulo/test/functional/CloneTestIT.java |  4 +---
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --cc core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
index 607e2d6,e84586f..1729a6f
--- a/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
+++ b/core/src/main/java/org/apache/accumulo/core/conf/PropertyType.java
@@@ -26,9 -24,11 +26,10 @@@ import java.util.function.Function
  import java.util.function.Predicate;
  import java.util.regex.Matcher;
  import java.util.regex.Pattern;
+ import java.util.stream.Stream;
  
 -import org.apache.accumulo.core.Constants;
  import org.apache.accumulo.core.util.Pair;
 -import org.apache.commons.lang.math.IntRange;
 +import org.apache.commons.lang3.Range;
  import org.apache.hadoop.fs.Path;
  
  import com.google.common.base.Preconditions;
diff --cc 
test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java
index 430402b,0d88f7f..53db5f4
--- a/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CloneTestIT.java
@@@ -272,31 -285,28 +272,29 @@@ public class CloneTestIT extends Accumu
      String table1 = tableNames[0];
      String table2 = tableNames[1];
  
 -    Connector c = getConnector();
 -    AccumuloCluster cluster = getCluster();
 -    Assume.assumeTrue(cluster instanceof MiniAccumuloClusterImpl);
 +    try (AccumuloClient c = 
Accumulo.newClient().from(getClientProps()).build()) {
 +      AccumuloCluster cluster = getCluster();
 +      Assume.assumeTrue(cluster instanceof MiniAccumuloClusterImpl);
-       MiniAccumuloClusterImpl mac = (MiniAccumuloClusterImpl) cluster;
-       String rootPath = mac.getConfig().getDir().getAbsolutePath();
  
 -    c.tableOperations().create(table1);
 +      c.tableOperations().create(table1);
  
-       BatchWriter bw = writeData(table1, c);
 -    writeData(table1, c);
++      writeData(table1, c);
  
 -    Map<String,String> props = new HashMap<>();
 -    props.put(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE.getKey(), "500K");
 +      Map<String,String> props = new HashMap<>();
 +      props.put(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE.getKey(), "500K");
  
 -    Set<String> exclude = new HashSet<>();
 -    exclude.add(Property.TABLE_FILE_MAX.getKey());
 +      Set<String> exclude = new HashSet<>();
 +      exclude.add(Property.TABLE_FILE_MAX.getKey());
  
 -    c.tableOperations().clone(table1, table2, 
CloneConfiguration.builder().setFlush(true)
 -        
.setPropertiesToSet(props).setPropertiesToExclude(exclude).setKeepOffline(true).build());
 +      c.tableOperations().clone(table1, table2, 
CloneConfiguration.builder().setFlush(true)
 +          
.setPropertiesToSet(props).setPropertiesToExclude(exclude).setKeepOffline(true).build());
  
 -    assertTableState(table2, c, TableState.OFFLINE);
 +      assertTableState(table2, c, TableState.OFFLINE);
  
 -    // delete tables
 -    c.tableOperations().delete(table1);
 -    c.tableOperations().delete(table2);
 +      // delete tables
 +      c.tableOperations().delete(table1);
 +      c.tableOperations().delete(table2);
 +    }
    }
  
    @Test