You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by kt...@apache.org on 2013/03/15 02:09:24 UTC
svn commit: r1456738 [3/3] - in /accumulo/branches/1.5:
core/src/main/java/org/apache/accumulo/core/client/admin/
core/src/main/java/org/apache/accumulo/core/client/impl/
core/src/main/java/org/apache/accumulo/core/client/mock/
core/src/main/java/org/a...
Modified: accumulo/branches/1.5/proxy/src/main/thrift/proxy.thrift
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/proxy/src/main/thrift/proxy.thrift?rev=1456738&r1=1456737&r2=1456738&view=diff
==============================================================================
--- accumulo/branches/1.5/proxy/src/main/thrift/proxy.thrift (original)
+++ accumulo/branches/1.5/proxy/src/main/thrift/proxy.thrift Fri Mar 15 01:09:23 2013
@@ -261,11 +261,11 @@ service AccumuloProxy
5:bool startInclusive, 6:binary endRow, 7:bool endInclusive)
throws (1:TableNotFoundException ouch1, 2:AccumuloException ouch2, 3:AccumuloSecurityException ouch3);
map<string,string> getTableProperties (1:binary login, 2:string tableName) throws (1:AccumuloException ouch1, 2:TableNotFoundException ouch2);
- list<binary> getSplits (1:binary login, 2:string tableName, 3:i32 maxSplits) throws (1:TableNotFoundException ouch1);
void importDirectory (1:binary login, 2:string tableName, 3:string importDir,
4:string failureDir, 5:bool setTime)
throws (1:TableNotFoundException ouch1, 2:AccumuloException ouch3, 3:AccumuloSecurityException ouch4);
void importTable (1:binary login, 2:string tableName, 3:string importDir) throws (1:TableExistsException ouch1, 2:AccumuloException ouch2, 3:AccumuloSecurityException ouch3);
+ list<binary> listSplits (1:binary login, 2:string tableName, 3:i32 maxSplits) throws (1:TableNotFoundException ouch1, 2:AccumuloException ouch2, 3:AccumuloSecurityException ouch3);
set<string> listTables (1:binary login);
map<string,set<IteratorScope>> listIterators (1:binary login, 2:string tableName) throws (1:AccumuloSecurityException ouch1, 2:AccumuloException ouch2, 3:TableNotFoundException ouch3);
map<string,i32> listConstraints (1:binary login, 2:string tableName) throws (1:AccumuloException ouch1, 2:TableNotFoundException ouch2);
Modified: accumulo/branches/1.5/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java?rev=1456738&r1=1456737&r2=1456738&view=diff
==============================================================================
--- accumulo/branches/1.5/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java (original)
+++ accumulo/branches/1.5/proxy/src/test/java/org/apache/accumulo/proxy/SimpleTest.java Fri Mar 15 01:09:23 2013
@@ -361,13 +361,13 @@ public class SimpleTest {
assertEquals(s2bb("x"), more.getResults().get(0).value);
// splits, merge
client.addSplits(creds, "test", new HashSet<ByteBuffer>(Arrays.asList(s2bb("a"), s2bb("m"), s2bb("z"))));
- List<ByteBuffer> splits = client.getSplits(creds, "test", 1);
+ List<ByteBuffer> splits = client.listSplits(creds, "test", 1);
assertEquals(Arrays.asList(s2bb("m")), splits);
client.mergeTablets(creds, "test", null, s2bb("m"));
- splits = client.getSplits(creds, "test", 10);
+ splits = client.listSplits(creds, "test", 10);
assertEquals(Arrays.asList(s2bb("m"), s2bb("z")), splits);
client.mergeTablets(creds, "test", null, null);
- splits = client.getSplits(creds, "test", 10);
+ splits = client.listSplits(creds, "test", 10);
List<ByteBuffer> empty = Collections.emptyList();
assertEquals(empty, splits);
// iterators
Modified: accumulo/branches/1.5/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyTableOperations.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyTableOperations.java?rev=1456738&r1=1456737&r2=1456738&view=diff
==============================================================================
--- accumulo/branches/1.5/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyTableOperations.java (original)
+++ accumulo/branches/1.5/proxy/src/test/java/org/apache/accumulo/proxy/TestProxyTableOperations.java Fri Mar 15 01:09:23 2013
@@ -119,7 +119,7 @@ public class TestProxyTableOperations {
splits.remove("c");
- List<ByteBuffer> tableSplits = tpc.proxy().getSplits(userpass, testtable, 10);
+ List<ByteBuffer> tableSplits = tpc.proxy().listSplits(userpass, testtable, 10);
for (ByteBuffer split : tableSplits)
assertTrue(splits.contains(split));
@@ -135,7 +135,7 @@ public class TestProxyTableOperations {
splits.add(ByteBuffer.wrap("z".getBytes()));
tpc.proxy().addSplits(userpass, testtable, splits);
- List<ByteBuffer> tableSplits = tpc.proxy().getSplits(userpass, testtable, 10);
+ List<ByteBuffer> tableSplits = tpc.proxy().listSplits(userpass, testtable, 10);
for (ByteBuffer split : tableSplits)
assertTrue(splits.contains(split));
Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/AddSplitTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/AddSplitTest.java?rev=1456738&r1=1456737&r2=1456738&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/AddSplitTest.java (original)
+++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/AddSplitTest.java Fri Mar 15 01:09:23 2013
@@ -69,7 +69,7 @@ public class AddSplitTest extends Functi
UtilWaitThread.sleep(100);
- Collection<Text> actualSplits = getConnector().tableOperations().getSplits("foo");
+ Collection<Text> actualSplits = getConnector().tableOperations().listSplits("foo");
if (!splits.equals(new TreeSet<Text>(actualSplits))) {
throw new Exception(splits + " != " + actualSplits);
@@ -89,7 +89,7 @@ public class AddSplitTest extends Functi
UtilWaitThread.sleep(100);
- actualSplits = getConnector().tableOperations().getSplits("foo");
+ actualSplits = getConnector().tableOperations().listSplits("foo");
if (!splits.equals(new TreeSet<Text>(actualSplits))) {
throw new Exception(splits + " != " + actualSplits);
Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitTest.java?rev=1456738&r1=1456737&r2=1456738&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitTest.java (original)
+++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/BatchScanSplitTest.java Fri Mar 15 01:09:23 2013
@@ -75,10 +75,10 @@ public class BatchScanSplitTest extends
getConnector().tableOperations().setProperty("bss", Property.TABLE_SPLIT_THRESHOLD.getKey(), "4K");
- Collection<Text> splits = getConnector().tableOperations().getSplits("bss");
+ Collection<Text> splits = getConnector().tableOperations().listSplits("bss");
while (splits.size() < 2) {
UtilWaitThread.sleep(1);
- splits = getConnector().tableOperations().getSplits("bss");
+ splits = getConnector().tableOperations().listSplits("bss");
}
System.out.println("splits : " + splits);
@@ -119,7 +119,7 @@ public class BatchScanSplitTest extends
throw new Exception("Found and expected differ " + found + " " + expected);
}
- splits = getConnector().tableOperations().getSplits("bss");
+ splits = getConnector().tableOperations().listSplits("bss");
System.out.println("splits : " + splits);
}
Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationTest.java?rev=1456738&r1=1456737&r2=1456738&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationTest.java (original)
+++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/BulkSplitOptimizationTest.java Fri Mar 15 01:09:23 2013
@@ -78,7 +78,7 @@ public class BulkSplitOptimizationTest e
UtilWaitThread.sleep(2000);
// wait until over split threshold
- while (getConnector().tableOperations().getSplits(TABLE_NAME).size() < 50) {
+ while (getConnector().tableOperations().listSplits(TABLE_NAME).size() < 50) {
UtilWaitThread.sleep(500);
}
Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsTest.java?rev=1456738&r1=1456737&r2=1456738&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsTest.java (original)
+++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/DeleteRowsTest.java Fri Mar 15 01:09:23 2013
@@ -119,7 +119,7 @@ public class DeleteRowsTest extends Func
Text startText = start == null ? null : new Text(start);
Text endText = end == null ? null : new Text(end);
this.getConnector().tableOperations().deleteRows(table, startText, endText);
- Collection<Text> remainingSplits = this.getConnector().tableOperations().getSplits(table);
+ Collection<Text> remainingSplits = this.getConnector().tableOperations().listSplits(table);
StringBuilder sb = new StringBuilder();
// See that whole tablets are removed
for (Text split : remainingSplits)
Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTest.java?rev=1456738&r1=1456737&r2=1456738&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTest.java (original)
+++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/FunctionalTest.java Fri Mar 15 01:09:23 2013
@@ -177,7 +177,7 @@ public abstract class FunctionalTest {
*/
protected void checkSplits(String table, int min, int max) throws Exception {
- Collection<Text> splits = getConnector().tableOperations().getSplits(table);
+ Collection<Text> splits = getConnector().tableOperations().listSplits(table);
if (splits.size() < min || splits.size() > max) {
throw new Exception("# of table splits points out of range, #splits=" + splits.size() + " table=" + table + " min=" + min + " max=" + max);
}
Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/MergeTest.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/MergeTest.java?rev=1456738&r1=1456737&r2=1456738&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/MergeTest.java (original)
+++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/functional/MergeTest.java Fri Mar 15 01:09:23 2013
@@ -126,7 +126,7 @@ public class MergeTest extends Functiona
throw new Exception("data inconsistency " + table + " " + observed + " != " + expected);
}
- HashSet<Text> currentSplits = new HashSet<Text>(conn.tableOperations().getSplits(table));
+ HashSet<Text> currentSplits = new HashSet<Text>(conn.tableOperations().listSplits(table));
HashSet<Text> ess = new HashSet<Text>();
for (String es : expectedSplits) {
ess.add(new Text(es));
Added: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ListSplits.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ListSplits.java?rev=1456738&view=auto
==============================================================================
--- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ListSplits.java (added)
+++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ListSplits.java Fri Mar 15 01:09:23 2013
@@ -0,0 +1,37 @@
+package org.apache.accumulo.test.randomwalk.concurrent;
+
+import java.util.Collection;
+import java.util.List;
+import java.util.Properties;
+import java.util.Random;
+
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.test.randomwalk.State;
+import org.apache.accumulo.test.randomwalk.Test;
+import org.apache.hadoop.io.Text;
+
+public class ListSplits extends Test {
+
+ @Override
+ public void visit(State state, Properties props) throws Exception {
+ Connector conn = state.getConnector();
+
+ Random rand = (Random) state.get("rand");
+
+ @SuppressWarnings("unchecked")
+ List<String> tableNames = (List<String>) state.get("tables");
+
+ String tableName = tableNames.get(rand.nextInt(tableNames.size()));
+
+ try {
+ Collection<Text> splits = conn.tableOperations().listSplits(tableName);
+ log.debug("Table " + tableName + " had " + splits.size() + " splits");
+ } catch (TableNotFoundException e) {
+ log.debug("listSplits " + tableName + " failed, doesnt exist");
+ } catch (AccumuloSecurityException ase) {
+ log.debug("listSplits " + tableName + " failed, " + ase.getMessage());
+ }
+ }
+}
Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/image/TableOp.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/image/TableOp.java?rev=1456738&r1=1456737&r2=1456738&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/image/TableOp.java (original)
+++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/image/TableOp.java Fri Mar 15 01:09:23 2013
@@ -56,7 +56,7 @@ public class TableOp extends Test {
log.debug("Retrieving info for " + tableName);
tableOps.getLocalityGroups(tableName);
tableOps.getProperties(tableName);
- tableOps.getSplits(tableName);
+ tableOps.listSplits(tableName);
tableOps.list();
} else {
log.debug("Clearing locator cache for " + tableName);
Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/BulkInsert.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/BulkInsert.java?rev=1456738&r1=1456737&r2=1456738&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/BulkInsert.java (original)
+++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/BulkInsert.java Fri Mar 15 01:09:23 2013
@@ -165,7 +165,7 @@ public class BulkInsert extends Test {
Connector conn = state.getConnector();
- Collection<Text> splits = conn.tableOperations().getSplits(tableName, maxSplits);
+ Collection<Text> splits = conn.tableOperations().listSplits(tableName, maxSplits);
for (Text split : splits)
out.println(new String(Base64.encodeBase64(TextUtil.getBytes(split))));
Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ExportIndex.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ExportIndex.java?rev=1456738&r1=1456737&r2=1456738&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ExportIndex.java (original)
+++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/ExportIndex.java Fri Mar 15 01:09:23 2013
@@ -86,8 +86,8 @@ public class ExportIndex extends Test {
fs.delete(new Path(exportDir), true);
fs.delete(new Path(copyDir), true);
- HashSet<Text> splits1 = new HashSet<Text>(state.getConnector().tableOperations().getSplits(indexTableName));
- HashSet<Text> splits2 = new HashSet<Text>(state.getConnector().tableOperations().getSplits(tmpIndexTableName));
+ HashSet<Text> splits1 = new HashSet<Text>(state.getConnector().tableOperations().listSplits(indexTableName));
+ HashSet<Text> splits2 = new HashSet<Text>(state.getConnector().tableOperations().listSplits(tmpIndexTableName));
if (!splits1.equals(splits2))
throw new Exception("Splits not equals " + indexTableName + " " + tmpIndexTableName);
Modified: accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Merge.java
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Merge.java?rev=1456738&r1=1456737&r2=1456738&view=diff
==============================================================================
--- accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Merge.java (original)
+++ accumulo/branches/1.5/test/src/main/java/org/apache/accumulo/test/randomwalk/shard/Merge.java Fri Mar 15 01:09:23 2013
@@ -31,13 +31,13 @@ public class Merge extends Test {
public void visit(State state, Properties props) throws Exception {
String indexTableName = (String) state.get("indexTableName");
- Collection<Text> splits = state.getConnector().tableOperations().getSplits(indexTableName);
+ Collection<Text> splits = state.getConnector().tableOperations().listSplits(indexTableName);
SortedSet<Text> splitSet = new TreeSet<Text>(splits);
log.debug("merging " + indexTableName);
state.getConnector().tableOperations().merge(indexTableName, null, null);
org.apache.accumulo.core.util.Merge merge = new org.apache.accumulo.core.util.Merge();
merge.mergomatic(state.getConnector(), indexTableName, null, null, 256 * 1024 * 1024, true);
- splits = state.getConnector().tableOperations().getSplits(indexTableName);
+ splits = state.getConnector().tableOperations().listSplits(indexTableName);
if (splits.size() > splitSet.size()) {
// throw an excpetion so that test will die an no further changes to table will occur...
// this way table is left as is for debugging.
Modified: accumulo/branches/1.5/test/system/randomwalk/conf/modules/Concurrent.xml
URL: http://svn.apache.org/viewvc/accumulo/branches/1.5/test/system/randomwalk/conf/modules/Concurrent.xml?rev=1456738&r1=1456737&r2=1456738&view=diff
==============================================================================
--- accumulo/branches/1.5/test/system/randomwalk/conf/modules/Concurrent.xml (original)
+++ accumulo/branches/1.5/test/system/randomwalk/conf/modules/Concurrent.xml Fri Mar 15 01:09:23 2013
@@ -33,6 +33,7 @@
<edge id="ct.ScanTable" weight="500"/>
<edge id="ct.IsolatedScan" weight="500"/>
<edge id="ct.AddSplits" weight="1000"/>
+ <edge id="ct.ListSplits" weight="1000"/>
<edge id="ct.OfflineTable" weight="1000"/>
<edge id="ct.Merge" weight="1000"/>
<edge id="ct.Compact" weight="1000"/>
@@ -93,6 +94,10 @@
<edge id="dummy.ToAll" weight="1"/>
</node>
+<node id="ct.ListSplits">
+ <edge id="dummy.ToAll" weight="1"/>
+</node>
+
<node id="ct.OfflineTable">
<edge id="dummy.ToAll" weight="1"/>
</node>