You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2017/07/24 21:26:36 UTC
[1/9] accumulo git commit: ACCUMULO-4685 Fix bug in FileRefTest
Repository: accumulo
Updated Branches:
refs/heads/1.7 818e56bb5 -> f78a5d96b
refs/heads/1.8 6c21a8f0a -> 0f061b99c
refs/heads/master 867c2de35 -> cbce8101b
ACCUMULO-4685 Fix bug in FileRefTest
Fix bug in test because of retrieval from collection of wrong type.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f78a5d96
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f78a5d96
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f78a5d96
Branch: refs/heads/1.7
Commit: f78a5d96b29b43d0d50e6ca1fef632a6ed43f4ae
Parents: 818e56b
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jul 24 16:24:09 2017 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jul 24 16:24:09 2017 -0400
----------------------------------------------------------------------
.../src/test/java/org/apache/accumulo/server/fs/FileRefTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f78a5d96/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java b/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java
index 14ca20c..646a985 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java
@@ -64,7 +64,7 @@ public class FileRefTest {
refMap.put(new FileRef("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/C0004.rf"), "7");
refMap.put(new FileRef("hdfs://nn1/accumulo/tables/2a/t-0003/C0005.rf"), "8");
- Assert.assertNull(refMap.get("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/C0006.rf"));
+ Assert.assertNull(refMap.get(new FileRef("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/C0006.rf")));
Assert.assertEquals(refMap.get(new FileRef("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/C0004.rf")), "7");
Assert.assertEquals(refMap.get(new FileRef("hdfs://nn1/accumulo/tables/2a/t-0003/C0004.rf")), "7");
[4/9] accumulo git commit: Merge branch '1.7' into 1.8
Posted by ct...@apache.org.
Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/62d43cbe
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/62d43cbe
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/62d43cbe
Branch: refs/heads/1.8
Commit: 62d43cbe4902eaaf46768bbe5f75020ac5a54682
Parents: 6c21a8f f78a5d9
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jul 24 16:25:16 2017 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jul 24 16:25:16 2017 -0400
----------------------------------------------------------------------
.../src/test/java/org/apache/accumulo/server/fs/FileRefTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[7/9] accumulo git commit: ACCUMULO-4685 Fix minor type safety issues
Posted by ct...@apache.org.
ACCUMULO-4685 Fix minor type safety issues
Use diamond operator and generic method for emptySet
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0f061b99
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0f061b99
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0f061b99
Branch: refs/heads/1.8
Commit: 0f061b99cfae4fa9676ee5989eaf23682d1e61d9
Parents: 62d43cb
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jul 24 16:27:53 2017 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jul 24 16:27:53 2017 -0400
----------------------------------------------------------------------
.../server/master/balancer/HostRegexTableLoadBalancer.java | 4 ++--
.../server/master/balancer/HostRegexTableLoadBalancerTest.java | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f061b99/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
index dbf03d0..72a3a23 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
@@ -95,7 +95,7 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer implements Con
protected long oobCheckMillis = AccumuloConfiguration.getTimeInMillis(HOST_BALANCER_OOB_DEFAULT);
private static final long ONE_HOUR = 60 * 60 * 1000;
- private static final Set<KeyExtent> EMPTY_MIGRATIONS = Collections.EMPTY_SET;
+ private static final Set<KeyExtent> EMPTY_MIGRATIONS = Collections.emptySet();
private Map<String,String> tableIdToTableName = null;
private Map<String,Pattern> poolNameToRegexPattern = null;
@@ -411,7 +411,7 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer implements Con
LOG.trace("Sample up to 10 outstanding migrations: {}", Iterables.limit(migrations, 10));
}
migrationsFromLastPass.keySet().retainAll(migrations);
- SortedMap<TServerInstance,TabletServerStatus> currentCopy = new TreeMap(current);
+ SortedMap<TServerInstance,TabletServerStatus> currentCopy = new TreeMap<>(current);
Multimap<TServerInstance,String> serverTableIdCopied = HashMultimap.create();
for (TabletMigration migration : migrationsFromLastPass.values()) {
TableInfo fromInfo = getTableInfo(currentCopy, serverTableIdCopied, migration.tablet.getTableId().toString(), migration.oldServer);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f061b99/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java
index 120aab9..094ada8 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java
@@ -36,7 +36,6 @@ import org.apache.accumulo.core.data.thrift.TKeyExtent;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.tabletserver.thrift.TabletStats;
import org.apache.accumulo.fate.util.UtilWaitThread;
-import org.apache.accumulo.server.conf.ServerConfiguration;
import org.apache.accumulo.server.conf.TableConfiguration;
import org.apache.accumulo.server.master.state.TServerInstance;
import org.apache.accumulo.server.master.state.TabletMigration;
@@ -77,7 +76,7 @@ public class HostRegexTableLoadBalancerTest extends BaseHostRegexTableLoadBalanc
@Test
public void testBalance() {
- init((ServerConfiguration) factory);
+ init(factory);
Set<KeyExtent> migrations = new HashSet<KeyExtent>();
List<TabletMigration> migrationsOut = new ArrayList<TabletMigration>();
long wait = this.balance(Collections.unmodifiableSortedMap(createCurrent(15)), migrations, migrationsOut);
[2/9] accumulo git commit: ACCUMULO-4685 Fix bug in FileRefTest
Posted by ct...@apache.org.
ACCUMULO-4685 Fix bug in FileRefTest
Fix bug in test because of retrieval from collection of wrong type.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f78a5d96
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f78a5d96
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f78a5d96
Branch: refs/heads/1.8
Commit: f78a5d96b29b43d0d50e6ca1fef632a6ed43f4ae
Parents: 818e56b
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jul 24 16:24:09 2017 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jul 24 16:24:09 2017 -0400
----------------------------------------------------------------------
.../src/test/java/org/apache/accumulo/server/fs/FileRefTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f78a5d96/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java b/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java
index 14ca20c..646a985 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java
@@ -64,7 +64,7 @@ public class FileRefTest {
refMap.put(new FileRef("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/C0004.rf"), "7");
refMap.put(new FileRef("hdfs://nn1/accumulo/tables/2a/t-0003/C0005.rf"), "8");
- Assert.assertNull(refMap.get("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/C0006.rf"));
+ Assert.assertNull(refMap.get(new FileRef("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/C0006.rf")));
Assert.assertEquals(refMap.get(new FileRef("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/C0004.rf")), "7");
Assert.assertEquals(refMap.get(new FileRef("hdfs://nn1/accumulo/tables/2a/t-0003/C0004.rf")), "7");
[9/9] accumulo git commit: ACCUMULO-4685 Fix minor warnings
Posted by ct...@apache.org.
ACCUMULO-4685 Fix minor warnings
* Fix generics type safety warnings in YieldingIterator code
* Remove unused variable in ChaoticBalancerIT
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/cbce8101
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/cbce8101
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/cbce8101
Branch: refs/heads/master
Commit: cbce8101b8f5331f4551f588652b6232017875c8
Parents: 8df7a8e
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jul 24 17:14:07 2017 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jul 24 17:14:07 2017 -0400
----------------------------------------------------------------------
.../apache/accumulo/iteratortest/testcases/YieldingTestCase.java | 2 +-
.../org/apache/accumulo/test/functional/ChaoticBalancerIT.java | 4 ++--
.../org/apache/accumulo/test/functional/YieldingIterator.java | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cbce8101/iterator-test-harness/src/main/java/org/apache/accumulo/iteratortest/testcases/YieldingTestCase.java
----------------------------------------------------------------------
diff --git a/iterator-test-harness/src/main/java/org/apache/accumulo/iteratortest/testcases/YieldingTestCase.java b/iterator-test-harness/src/main/java/org/apache/accumulo/iteratortest/testcases/YieldingTestCase.java
index 71943d5..b20bdd6 100644
--- a/iterator-test-harness/src/main/java/org/apache/accumulo/iteratortest/testcases/YieldingTestCase.java
+++ b/iterator-test-harness/src/main/java/org/apache/accumulo/iteratortest/testcases/YieldingTestCase.java
@@ -45,7 +45,7 @@ public class YieldingTestCase extends OutputVerifyingTestCase {
try {
skvi.init(source, testInput.getIteratorOptions(), new SimpleIteratorEnvironment());
- YieldCallback<Key> yield = new YieldCallback();
+ YieldCallback<Key> yield = new YieldCallback<>();
skvi.enableYielding(yield);
skvi.seek(testInput.getRange(), testInput.getFamilies(), testInput.isInclusive());
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cbce8101/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java b/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
index e5222c5..d7e5129 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
@@ -54,8 +54,8 @@ public class ChaoticBalancerIT extends AccumuloClusterHarness {
@Test
public void test() throws Exception {
Connector c = getConnector();
- String[] names = getUniqueNames(2);
- String tableName = names[0], unused = names[1];
+ String[] names = getUniqueNames(1);
+ String tableName = names[0];
NewTableConfiguration ntc = new NewTableConfiguration();
ntc.setProperties(Stream.of(new Pair<>(Property.TABLE_LOAD_BALANCER.getKey(), ChaoticLoadBalancer.class.getName()),
new Pair<>(Property.TABLE_SPLIT_THRESHOLD.getKey(), "10K"), new Pair<>(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE.getKey(), "1K")).collect(
http://git-wip-us.apache.org/repos/asf/accumulo/blob/cbce8101/test/src/main/java/org/apache/accumulo/test/functional/YieldingIterator.java
----------------------------------------------------------------------
diff --git a/test/src/main/java/org/apache/accumulo/test/functional/YieldingIterator.java b/test/src/main/java/org/apache/accumulo/test/functional/YieldingIterator.java
index bad124e..a7881d1 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/YieldingIterator.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/YieldingIterator.java
@@ -121,7 +121,7 @@ public class YieldingIterator extends WrappingIterator {
}
@Override
- public void enableYielding(YieldCallback yield) {
+ public void enableYielding(YieldCallback<Key> yield) {
this.yield = Optional.of(yield);
}
}
[6/9] accumulo git commit: ACCUMULO-4685 Fix minor type safety issues
Posted by ct...@apache.org.
ACCUMULO-4685 Fix minor type safety issues
Use diamond operator and generic method for emptySet
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0f061b99
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0f061b99
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0f061b99
Branch: refs/heads/master
Commit: 0f061b99cfae4fa9676ee5989eaf23682d1e61d9
Parents: 62d43cb
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jul 24 16:27:53 2017 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jul 24 16:27:53 2017 -0400
----------------------------------------------------------------------
.../server/master/balancer/HostRegexTableLoadBalancer.java | 4 ++--
.../server/master/balancer/HostRegexTableLoadBalancerTest.java | 3 +--
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f061b99/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
----------------------------------------------------------------------
diff --git a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
index dbf03d0..72a3a23 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancer.java
@@ -95,7 +95,7 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer implements Con
protected long oobCheckMillis = AccumuloConfiguration.getTimeInMillis(HOST_BALANCER_OOB_DEFAULT);
private static final long ONE_HOUR = 60 * 60 * 1000;
- private static final Set<KeyExtent> EMPTY_MIGRATIONS = Collections.EMPTY_SET;
+ private static final Set<KeyExtent> EMPTY_MIGRATIONS = Collections.emptySet();
private Map<String,String> tableIdToTableName = null;
private Map<String,Pattern> poolNameToRegexPattern = null;
@@ -411,7 +411,7 @@ public class HostRegexTableLoadBalancer extends TableLoadBalancer implements Con
LOG.trace("Sample up to 10 outstanding migrations: {}", Iterables.limit(migrations, 10));
}
migrationsFromLastPass.keySet().retainAll(migrations);
- SortedMap<TServerInstance,TabletServerStatus> currentCopy = new TreeMap(current);
+ SortedMap<TServerInstance,TabletServerStatus> currentCopy = new TreeMap<>(current);
Multimap<TServerInstance,String> serverTableIdCopied = HashMultimap.create();
for (TabletMigration migration : migrationsFromLastPass.values()) {
TableInfo fromInfo = getTableInfo(currentCopy, serverTableIdCopied, migration.tablet.getTableId().toString(), migration.oldServer);
http://git-wip-us.apache.org/repos/asf/accumulo/blob/0f061b99/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java
index 120aab9..094ada8 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/master/balancer/HostRegexTableLoadBalancerTest.java
@@ -36,7 +36,6 @@ import org.apache.accumulo.core.data.thrift.TKeyExtent;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
import org.apache.accumulo.core.tabletserver.thrift.TabletStats;
import org.apache.accumulo.fate.util.UtilWaitThread;
-import org.apache.accumulo.server.conf.ServerConfiguration;
import org.apache.accumulo.server.conf.TableConfiguration;
import org.apache.accumulo.server.master.state.TServerInstance;
import org.apache.accumulo.server.master.state.TabletMigration;
@@ -77,7 +76,7 @@ public class HostRegexTableLoadBalancerTest extends BaseHostRegexTableLoadBalanc
@Test
public void testBalance() {
- init((ServerConfiguration) factory);
+ init(factory);
Set<KeyExtent> migrations = new HashSet<KeyExtent>();
List<TabletMigration> migrationsOut = new ArrayList<TabletMigration>();
long wait = this.balance(Collections.unmodifiableSortedMap(createCurrent(15)), migrations, migrationsOut);
[5/9] accumulo git commit: Merge branch '1.7' into 1.8
Posted by ct...@apache.org.
Merge branch '1.7' into 1.8
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/62d43cbe
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/62d43cbe
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/62d43cbe
Branch: refs/heads/master
Commit: 62d43cbe4902eaaf46768bbe5f75020ac5a54682
Parents: 6c21a8f f78a5d9
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jul 24 16:25:16 2017 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jul 24 16:25:16 2017 -0400
----------------------------------------------------------------------
.../src/test/java/org/apache/accumulo/server/fs/FileRefTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
[3/9] accumulo git commit: ACCUMULO-4685 Fix bug in FileRefTest
Posted by ct...@apache.org.
ACCUMULO-4685 Fix bug in FileRefTest
Fix bug in test because of retrieval from collection of wrong type.
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/f78a5d96
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f78a5d96
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f78a5d96
Branch: refs/heads/master
Commit: f78a5d96b29b43d0d50e6ca1fef632a6ed43f4ae
Parents: 818e56b
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jul 24 16:24:09 2017 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jul 24 16:24:09 2017 -0400
----------------------------------------------------------------------
.../src/test/java/org/apache/accumulo/server/fs/FileRefTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/f78a5d96/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java
----------------------------------------------------------------------
diff --git a/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java b/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java
index 14ca20c..646a985 100644
--- a/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java
+++ b/server/base/src/test/java/org/apache/accumulo/server/fs/FileRefTest.java
@@ -64,7 +64,7 @@ public class FileRefTest {
refMap.put(new FileRef("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/C0004.rf"), "7");
refMap.put(new FileRef("hdfs://nn1/accumulo/tables/2a/t-0003/C0005.rf"), "8");
- Assert.assertNull(refMap.get("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/C0006.rf"));
+ Assert.assertNull(refMap.get(new FileRef("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/C0006.rf")));
Assert.assertEquals(refMap.get(new FileRef("hdfs://1.2.3.4/accumulo/tables/2a/t-0003/C0004.rf")), "7");
Assert.assertEquals(refMap.get(new FileRef("hdfs://nn1/accumulo/tables/2a/t-0003/C0004.rf")), "7");
[8/9] accumulo git commit: Merge branch '1.8'
Posted by ct...@apache.org.
Merge branch '1.8'
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/8df7a8e5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/8df7a8e5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/8df7a8e5
Branch: refs/heads/master
Commit: 8df7a8e5c25618194d53a6a17f52a01771891797
Parents: 867c2de 0f061b9
Author: Christopher Tubbs <ct...@apache.org>
Authored: Mon Jul 24 17:02:02 2017 -0400
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Mon Jul 24 17:02:02 2017 -0400
----------------------------------------------------------------------
.../src/test/java/org/apache/accumulo/server/fs/FileRefTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------