You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by mm...@apache.org on 2018/03/16 20:35:57 UTC
[accumulo] branch master updated (63260d5 -> d6431ad)
This is an automated email from the ASF dual-hosted git repository.
mmiller pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git.
from 63260d5 Proposal for switching to github issues (#396)
add acc74c7 Fix ChaoticBalancerIT (#401)
add 4c7785b Merge branch '1.7' into 1.8
new d6431ad Merge branch '1.8'
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
--
To stop receiving notification emails like this one, please contact
mmiller@apache.org.
[accumulo] 01/01: Merge branch '1.8'
Posted by mm...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mmiller pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit d6431adb181c39d177e2f67a87206b8d4260e936
Merge: 63260d5 4c7785b
Author: Mike Miller <mm...@apache.org>
AuthorDate: Fri Mar 16 16:34:58 2018 -0400
Merge branch '1.8'
Conflicts Resolved:
server/base/src/main/java/org/apache/accumulo/server/master/balancer/ChaoticLoadBalancer.java
test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
.../java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --cc test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
index e7b94c1,4b0580b..712babb
--- a/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/ChaoticBalancerIT.java
@@@ -53,14 -54,16 +55,13 @@@ public class ChaoticBalancerIT extends
@Test
public void test() throws Exception {
Connector c = getConnector();
- String[] names = getUniqueNames(2);
- String tableName = names[0], unused = names[1];
- c.tableOperations().create(tableName);
- c.tableOperations().setProperty(tableName, Property.TABLE_SPLIT_THRESHOLD.getKey(), "10K");
- SortedSet<Text> splits = new TreeSet<>();
- for (int i = 0; i < 100; i++) {
- splits.add(new Text(String.format("%03d", i)));
- }
- c.tableOperations().create(unused);
- c.tableOperations().addSplits(unused, splits);
+ 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(
++ ntc.setProperties(Stream.of(new Pair<>(Property.TABLE_SPLIT_THRESHOLD.getKey(), "10K"), new Pair<>(Property.TABLE_FILE_COMPRESSED_BLOCK_SIZE.getKey(), "1K")).collect(
+ Collectors.toMap(k -> k.getFirst(), v -> v.getSecond())));
+ c.tableOperations().create(tableName, ntc);
+
TestIngest.Opts opts = new TestIngest.Opts();
VerifyIngest.Opts vopts = new VerifyIngest.Opts();
vopts.rows = opts.rows = 20000;
--
To stop receiving notification emails like this one, please contact
mmiller@apache.org.