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 2013/07/17 04:33:19 UTC
[17/50] [abbrv] git commit: ACCUMULO-1537 fix compile error
ACCUMULO-1537 fix compile error
git-svn-id: https://svn.apache.org/repos/asf/accumulo/trunk@1500063 13f79535-47bb-0310-9956-ffa450edef68
Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/98791b93
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/98791b93
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/98791b93
Branch: refs/heads/ACCUMULO-1496
Commit: 98791b932db375c661fe6113d1311671600343ae
Parents: 390ca3f
Author: Christopher Tubbs <ct...@apache.org>
Authored: Fri Jul 5 16:33:07 2013 +0000
Committer: Christopher Tubbs <ct...@apache.org>
Committed: Fri Jul 5 16:33:07 2013 +0000
----------------------------------------------------------------------
.../test/functional/BigRootTabletIT.java | 17 ++++++++-------
.../test/functional/MetadataMaxFiles.java | 22 ++++++++++----------
2 files changed, 20 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/accumulo/blob/98791b93/test/src/test/java/org/apache/accumulo/test/functional/BigRootTabletIT.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/BigRootTabletIT.java b/test/src/test/java/org/apache/accumulo/test/functional/BigRootTabletIT.java
index 308560f..6084aab 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/BigRootTabletIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/BigRootTabletIT.java
@@ -16,7 +16,7 @@
*/
package org.apache.accumulo.test.functional;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
import java.util.HashMap;
import java.util.Map;
@@ -26,9 +26,9 @@ import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.conf.Property;
import org.apache.accumulo.core.data.Key;
import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.metadata.MetadataTable;
+import org.apache.accumulo.core.metadata.RootTable;
import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.core.util.MetadataTable;
-import org.apache.accumulo.core.util.RootTable;
import org.apache.accumulo.minicluster.MiniAccumuloConfig;
import org.junit.Test;
@@ -37,13 +37,13 @@ public class BigRootTabletIT extends MacTest {
@Override
public void configure(MiniAccumuloConfig cfg) {
- Map<String,String> siteConfig = new HashMap<String, String>();
+ Map<String,String> siteConfig = new HashMap<String,String>();
siteConfig.put(Property.TABLE_SCAN_MAXMEM.getKey(), "1024");
siteConfig.put(Property.TSERV_MAJC_DELAY.getKey(), "60m");
- cfg.setSiteConfig(siteConfig );
+ cfg.setSiteConfig(siteConfig);
}
-
- @Test(timeout=60*1000)
+
+ @Test(timeout = 60 * 1000)
public void test() throws Exception {
Connector c = getConnector();
c.tableOperations().addSplits(MetadataTable.NAME, FunctionalTestUtils.splits("0 1 2 3 4 5 6 7 8 9 a".split(" ")));
@@ -55,7 +55,8 @@ public class BigRootTabletIT extends MacTest {
cluster.stop();
cluster.start();
int count = 0;
- for (@SuppressWarnings("unused") Entry<Key,Value> entry : c.createScanner(RootTable.NAME, Authorizations.EMPTY))
+ for (@SuppressWarnings("unused")
+ Entry<Key,Value> entry : c.createScanner(RootTable.NAME, Authorizations.EMPTY))
count++;
assertTrue(count > 0);
}
http://git-wip-us.apache.org/repos/asf/accumulo/blob/98791b93/test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFiles.java
----------------------------------------------------------------------
diff --git a/test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFiles.java b/test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFiles.java
index ae503de..77e6b22 100644
--- a/test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFiles.java
+++ b/test/src/test/java/org/apache/accumulo/test/functional/MetadataMaxFiles.java
@@ -16,7 +16,7 @@
*/
package org.apache.accumulo.test.functional;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import java.util.HashMap;
import java.util.Map;
@@ -32,10 +32,10 @@ import org.apache.accumulo.core.master.thrift.MasterClientService.Client;
import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
import org.apache.accumulo.core.master.thrift.TableInfo;
import org.apache.accumulo.core.master.thrift.TabletServerStatus;
+import org.apache.accumulo.core.metadata.MetadataTable;
+import org.apache.accumulo.core.metadata.RootTable;
import org.apache.accumulo.core.security.CredentialHelper;
import org.apache.accumulo.core.security.thrift.TCredentials;
-import org.apache.accumulo.core.util.MetadataTable;
-import org.apache.accumulo.core.util.RootTable;
import org.apache.accumulo.core.util.UtilWaitThread;
import org.apache.accumulo.minicluster.MiniAccumuloConfig;
import org.apache.accumulo.server.util.Admin;
@@ -47,13 +47,13 @@ public class MetadataMaxFiles extends MacTest {
@Override
public void configure(MiniAccumuloConfig cfg) {
- Map<String,String> siteConfig = new HashMap<String, String>();
+ Map<String,String> siteConfig = new HashMap<String,String>();
siteConfig.put(Property.TSERV_MAJC_DELAY.getKey(), "1");
siteConfig.put(Property.TSERV_SCAN_MAX_OPENFILES.getKey(), "10");
- cfg.setSiteConfig(siteConfig );
+ cfg.setSiteConfig(siteConfig);
}
-
- @Test(timeout=240*1000)
+
+ @Test(timeout = 240 * 1000)
public void test() throws Exception {
Connector c = getConnector();
SortedSet<Text> splits = new TreeSet<Text>();
@@ -71,15 +71,15 @@ public class MetadataMaxFiles extends MacTest {
c.tableOperations().flush(MetadataTable.NAME, null, null, true);
c.tableOperations().flush(RootTable.NAME, null, null, true);
}
- UtilWaitThread.sleep(20*1000);
+ UtilWaitThread.sleep(20 * 1000);
log.info("shutting down");
assertEquals(0, cluster.exec(Admin.class, "stopAll").waitFor());
cluster.stop();
log.info("starting up");
cluster.start();
-
- UtilWaitThread.sleep(30*1000);
-
+
+ UtilWaitThread.sleep(30 * 1000);
+
while (true) {
MasterMonitorInfo stats = null;
TCredentials creds = CredentialHelper.create("root", new PasswordToken(MacTest.PASSWORD), c.getInstance().getInstanceName());