date:20140124

git commit: ACCUMULO-2250 Move error logging in Fate.transitionToFailed to beginning of method

2014-01-24 Thread ecn

Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 11d803cf1 - 930a6b84f


ACCUMULO-2250 Move error logging in Fate.transitionToFailed to beginning of 
method

Signed-off-by: Eric Newton eric.new...@gmail.com


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/930a6b84
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/930a6b84
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/930a6b84

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 930a6b84f84c87809bd6af0748358393b75b681f
Parents: 11d803c
Author: Vikram Srivastava vikr...@cloudera.com
Authored: Fri Jan 24 01:38:44 2014 -0800
Committer: Eric Newton eric.new...@gmail.com
Committed: Fri Jan 24 10:33:50 2014 -0500

--
 fate/src/main/java/org/apache/accumulo/fate/Fate.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/930a6b84/fate/src/main/java/org/apache/accumulo/fate/Fate.java
--
diff --git a/fate/src/main/java/org/apache/accumulo/fate/Fate.java 
b/fate/src/main/java/org/apache/accumulo/fate/Fate.java
index 2d69647..3561fc8 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/Fate.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/Fate.java
@@ -99,9 +99,11 @@ public class FateT {
 }
 
 private void transitionToFailed(long tid, RepoT op, Exception e) {
+  String tidStr = String.format(%016x, tid);
+  log.warn(Failed to execute Repo, tid= + tidStr, e);
   store.setProperty(tid, EXCEPTION_PROP, e);
   store.setStatus(tid, TStatus.FAILED_IN_PROGRESS);
-  log.warn(Failed to execute Repo, tid= + String.format(%016x, tid), 
e);
+  log.info(Updated status for Repo with tid= + tidStr +  to 
FAILED_IN_PROGRESS);
 }
 
 private void processFailed(long tid, RepoT op) {

[1/2] git commit: ACCUMULO-2250 Move error logging in Fate.transitionToFailed to beginning of method

2014-01-24 Thread ecn

Updated Branches:
  refs/heads/master 6991509cc - 349af6b94


ACCUMULO-2250 Move error logging in Fate.transitionToFailed to beginning of 
method

Signed-off-by: Eric Newton eric.new...@gmail.com


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/930a6b84
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/930a6b84
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/930a6b84

Branch: refs/heads/master
Commit: 930a6b84f84c87809bd6af0748358393b75b681f
Parents: 11d803c
Author: Vikram Srivastava vikr...@cloudera.com
Authored: Fri Jan 24 01:38:44 2014 -0800
Committer: Eric Newton eric.new...@gmail.com
Committed: Fri Jan 24 10:33:50 2014 -0500

--
 fate/src/main/java/org/apache/accumulo/fate/Fate.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/930a6b84/fate/src/main/java/org/apache/accumulo/fate/Fate.java
--
diff --git a/fate/src/main/java/org/apache/accumulo/fate/Fate.java 
b/fate/src/main/java/org/apache/accumulo/fate/Fate.java
index 2d69647..3561fc8 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/Fate.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/Fate.java
@@ -99,9 +99,11 @@ public class FateT {
 }
 
 private void transitionToFailed(long tid, RepoT op, Exception e) {
+  String tidStr = String.format(%016x, tid);
+  log.warn(Failed to execute Repo, tid= + tidStr, e);
   store.setProperty(tid, EXCEPTION_PROP, e);
   store.setStatus(tid, TStatus.FAILED_IN_PROGRESS);
-  log.warn(Failed to execute Repo, tid= + String.format(%016x, tid), 
e);
+  log.info(Updated status for Repo with tid= + tidStr +  to 
FAILED_IN_PROGRESS);
 }
 
 private void processFailed(long tid, RepoT op) {

[2/2] git commit: Merge branch '1.6.0-SNAPSHOT'

2014-01-24 Thread ecn

Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/349af6b9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/349af6b9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/349af6b9

Branch: refs/heads/master
Commit: 349af6b9410a9ac4f2348b00cd59650ec329e2d0
Parents: 6991509 930a6b8
Author: Eric Newton eric.new...@gmail.com
Authored: Fri Jan 24 10:34:13 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Fri Jan 24 10:34:13 2014 -0500

--
 fate/src/main/java/org/apache/accumulo/fate/Fate.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/349af6b9/fate/src/main/java/org/apache/accumulo/fate/Fate.java
--

git commit: ACCUMULO-2250 Move error logging in Fate.transitionToFailed to beginning of method

2014-01-24 Thread ecn

Updated Branches:
  refs/heads/1.5.1-SNAPSHOT 59680b32d - b85c8b5c1


ACCUMULO-2250 Move error logging in Fate.transitionToFailed to beginning of 
method

Signed-off-by: Eric Newton eric.new...@gmail.com


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b85c8b5c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b85c8b5c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b85c8b5c

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: b85c8b5c1fcd05c79ac777fc9f2e4085dcbb1b71
Parents: 59680b3
Author: Vikram Srivastava vikr...@cloudera.com
Authored: Fri Jan 24 01:38:44 2014 -0800
Committer: Eric Newton eric.new...@gmail.com
Committed: Fri Jan 24 10:38:42 2014 -0500

--
 fate/src/main/java/org/apache/accumulo/fate/Fate.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b85c8b5c/fate/src/main/java/org/apache/accumulo/fate/Fate.java
--
diff --git a/fate/src/main/java/org/apache/accumulo/fate/Fate.java 
b/fate/src/main/java/org/apache/accumulo/fate/Fate.java
index bd36edb..670154e 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/Fate.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/Fate.java
@@ -96,9 +96,11 @@ public class FateT {
 }
 
 private void transitionToFailed(long tid, RepoT op, Exception e) {
+  String tidStr = String.format(%016x, tid);
+  log.warn(Failed to execute Repo, tid= + tidStr, e);
   store.setProperty(tid, EXCEPTION_PROP, e);
   store.setStatus(tid, TStatus.FAILED_IN_PROGRESS);
-  log.warn(Failed to execute Repo, tid= + String.format(%016x, tid), 
e);
+  log.info(Updated status for Repo with tid= + tidStr +  to 
FAILED_IN_PROGRESS);
 }
 
 private void processFailed(long tid, RepoT op) {

[2/2] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-01-24 Thread ecn

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e4b177d1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e4b177d1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e4b177d1

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: e4b177d16201ce6116e756bf60f0f7cc03c7699b
Parents: 930a6b8 b85c8b5
Author: Eric Newton eric.new...@gmail.com
Authored: Fri Jan 24 10:39:16 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Fri Jan 24 10:39:16 2014 -0500

--

--

[1/2] git commit: ACCUMULO-2250 Move error logging in Fate.transitionToFailed to beginning of method

2014-01-24 Thread ecn

Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 930a6b84f - e4b177d16


ACCUMULO-2250 Move error logging in Fate.transitionToFailed to beginning of 
method

Signed-off-by: Eric Newton eric.new...@gmail.com


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b85c8b5c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b85c8b5c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b85c8b5c

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: b85c8b5c1fcd05c79ac777fc9f2e4085dcbb1b71
Parents: 59680b3
Author: Vikram Srivastava vikr...@cloudera.com
Authored: Fri Jan 24 01:38:44 2014 -0800
Committer: Eric Newton eric.new...@gmail.com
Committed: Fri Jan 24 10:38:42 2014 -0500

--
 fate/src/main/java/org/apache/accumulo/fate/Fate.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b85c8b5c/fate/src/main/java/org/apache/accumulo/fate/Fate.java
--
diff --git a/fate/src/main/java/org/apache/accumulo/fate/Fate.java 
b/fate/src/main/java/org/apache/accumulo/fate/Fate.java
index bd36edb..670154e 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/Fate.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/Fate.java
@@ -96,9 +96,11 @@ public class FateT {
 }
 
 private void transitionToFailed(long tid, RepoT op, Exception e) {
+  String tidStr = String.format(%016x, tid);
+  log.warn(Failed to execute Repo, tid= + tidStr, e);
   store.setProperty(tid, EXCEPTION_PROP, e);
   store.setStatus(tid, TStatus.FAILED_IN_PROGRESS);
-  log.warn(Failed to execute Repo, tid= + String.format(%016x, tid), 
e);
+  log.info(Updated status for Repo with tid= + tidStr +  to 
FAILED_IN_PROGRESS);
 }
 
 private void processFailed(long tid, RepoT op) {

[2/3] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-01-24 Thread ecn

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e4b177d1
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e4b177d1
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e4b177d1

Branch: refs/heads/master
Commit: e4b177d16201ce6116e756bf60f0f7cc03c7699b
Parents: 930a6b8 b85c8b5
Author: Eric Newton eric.new...@gmail.com
Authored: Fri Jan 24 10:39:16 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Fri Jan 24 10:39:16 2014 -0500

--

--

[3/3] git commit: Merge branch '1.6.0-SNAPSHOT'

2014-01-24 Thread ecn

Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/38155580
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/38155580
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/38155580

Branch: refs/heads/master
Commit: 381555806e80b1f8da43dde340ef21186b70ad14
Parents: 349af6b e4b177d
Author: Eric Newton eric.new...@gmail.com
Authored: Fri Jan 24 10:40:14 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Fri Jan 24 10:40:14 2014 -0500

--

--

[1/3] git commit: ACCUMULO-2250 Move error logging in Fate.transitionToFailed to beginning of method

2014-01-24 Thread ecn

Updated Branches:
  refs/heads/master 349af6b94 - 381555806


ACCUMULO-2250 Move error logging in Fate.transitionToFailed to beginning of 
method

Signed-off-by: Eric Newton eric.new...@gmail.com


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b85c8b5c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b85c8b5c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b85c8b5c

Branch: refs/heads/master
Commit: b85c8b5c1fcd05c79ac777fc9f2e4085dcbb1b71
Parents: 59680b3
Author: Vikram Srivastava vikr...@cloudera.com
Authored: Fri Jan 24 01:38:44 2014 -0800
Committer: Eric Newton eric.new...@gmail.com
Committed: Fri Jan 24 10:38:42 2014 -0500

--
 fate/src/main/java/org/apache/accumulo/fate/Fate.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b85c8b5c/fate/src/main/java/org/apache/accumulo/fate/Fate.java
--
diff --git a/fate/src/main/java/org/apache/accumulo/fate/Fate.java 
b/fate/src/main/java/org/apache/accumulo/fate/Fate.java
index bd36edb..670154e 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/Fate.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/Fate.java
@@ -96,9 +96,11 @@ public class FateT {
 }
 
 private void transitionToFailed(long tid, RepoT op, Exception e) {
+  String tidStr = String.format(%016x, tid);
+  log.warn(Failed to execute Repo, tid= + tidStr, e);
   store.setProperty(tid, EXCEPTION_PROP, e);
   store.setStatus(tid, TStatus.FAILED_IN_PROGRESS);
-  log.warn(Failed to execute Repo, tid= + String.format(%016x, tid), 
e);
+  log.info(Updated status for Repo with tid= + tidStr +  to 
FAILED_IN_PROGRESS);
 }
 
 private void processFailed(long tid, RepoT op) {

[3/6] git commit: ACCUMULO-2235 Replace the create/delete table calls with the notable notable command.

2014-01-24 Thread elserj

ACCUMULO-2235 Replace the create/delete table calls with the notable notable 
command.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6989d99f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6989d99f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6989d99f

Branch: refs/heads/master
Commit: 6989d99f193ded70f7f5c7443d7fed2d08b2572b
Parents: b85c8b5
Author: Josh Elser els...@apache.org
Authored: Fri Jan 24 10:45:47 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 10:46:29 2014 -0500

--
 test/src/test/java/org/apache/accumulo/test/ShellServerTest.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6989d99f/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
--
diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java 
b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
index 80e56d9..52fdd53 100644
--- a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
@@ -246,8 +246,7 @@ public class ShellServerTest {
   @Test(timeout = 3)
   public void du() throws Exception {
 // create and delete a table so we get out of a table context in the shell
-exec(createtable du_test_table, true);
-exec(deletetable -f du_test_table, true);
+exec(notable, true);
 
 // Calling du not in a table context shouldn't throw an error
 output.clear();

[1/6] git commit: ACCUMULO-2235 Replace the create/delete table calls with the notable notable command.

2014-01-24 Thread elserj

Updated Branches:
  refs/heads/1.5.1-SNAPSHOT b85c8b5c1 - 6989d99f1
  refs/heads/1.6.0-SNAPSHOT e4b177d16 - 684f2937e
  refs/heads/master 381555806 - 3fc009636


ACCUMULO-2235 Replace the create/delete table calls with the notable notable 
command.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6989d99f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6989d99f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6989d99f

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 6989d99f193ded70f7f5c7443d7fed2d08b2572b
Parents: b85c8b5
Author: Josh Elser els...@apache.org
Authored: Fri Jan 24 10:45:47 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 10:46:29 2014 -0500

--
 test/src/test/java/org/apache/accumulo/test/ShellServerTest.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6989d99f/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
--
diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java 
b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
index 80e56d9..52fdd53 100644
--- a/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
+++ b/test/src/test/java/org/apache/accumulo/test/ShellServerTest.java
@@ -246,8 +246,7 @@ public class ShellServerTest {
   @Test(timeout = 3)
   public void du() throws Exception {
 // create and delete a table so we get out of a table context in the shell
-exec(createtable du_test_table, true);
-exec(deletetable -f du_test_table, true);
+exec(notable, true);
 
 // Calling du not in a table context shouldn't throw an error
 output.clear();

[4/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-01-24 Thread elserj

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/684f2937
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/684f2937
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/684f2937

Branch: refs/heads/master
Commit: 684f2937e6c61a91ad1d6ae2321d7f3121b71635
Parents: e4b177d 6989d99
Author: Josh Elser els...@apache.org
Authored: Fri Jan 24 10:57:37 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 10:57:37 2014 -0500

--
 test/src/test/java/org/apache/accumulo/test/ShellServerIT.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/684f2937/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
--
diff --cc test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
index 81f9ef2,000..cc5ce7b
mode 100644,00..100644
--- a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
@@@ -1,1050 -1,0 +1,1049 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache License, Version 2.0
 + * (the License); you may not use this file except in compliance with
 + * the License.  You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an AS IS BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.apache.accumulo.test;
 +
 +import static org.junit.Assert.assertEquals;
 +import static org.junit.Assert.assertFalse;
 +import static org.junit.Assert.assertTrue;
 +import static org.junit.Assert.fail;
 +
 +import java.io.File;
 +import java.io.IOException;
 +import java.io.InputStream;
 +import java.io.OutputStream;
 +import java.io.PrintWriter;
 +import java.lang.reflect.Constructor;
 +import java.util.Map.Entry;
 +
 +import jline.console.ConsoleReader;
 +
 +import org.apache.accumulo.core.Constants;
 +import org.apache.accumulo.core.client.Connector;
 +import org.apache.accumulo.core.client.Scanner;
 +import org.apache.accumulo.core.client.TableNotFoundException;
 +import org.apache.accumulo.core.client.admin.TableOperations;
 +import org.apache.accumulo.core.client.impl.Namespaces;
 +import org.apache.accumulo.core.conf.AccumuloConfiguration;
 +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.file.FileOperations;
 +import org.apache.accumulo.core.file.FileSKVWriter;
 +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.UtilWaitThread;
 +import org.apache.accumulo.core.util.shell.Shell;
 +import org.apache.accumulo.test.functional.SimpleMacIT;
 +import org.apache.accumulo.tracer.TraceServer;
 +import org.apache.commons.io.FileUtils;
 +import org.apache.hadoop.conf.Configuration;
 +import org.apache.hadoop.fs.FileSystem;
 +import org.apache.hadoop.fs.Path;
 +import org.apache.hadoop.io.Text;
 +import org.apache.hadoop.tools.DistCp;
 +import org.junit.After;
 +import org.junit.AfterClass;
 +import org.junit.BeforeClass;
 +import org.junit.Test;
 +
 +public class ShellServerIT extends SimpleMacIT {
 +  public static class TestOutputStream extends OutputStream {
 +StringBuilder sb = new StringBuilder();
 +
 +@Override
 +public void write(int b) throws IOException {
 +  sb.append((char) (0xff  b));
 +}
 +
 +public String get() {
 +  return sb.toString();
 +}
 +
 +public void clear() {
 +  sb.setLength(0);
 +}
 +  }
 +
 +  public static class StringInputStream extends InputStream {
 +private String source = ;
 +private int offset = 0;
 +
 +@Override
 +public int read() throws IOException {
 +  if (offset == source.length())
 +return '\n';
 +  else
 +return source.charAt(offset++);
 +}
 +
 +public void set(String other) {
 +  source = other;
 +  offset = 0;
 +}
 +  }
 +
 +  public static TestOutputStream output;
 +  public static StringInputStream input;
 +  public static Shell shell;
 +

[5/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-01-24 Thread elserj

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/684f2937
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/684f2937
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/684f2937

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 684f2937e6c61a91ad1d6ae2321d7f3121b71635
Parents: e4b177d 6989d99
Author: Josh Elser els...@apache.org
Authored: Fri Jan 24 10:57:37 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 10:57:37 2014 -0500

--
 test/src/test/java/org/apache/accumulo/test/ShellServerIT.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/684f2937/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
--
diff --cc test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
index 81f9ef2,000..cc5ce7b
mode 100644,00..100644
--- a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
@@@ -1,1050 -1,0 +1,1049 @@@
 +/*
 + * Licensed to the Apache Software Foundation (ASF) under one or more
 + * contributor license agreements.  See the NOTICE file distributed with
 + * this work for additional information regarding copyright ownership.
 + * The ASF licenses this file to You under the Apache License, Version 2.0
 + * (the License); you may not use this file except in compliance with
 + * the License.  You may obtain a copy of the License at
 + *
 + * http://www.apache.org/licenses/LICENSE-2.0
 + *
 + * Unless required by applicable law or agreed to in writing, software
 + * distributed under the License is distributed on an AS IS BASIS,
 + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 + * See the License for the specific language governing permissions and
 + * limitations under the License.
 + */
 +package org.apache.accumulo.test;
 +
 +import static org.junit.Assert.assertEquals;
 +import static org.junit.Assert.assertFalse;
 +import static org.junit.Assert.assertTrue;
 +import static org.junit.Assert.fail;
 +
 +import java.io.File;
 +import java.io.IOException;
 +import java.io.InputStream;
 +import java.io.OutputStream;
 +import java.io.PrintWriter;
 +import java.lang.reflect.Constructor;
 +import java.util.Map.Entry;
 +
 +import jline.console.ConsoleReader;
 +
 +import org.apache.accumulo.core.Constants;
 +import org.apache.accumulo.core.client.Connector;
 +import org.apache.accumulo.core.client.Scanner;
 +import org.apache.accumulo.core.client.TableNotFoundException;
 +import org.apache.accumulo.core.client.admin.TableOperations;
 +import org.apache.accumulo.core.client.impl.Namespaces;
 +import org.apache.accumulo.core.conf.AccumuloConfiguration;
 +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.file.FileOperations;
 +import org.apache.accumulo.core.file.FileSKVWriter;
 +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.UtilWaitThread;
 +import org.apache.accumulo.core.util.shell.Shell;
 +import org.apache.accumulo.test.functional.SimpleMacIT;
 +import org.apache.accumulo.tracer.TraceServer;
 +import org.apache.commons.io.FileUtils;
 +import org.apache.hadoop.conf.Configuration;
 +import org.apache.hadoop.fs.FileSystem;
 +import org.apache.hadoop.fs.Path;
 +import org.apache.hadoop.io.Text;
 +import org.apache.hadoop.tools.DistCp;
 +import org.junit.After;
 +import org.junit.AfterClass;
 +import org.junit.BeforeClass;
 +import org.junit.Test;
 +
 +public class ShellServerIT extends SimpleMacIT {
 +  public static class TestOutputStream extends OutputStream {
 +StringBuilder sb = new StringBuilder();
 +
 +@Override
 +public void write(int b) throws IOException {
 +  sb.append((char) (0xff  b));
 +}
 +
 +public String get() {
 +  return sb.toString();
 +}
 +
 +public void clear() {
 +  sb.setLength(0);
 +}
 +  }
 +
 +  public static class StringInputStream extends InputStream {
 +private String source = ;
 +private int offset = 0;
 +
 +@Override
 +public int read() throws IOException {
 +  if (offset == source.length())
 +return '\n';
 +  else
 +return source.charAt(offset++);
 +}
 +
 +public void set(String other) {
 +  source = other;
 +  offset = 0;
 +}
 +  }
 +
 +  public static TestOutputStream output;
 +  public static StringInputStream input;
 +  public static Shell

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

2014-01-24 Thread elserj

Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3fc00963
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3fc00963
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3fc00963

Branch: refs/heads/master
Commit: 3fc0096364d2236d75cd18a5c5361a6aa72bebda
Parents: 3815558 684f293
Author: Josh Elser els...@apache.org
Authored: Fri Jan 24 10:57:48 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 10:57:48 2014 -0500

--
 test/src/test/java/org/apache/accumulo/test/ShellServerIT.java | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--

[4/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-01-24 Thread elserj

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3485ba3b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3485ba3b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3485ba3b

Branch: refs/heads/master
Commit: 3485ba3bbdfa6da4a70cb317bd251c58a367ec04
Parents: 684f293 da2b79b
Author: Josh Elser els...@apache.org
Authored: Fri Jan 24 11:11:20 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 11:11:20 2014 -0500

--
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3485ba3b/pom.xml
--

[5/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-01-24 Thread elserj

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/3485ba3b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/3485ba3b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/3485ba3b

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 3485ba3bbdfa6da4a70cb317bd251c58a367ec04
Parents: 684f293 da2b79b
Author: Josh Elser els...@apache.org
Authored: Fri Jan 24 11:11:20 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 11:11:20 2014 -0500

--
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3485ba3b/pom.xml
--

[2/6] git commit: ACCUMULO-2245 Bump some plugin versions to get the maven site building again with Maven 3.1.1.

2014-01-24 Thread elserj

ACCUMULO-2245 Bump some plugin versions to get the maven site building again 
with Maven 3.1.1.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/da2b79bc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/da2b79bc
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/da2b79bc

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: da2b79bc47eae993413aca9e2f23611948d79d1d
Parents: 6989d99
Author: Josh Elser els...@apache.org
Authored: Fri Jan 24 11:10:01 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 11:10:01 2014 -0500

--
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/da2b79bc/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 2d5f663..6508147 100644
--- a/pom.xml
+++ b/pom.xml
@@ -480,6 +480,7 @@
 plugin
   groupIdorg.apache.maven.plugins/groupId
   artifactIdmaven-site-plugin/artifactId
+  version3.3/version
   configuration
 skipDeploytrue/skipDeploy
   /configuration
@@ -788,7 +789,7 @@
   plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-project-info-reports-plugin/artifactId
-version2.6/version
+version2.7/version
 configuration
   dependencyLocationsEnabledfalse/dependencyLocationsEnabled
 /configuration

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

2014-01-24 Thread elserj

Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6669b1e9
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6669b1e9
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6669b1e9

Branch: refs/heads/master
Commit: 6669b1e95789505c21ed26b62988125ea1bf004b
Parents: 3fc0096 3485ba3
Author: Josh Elser els...@apache.org
Authored: Fri Jan 24 11:11:30 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 11:11:30 2014 -0500

--
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6669b1e9/pom.xml
--

[3/6] git commit: ACCUMULO-2245 Bump some plugin versions to get the maven site building again with Maven 3.1.1.

2014-01-24 Thread elserj

ACCUMULO-2245 Bump some plugin versions to get the maven site building again 
with Maven 3.1.1.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/da2b79bc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/da2b79bc
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/da2b79bc

Branch: refs/heads/master
Commit: da2b79bc47eae993413aca9e2f23611948d79d1d
Parents: 6989d99
Author: Josh Elser els...@apache.org
Authored: Fri Jan 24 11:10:01 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 11:10:01 2014 -0500

--
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/da2b79bc/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 2d5f663..6508147 100644
--- a/pom.xml
+++ b/pom.xml
@@ -480,6 +480,7 @@
 plugin
   groupIdorg.apache.maven.plugins/groupId
   artifactIdmaven-site-plugin/artifactId
+  version3.3/version
   configuration
 skipDeploytrue/skipDeploy
   /configuration
@@ -788,7 +789,7 @@
   plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-project-info-reports-plugin/artifactId
-version2.6/version
+version2.7/version
 configuration
   dependencyLocationsEnabledfalse/dependencyLocationsEnabled
 /configuration

[1/6] git commit: ACCUMULO-2245 Bump some plugin versions to get the maven site building again with Maven 3.1.1.

2014-01-24 Thread elserj

Updated Branches:
  refs/heads/1.5.1-SNAPSHOT 6989d99f1 - da2b79bc4
  refs/heads/1.6.0-SNAPSHOT 684f2937e - 3485ba3bb
  refs/heads/master 3fc009636 - 6669b1e95


ACCUMULO-2245 Bump some plugin versions to get the maven site building again 
with Maven 3.1.1.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/da2b79bc
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/da2b79bc
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/da2b79bc

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: da2b79bc47eae993413aca9e2f23611948d79d1d
Parents: 6989d99
Author: Josh Elser els...@apache.org
Authored: Fri Jan 24 11:10:01 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 11:10:01 2014 -0500

--
 pom.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/da2b79bc/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 2d5f663..6508147 100644
--- a/pom.xml
+++ b/pom.xml
@@ -480,6 +480,7 @@
 plugin
   groupIdorg.apache.maven.plugins/groupId
   artifactIdmaven-site-plugin/artifactId
+  version3.3/version
   configuration
 skipDeploytrue/skipDeploy
   /configuration
@@ -788,7 +789,7 @@
   plugin
 groupIdorg.apache.maven.plugins/groupId
 artifactIdmaven-project-info-reports-plugin/artifactId
-version2.6/version
+version2.7/version
 configuration
   dependencyLocationsEnabledfalse/dependencyLocationsEnabled
 /configuration

[4/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-01-24 Thread elserj

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6afef02f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6afef02f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6afef02f

Branch: refs/heads/master
Commit: 6afef02fc2b7a6e39568b683fea017431173496c
Parents: 3485ba3 4cac84e
Author: Josh Elser els...@apache.org
Authored: Fri Jan 24 11:38:22 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 11:38:22 2014 -0500

--

--

[3/6] git commit: ACCUMULO-1921 check for null

2014-01-24 Thread elserj

ACCUMULO-1921 check for null


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4cac84ec
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4cac84ec
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4cac84ec

Branch: refs/heads/master
Commit: 4cac84ecd70bce51f12791194d1ab721f29b2d57
Parents: da2b79b
Author: Eric Newton eric.new...@gmail.com
Authored: Fri Nov 22 16:28:11 2013 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 11:38:00 2014 -0500

--
 .../server/tabletserver/TabletServer.java   | 26 +++-
 1 file changed, 14 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4cac84ec/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
--
diff --git 
a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
 
b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
index c5695bc..8f2bbed 100644
--- 
a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
+++ 
b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
@@ -2449,20 +2449,22 @@ public class TabletServer extends AbstractMetricsImpl 
implements org.apache.accu
   SortedMapKey,Value tabletsKeyValues = new TreeMapKey,Value();
   try {
 PairText,KeyExtent pair = verifyTabletInformation(extent, 
TabletServer.this.getTabletSession(), tabletsKeyValues, 
getClientAddressString(), getLock());
-locationToOpen = pair.getFirst();
-if (pair.getSecond() != null) {
-  synchronized (openingTablets) {
-openingTablets.remove(extent);
-openingTablets.notifyAll();
-// it expected that the new extent will overlap the old one... if 
it does not, it should not be added to unopenedTablets
-if (!KeyExtent.findOverlapping(extent, new 
TreeSetKeyExtent(Arrays.asList(pair.getSecond(.contains(pair.getSecond()))
 {
-  throw new IllegalStateException(Fixed split does not overlap  
+ extent +   + pair.getSecond());
+if (pair != null) {
+  locationToOpen = pair.getFirst();
+  if (pair.getSecond() != null) {
+synchronized (openingTablets) {
+  openingTablets.remove(extent);
+  openingTablets.notifyAll();
+  // it expected that the new extent will overlap the old one... 
if it does not, it should not be added to unopenedTablets
+  if (!KeyExtent.findOverlapping(extent, new 
TreeSetKeyExtent(Arrays.asList(pair.getSecond(.contains(pair.getSecond()))
 {
+throw new IllegalStateException(Fixed split does not overlap 
 + extent +   + pair.getSecond());
+  }
+  unopenedTablets.add(pair.getSecond());
 }
-unopenedTablets.add(pair.getSecond());
+// split was rolled back... try again
+new AssignmentHandler(pair.getSecond()).run();
+return;
   }
-  // split was rolled back... try again
-  new AssignmentHandler(pair.getSecond()).run();
-  return;
 }
   } catch (Exception e) {
 synchronized (openingTablets) {

[2/6] git commit: ACCUMULO-1921 check for null

2014-01-24 Thread elserj

ACCUMULO-1921 check for null


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4cac84ec
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4cac84ec
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4cac84ec

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 4cac84ecd70bce51f12791194d1ab721f29b2d57
Parents: da2b79b
Author: Eric Newton eric.new...@gmail.com
Authored: Fri Nov 22 16:28:11 2013 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 11:38:00 2014 -0500

--
 .../server/tabletserver/TabletServer.java   | 26 +++-
 1 file changed, 14 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4cac84ec/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
--
diff --git 
a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
 
b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
index c5695bc..8f2bbed 100644
--- 
a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
+++ 
b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
@@ -2449,20 +2449,22 @@ public class TabletServer extends AbstractMetricsImpl 
implements org.apache.accu
   SortedMapKey,Value tabletsKeyValues = new TreeMapKey,Value();
   try {
 PairText,KeyExtent pair = verifyTabletInformation(extent, 
TabletServer.this.getTabletSession(), tabletsKeyValues, 
getClientAddressString(), getLock());
-locationToOpen = pair.getFirst();
-if (pair.getSecond() != null) {
-  synchronized (openingTablets) {
-openingTablets.remove(extent);
-openingTablets.notifyAll();
-// it expected that the new extent will overlap the old one... if 
it does not, it should not be added to unopenedTablets
-if (!KeyExtent.findOverlapping(extent, new 
TreeSetKeyExtent(Arrays.asList(pair.getSecond(.contains(pair.getSecond()))
 {
-  throw new IllegalStateException(Fixed split does not overlap  
+ extent +   + pair.getSecond());
+if (pair != null) {
+  locationToOpen = pair.getFirst();
+  if (pair.getSecond() != null) {
+synchronized (openingTablets) {
+  openingTablets.remove(extent);
+  openingTablets.notifyAll();
+  // it expected that the new extent will overlap the old one... 
if it does not, it should not be added to unopenedTablets
+  if (!KeyExtent.findOverlapping(extent, new 
TreeSetKeyExtent(Arrays.asList(pair.getSecond(.contains(pair.getSecond()))
 {
+throw new IllegalStateException(Fixed split does not overlap 
 + extent +   + pair.getSecond());
+  }
+  unopenedTablets.add(pair.getSecond());
 }
-unopenedTablets.add(pair.getSecond());
+// split was rolled back... try again
+new AssignmentHandler(pair.getSecond()).run();
+return;
   }
-  // split was rolled back... try again
-  new AssignmentHandler(pair.getSecond()).run();
-  return;
 }
   } catch (Exception e) {
 synchronized (openingTablets) {

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

2014-01-24 Thread elserj

Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d44ece4e
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d44ece4e
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d44ece4e

Branch: refs/heads/master
Commit: d44ece4e43bb2ef7bcce74acd3ef532d1e52d42f
Parents: 6669b1e 6afef02
Author: Josh Elser els...@apache.org
Authored: Fri Jan 24 11:38:48 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 11:38:48 2014 -0500

--

--

[1/6] git commit: ACCUMULO-1921 check for null

2014-01-24 Thread elserj

Updated Branches:
  refs/heads/1.5.1-SNAPSHOT da2b79bc4 - 4cac84ecd
  refs/heads/1.6.0-SNAPSHOT 3485ba3bb - 6afef02fc
  refs/heads/master 6669b1e95 - d44ece4e4


ACCUMULO-1921 check for null


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4cac84ec
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4cac84ec
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4cac84ec

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 4cac84ecd70bce51f12791194d1ab721f29b2d57
Parents: da2b79b
Author: Eric Newton eric.new...@gmail.com
Authored: Fri Nov 22 16:28:11 2013 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 11:38:00 2014 -0500

--
 .../server/tabletserver/TabletServer.java   | 26 +++-
 1 file changed, 14 insertions(+), 12 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4cac84ec/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
--
diff --git 
a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
 
b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
index c5695bc..8f2bbed 100644
--- 
a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
+++ 
b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
@@ -2449,20 +2449,22 @@ public class TabletServer extends AbstractMetricsImpl 
implements org.apache.accu
   SortedMapKey,Value tabletsKeyValues = new TreeMapKey,Value();
   try {
 PairText,KeyExtent pair = verifyTabletInformation(extent, 
TabletServer.this.getTabletSession(), tabletsKeyValues, 
getClientAddressString(), getLock());
-locationToOpen = pair.getFirst();
-if (pair.getSecond() != null) {
-  synchronized (openingTablets) {
-openingTablets.remove(extent);
-openingTablets.notifyAll();
-// it expected that the new extent will overlap the old one... if 
it does not, it should not be added to unopenedTablets
-if (!KeyExtent.findOverlapping(extent, new 
TreeSetKeyExtent(Arrays.asList(pair.getSecond(.contains(pair.getSecond()))
 {
-  throw new IllegalStateException(Fixed split does not overlap  
+ extent +   + pair.getSecond());
+if (pair != null) {
+  locationToOpen = pair.getFirst();
+  if (pair.getSecond() != null) {
+synchronized (openingTablets) {
+  openingTablets.remove(extent);
+  openingTablets.notifyAll();
+  // it expected that the new extent will overlap the old one... 
if it does not, it should not be added to unopenedTablets
+  if (!KeyExtent.findOverlapping(extent, new 
TreeSetKeyExtent(Arrays.asList(pair.getSecond(.contains(pair.getSecond()))
 {
+throw new IllegalStateException(Fixed split does not overlap 
 + extent +   + pair.getSecond());
+  }
+  unopenedTablets.add(pair.getSecond());
 }
-unopenedTablets.add(pair.getSecond());
+// split was rolled back... try again
+new AssignmentHandler(pair.getSecond()).run();
+return;
   }
-  // split was rolled back... try again
-  new AssignmentHandler(pair.getSecond()).run();
-  return;
 }
   } catch (Exception e) {
 synchronized (openingTablets) {

[5/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-01-24 Thread elserj

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6afef02f
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6afef02f
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6afef02f

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 6afef02fc2b7a6e39568b683fea017431173496c
Parents: 3485ba3 4cac84e
Author: Josh Elser els...@apache.org
Authored: Fri Jan 24 11:38:22 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 11:38:22 2014 -0500

--

--

[3/6] git commit: ACCUMULO-1937 decrease log severity for expected case of a tablet no longer being in the unopened set at the moment it is being loaded

2014-01-24 Thread elserj

ACCUMULO-1937 decrease log severity for expected case of a tablet no longer 
being in the unopened set at the moment it is being loaded

Conflicts:

server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4e89c614
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4e89c614
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4e89c614

Branch: refs/heads/master
Commit: 4e89c614533b730dc41ff437d2451b5c93fe243b
Parents: 4cac84e
Author: Eric Newton eric.new...@gmail.com
Authored: Wed Nov 27 09:47:31 2013 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 11:49:18 2014 -0500

--
 .../apache/accumulo/server/tabletserver/TabletServer.java   | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4e89c614/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
--
diff --git 
a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
 
b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
index 8f2bbed..2ce6b9d 100644
--- 
a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
+++ 
b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
@@ -2430,8 +2430,13 @@ public class TabletServer extends AbstractMetricsImpl 
implements org.apache.accu
 
 if (openingOverlapping.contains(extent) || 
onlineOverlapping.contains(extent))
   return;
-
-if (!unopenedTablets.contains(extent) || 
unopenedOverlapping.size() != 1 || openingOverlapping.size()  0 || 
onlineOverlapping.size()  0) {
+
+if (!unopenedOverlapping.contains(extent)) {
+  log.info(assignment  + extent +  no longer in the unopened 
set);
+  return;
+}
+
+if (unopenedOverlapping.size() != 1 || openingOverlapping.size()  
0 || onlineOverlapping.size()  0) {
   throw new IllegalStateException(overlaps assigned  + extent + 
  + !unopenedTablets.contains(extent) +   + unopenedOverlapping +  
   + openingOverlapping +   + onlineOverlapping);
 }

[5/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-01-24 Thread elserj

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d2e36ebb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d2e36ebb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d2e36ebb

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: d2e36ebb099f815a7ca37d920eb9470dbf26368e
Parents: 6afef02 4e89c61
Author: Josh Elser els...@apache.org
Authored: Fri Jan 24 11:49:30 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 11:49:30 2014 -0500

--

--

[2/6] git commit: ACCUMULO-1937 decrease log severity for expected case of a tablet no longer being in the unopened set at the moment it is being loaded

2014-01-24 Thread elserj

ACCUMULO-1937 decrease log severity for expected case of a tablet no longer 
being in the unopened set at the moment it is being loaded

Conflicts:

server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4e89c614
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4e89c614
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4e89c614

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 4e89c614533b730dc41ff437d2451b5c93fe243b
Parents: 4cac84e
Author: Eric Newton eric.new...@gmail.com
Authored: Wed Nov 27 09:47:31 2013 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 11:49:18 2014 -0500

--
 .../apache/accumulo/server/tabletserver/TabletServer.java   | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4e89c614/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
--
diff --git 
a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
 
b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
index 8f2bbed..2ce6b9d 100644
--- 
a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
+++ 
b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
@@ -2430,8 +2430,13 @@ public class TabletServer extends AbstractMetricsImpl 
implements org.apache.accu
 
 if (openingOverlapping.contains(extent) || 
onlineOverlapping.contains(extent))
   return;
-
-if (!unopenedTablets.contains(extent) || 
unopenedOverlapping.size() != 1 || openingOverlapping.size()  0 || 
onlineOverlapping.size()  0) {
+
+if (!unopenedOverlapping.contains(extent)) {
+  log.info(assignment  + extent +  no longer in the unopened 
set);
+  return;
+}
+
+if (unopenedOverlapping.size() != 1 || openingOverlapping.size()  
0 || onlineOverlapping.size()  0) {
   throw new IllegalStateException(overlaps assigned  + extent + 
  + !unopenedTablets.contains(extent) +   + unopenedOverlapping +  
   + openingOverlapping +   + onlineOverlapping);
 }

[4/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-01-24 Thread elserj

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/d2e36ebb
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/d2e36ebb
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/d2e36ebb

Branch: refs/heads/master
Commit: d2e36ebb099f815a7ca37d920eb9470dbf26368e
Parents: 6afef02 4e89c61
Author: Josh Elser els...@apache.org
Authored: Fri Jan 24 11:49:30 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 11:49:30 2014 -0500

--

--

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

2014-01-24 Thread elserj

Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6aed342b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6aed342b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6aed342b

Branch: refs/heads/master
Commit: 6aed342bf2c7277fc0fdec58c70ae61edb1ce9e8
Parents: d44ece4 d2e36eb
Author: Josh Elser els...@apache.org
Authored: Fri Jan 24 11:49:38 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 11:49:38 2014 -0500

--

--

[1/6] git commit: ACCUMULO-1937 decrease log severity for expected case of a tablet no longer being in the unopened set at the moment it is being loaded

2014-01-24 Thread elserj

Updated Branches:
  refs/heads/1.5.1-SNAPSHOT 4cac84ecd - 4e89c6145
  refs/heads/1.6.0-SNAPSHOT 6afef02fc - d2e36ebb0
  refs/heads/master d44ece4e4 - 6aed342bf


ACCUMULO-1937 decrease log severity for expected case of a tablet no longer 
being in the unopened set at the moment it is being loaded

Conflicts:

server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/4e89c614
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/4e89c614
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/4e89c614

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 4e89c614533b730dc41ff437d2451b5c93fe243b
Parents: 4cac84e
Author: Eric Newton eric.new...@gmail.com
Authored: Wed Nov 27 09:47:31 2013 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 11:49:18 2014 -0500

--
 .../apache/accumulo/server/tabletserver/TabletServer.java   | 9 +++--
 1 file changed, 7 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4e89c614/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
--
diff --git 
a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
 
b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
index 8f2bbed..2ce6b9d 100644
--- 
a/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
+++ 
b/server/src/main/java/org/apache/accumulo/server/tabletserver/TabletServer.java
@@ -2430,8 +2430,13 @@ public class TabletServer extends AbstractMetricsImpl 
implements org.apache.accu
 
 if (openingOverlapping.contains(extent) || 
onlineOverlapping.contains(extent))
   return;
-
-if (!unopenedTablets.contains(extent) || 
unopenedOverlapping.size() != 1 || openingOverlapping.size()  0 || 
onlineOverlapping.size()  0) {
+
+if (!unopenedOverlapping.contains(extent)) {
+  log.info(assignment  + extent +  no longer in the unopened 
set);
+  return;
+}
+
+if (unopenedOverlapping.size() != 1 || openingOverlapping.size()  
0 || onlineOverlapping.size()  0) {
   throw new IllegalStateException(overlaps assigned  + extent + 
  + !unopenedTablets.contains(extent) +   + unopenedOverlapping +  
   + openingOverlapping +   + onlineOverlapping);
 }

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

2014-01-24 Thread elserj

Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/9dc84f32
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/9dc84f32
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/9dc84f32

Branch: refs/heads/master
Commit: 9dc84f32f0e5626c894270805d4f938223a4e933
Parents: 6aed342 e7ba8ea
Author: Josh Elser els...@apache.org
Authored: Fri Jan 24 12:10:21 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 12:10:21 2014 -0500

--
 .../org/apache/accumulo/test/randomwalk/security/Validate.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--

[4/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-01-24 Thread elserj

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e7ba8ea4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e7ba8ea4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e7ba8ea4

Branch: refs/heads/master
Commit: e7ba8ea43c52bf5cc312d295e2b29681c367c225
Parents: d2e36eb 1f96266
Author: Josh Elser els...@apache.org
Authored: Fri Jan 24 12:10:13 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 12:10:13 2014 -0500

--
 .../org/apache/accumulo/test/randomwalk/security/Validate.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e7ba8ea4/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Validate.java
--

[2/6] git commit: ACCUMULO-2183 Remove the .equals in favor of an equality check that enforces compile-time type checking.

2014-01-24 Thread elserj

ACCUMULO-2183 Remove the .equals in favor of an equality check that enforces 
compile-time type checking.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1f96266c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1f96266c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1f96266c

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 1f96266cb249380a9a378ec1fdac84171d2c7465
Parents: 4e89c61
Author: Josh Elser els...@apache.org
Authored: Fri Jan 24 11:56:41 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 11:56:41 2014 -0500

--
 .../org/apache/accumulo/test/randomwalk/security/Validate.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1f96266c/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Validate.java
--
diff --git 
a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Validate.java 
b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Validate.java
index 047bba3..eb97d23 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Validate.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Validate.java
@@ -108,7 +108,7 @@ public class Validate extends Test {
   auths = 
WalkingSecurity.get(state).getUserAuthorizations(WalkingSecurity.get(state).getTabCredentials());
   accuAuths = 
conn.securityOperations().getUserAuthorizations(WalkingSecurity.get(state).getTabUserName());
 } catch (ThriftSecurityException ae) {
-  if 
(ae.getCode().equals(org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode.USER_DOESNT_EXIST))
 {
+  if (ae.getCode() == 
org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode.USER_DOESNT_EXIST)
 {
 if (tableUserExists)
   throw new AccumuloException(Table user didn't exist when they 
should., ae);
 else

[3/6] git commit: ACCUMULO-2183 Remove the .equals in favor of an equality check that enforces compile-time type checking.

2014-01-24 Thread elserj

ACCUMULO-2183 Remove the .equals in favor of an equality check that enforces 
compile-time type checking.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1f96266c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1f96266c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1f96266c

Branch: refs/heads/master
Commit: 1f96266cb249380a9a378ec1fdac84171d2c7465
Parents: 4e89c61
Author: Josh Elser els...@apache.org
Authored: Fri Jan 24 11:56:41 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 11:56:41 2014 -0500

--
 .../org/apache/accumulo/test/randomwalk/security/Validate.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1f96266c/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Validate.java
--
diff --git 
a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Validate.java 
b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Validate.java
index 047bba3..eb97d23 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Validate.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Validate.java
@@ -108,7 +108,7 @@ public class Validate extends Test {
   auths = 
WalkingSecurity.get(state).getUserAuthorizations(WalkingSecurity.get(state).getTabCredentials());
   accuAuths = 
conn.securityOperations().getUserAuthorizations(WalkingSecurity.get(state).getTabUserName());
 } catch (ThriftSecurityException ae) {
-  if 
(ae.getCode().equals(org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode.USER_DOESNT_EXIST))
 {
+  if (ae.getCode() == 
org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode.USER_DOESNT_EXIST)
 {
 if (tableUserExists)
   throw new AccumuloException(Table user didn't exist when they 
should., ae);
 else

[5/6] git commit: Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

2014-01-24 Thread elserj

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/e7ba8ea4
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/e7ba8ea4
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/e7ba8ea4

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: e7ba8ea43c52bf5cc312d295e2b29681c367c225
Parents: d2e36eb 1f96266
Author: Josh Elser els...@apache.org
Authored: Fri Jan 24 12:10:13 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 12:10:13 2014 -0500

--
 .../org/apache/accumulo/test/randomwalk/security/Validate.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e7ba8ea4/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Validate.java
--

[1/6] git commit: ACCUMULO-2183 Remove the .equals in favor of an equality check that enforces compile-time type checking.

2014-01-24 Thread elserj

Updated Branches:
  refs/heads/1.5.1-SNAPSHOT 4e89c6145 - 1f96266cb
  refs/heads/1.6.0-SNAPSHOT d2e36ebb0 - e7ba8ea43
  refs/heads/master 6aed342bf - 9dc84f32f


ACCUMULO-2183 Remove the .equals in favor of an equality check that enforces 
compile-time type checking.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/1f96266c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1f96266c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1f96266c

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 1f96266cb249380a9a378ec1fdac84171d2c7465
Parents: 4e89c61
Author: Josh Elser els...@apache.org
Authored: Fri Jan 24 11:56:41 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 11:56:41 2014 -0500

--
 .../org/apache/accumulo/test/randomwalk/security/Validate.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1f96266c/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Validate.java
--
diff --git 
a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Validate.java 
b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Validate.java
index 047bba3..eb97d23 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Validate.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/Validate.java
@@ -108,7 +108,7 @@ public class Validate extends Test {
   auths = 
WalkingSecurity.get(state).getUserAuthorizations(WalkingSecurity.get(state).getTabCredentials());
   accuAuths = 
conn.securityOperations().getUserAuthorizations(WalkingSecurity.get(state).getTabUserName());
 } catch (ThriftSecurityException ae) {
-  if 
(ae.getCode().equals(org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode.USER_DOESNT_EXIST))
 {
+  if (ae.getCode() == 
org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode.USER_DOESNT_EXIST)
 {
 if (tableUserExists)
   throw new AccumuloException(Table user didn't exist when they 
should., ae);
 else

git commit: Check for namespace doesn't exist errors.

2014-01-24 Thread ecn

Updated Branches:
  refs/heads/1.6.0-SNAPSHOT e7ba8ea43 - 04a89fce9


Check for namespace doesn't exist errors.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/04a89fce
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/04a89fce
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/04a89fce

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 04a89fce98e7a777d313f1c99cd2fd15e0e0ae06
Parents: e7ba8ea
Author: Eric Newton eric.new...@gmail.com
Authored: Fri Jan 24 13:09:54 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Fri Jan 24 13:11:36 2014 -0500

--
 .../test/randomwalk/concurrent/ChangePermissions.java  | 13 -
 .../test/randomwalk/concurrent/CreateTable.java|  7 +++
 2 files changed, 19 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/04a89fce/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java
--
diff --git 
a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java
 
b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java
index d3c7c70..63af95a 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java
@@ -25,6 +25,8 @@ import java.util.Random;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.impl.thrift.TableOperationExceptionType;
+import 
org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException;
 import org.apache.accumulo.core.security.SystemPermission;
 import org.apache.accumulo.core.security.NamespacePermission;
 import org.apache.accumulo.core.security.TablePermission;
@@ -52,7 +54,7 @@ public class ChangePermissions extends Test {
 String namespace = namespaces.get(rand.nextInt(namespaces.size()));
 
 try {
-  int dice = rand.nextInt(2);
+  int dice = rand.nextInt(3);
   if (dice == 0)
 changeSystemPermission(conn, rand, userName);
   else if (dice == 1)
@@ -61,6 +63,15 @@ public class ChangePermissions extends Test {
 changeNamespacePermission(conn, rand, userName, namespace);
 } catch (AccumuloSecurityException ex) {
   log.debug(Unable to change user permissions:  + ex.getCause());
+} catch (AccumuloException ex) {
+  Throwable cause = ex.getCause();
+  if (cause != null  cause instanceof ThriftTableOperationException) {
+ThriftTableOperationException toe = 
(ThriftTableOperationException)cause.getCause();
+if (toe.type == TableOperationExceptionType.NAMESPACE_NOTFOUND) {
+  log.debug(Unable to change user permissions:  + toe.getCause());
+  return;
+}
+  }
 }
   }
   

http://git-wip-us.apache.org/repos/asf/accumulo/blob/04a89fce/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CreateTable.java
--
diff --git 
a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CreateTable.java
 
b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CreateTable.java
index 5a695bc..21ae031 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CreateTable.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CreateTable.java
@@ -20,8 +20,10 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Random;
 
+import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.NamespaceNotFoundException;
 import org.apache.accumulo.core.client.TableExistsException;
 import org.apache.accumulo.test.randomwalk.State;
 import org.apache.accumulo.test.randomwalk.Test;
@@ -44,6 +46,11 @@ public class CreateTable extends Test {
   log.debug(Created table  + tableName);
 } catch (TableExistsException e) {
   log.debug(Create  + tableName +  failed, it exists);
+} catch (AccumuloException e) {
+  if (e.getCause() != null  e.getCause() instanceof 
NamespaceNotFoundException)
+log.debug(Create  + tableName +  failed, the namespace does not 
exist);
+  else
+throw e;
 } catch (IllegalArgumentException e) {
   log.debug(Create:  + e.toString());
 } catch (AccumuloSecurityException e) {

[1/2] git commit: Check for namespace doesn't exist errors.

2014-01-24 Thread ecn

Updated Branches:
  refs/heads/master 9dc84f32f - b2cde1917


Check for namespace doesn't exist errors.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/04a89fce
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/04a89fce
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/04a89fce

Branch: refs/heads/master
Commit: 04a89fce98e7a777d313f1c99cd2fd15e0e0ae06
Parents: e7ba8ea
Author: Eric Newton eric.new...@gmail.com
Authored: Fri Jan 24 13:09:54 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Fri Jan 24 13:11:36 2014 -0500

--
 .../test/randomwalk/concurrent/ChangePermissions.java  | 13 -
 .../test/randomwalk/concurrent/CreateTable.java|  7 +++
 2 files changed, 19 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/04a89fce/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java
--
diff --git 
a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java
 
b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java
index d3c7c70..63af95a 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/ChangePermissions.java
@@ -25,6 +25,8 @@ import java.util.Random;
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.impl.thrift.TableOperationExceptionType;
+import 
org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException;
 import org.apache.accumulo.core.security.SystemPermission;
 import org.apache.accumulo.core.security.NamespacePermission;
 import org.apache.accumulo.core.security.TablePermission;
@@ -52,7 +54,7 @@ public class ChangePermissions extends Test {
 String namespace = namespaces.get(rand.nextInt(namespaces.size()));
 
 try {
-  int dice = rand.nextInt(2);
+  int dice = rand.nextInt(3);
   if (dice == 0)
 changeSystemPermission(conn, rand, userName);
   else if (dice == 1)
@@ -61,6 +63,15 @@ public class ChangePermissions extends Test {
 changeNamespacePermission(conn, rand, userName, namespace);
 } catch (AccumuloSecurityException ex) {
   log.debug(Unable to change user permissions:  + ex.getCause());
+} catch (AccumuloException ex) {
+  Throwable cause = ex.getCause();
+  if (cause != null  cause instanceof ThriftTableOperationException) {
+ThriftTableOperationException toe = 
(ThriftTableOperationException)cause.getCause();
+if (toe.type == TableOperationExceptionType.NAMESPACE_NOTFOUND) {
+  log.debug(Unable to change user permissions:  + toe.getCause());
+  return;
+}
+  }
 }
   }
   

http://git-wip-us.apache.org/repos/asf/accumulo/blob/04a89fce/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CreateTable.java
--
diff --git 
a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CreateTable.java
 
b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CreateTable.java
index 5a695bc..21ae031 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CreateTable.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/randomwalk/concurrent/CreateTable.java
@@ -20,8 +20,10 @@ import java.util.List;
 import java.util.Properties;
 import java.util.Random;
 
+import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.Connector;
+import org.apache.accumulo.core.client.NamespaceNotFoundException;
 import org.apache.accumulo.core.client.TableExistsException;
 import org.apache.accumulo.test.randomwalk.State;
 import org.apache.accumulo.test.randomwalk.Test;
@@ -44,6 +46,11 @@ public class CreateTable extends Test {
   log.debug(Created table  + tableName);
 } catch (TableExistsException e) {
   log.debug(Create  + tableName +  failed, it exists);
+} catch (AccumuloException e) {
+  if (e.getCause() != null  e.getCause() instanceof 
NamespaceNotFoundException)
+log.debug(Create  + tableName +  failed, the namespace does not 
exist);
+  else
+throw e;
 } catch (IllegalArgumentException e) {
   log.debug(Create:  + e.toString());
 } catch (AccumuloSecurityException e) {

[2/2] git commit: Merge branch '1.6.0-SNAPSHOT'

2014-01-24 Thread ecn

Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/b2cde191
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/b2cde191
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/b2cde191

Branch: refs/heads/master
Commit: b2cde1917cd239c94ad19c8912b1c4b9084b7998
Parents: 9dc84f3 04a89fc
Author: Eric Newton eric.new...@gmail.com
Authored: Fri Jan 24 13:11:51 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Fri Jan 24 13:11:51 2014 -0500

--
 .../test/randomwalk/concurrent/ChangePermissions.java  | 13 -
 .../test/randomwalk/concurrent/CreateTable.java|  7 +++
 2 files changed, 19 insertions(+), 1 deletion(-)
--

git commit: ACCUMULO-1961 eliminate warnings

2014-01-24 Thread ecn

Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 04a89fce9 - 64d66e1dc


ACCUMULO-1961 eliminate warnings


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/64d66e1d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/64d66e1d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/64d66e1d

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 64d66e1dca281e7022ca5329f31b553ac8ebc172
Parents: 04a89fc
Author: Eric Newton eric.new...@gmail.com
Authored: Fri Jan 24 13:26:01 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Fri Jan 24 13:26:01 2014 -0500

--
 .../java/org/apache/accumulo/core/client/impl/OfflineScanner.java  | 2 --
 .../accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java  | 2 --
 .../accumulo/core/client/mapreduce/AccumuloInputFormatTest.java| 2 +-
 .../test/java/org/apache/accumulo/fate/util/AddressUtilTest.java   | 2 +-
 .../java/org/apache/accumulo/test/continuous/ContinuousVerify.java | 1 -
 5 files changed, 2 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/64d66e1d/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java 
b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
index 42088ea..c60e153 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
@@ -22,12 +22,10 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.Map.Entry;
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
-import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.RowIterator;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/64d66e1d/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
 
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
index 8bce08b..cf861ce 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
@@ -29,8 +29,6 @@ import org.apache.accumulo.core.client.mock.MockInstance;
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
 import 
org.apache.accumulo.core.client.security.tokens.AuthenticationToken.AuthenticationTokenSerializer;
 import org.apache.accumulo.core.security.Credentials;
-import org.apache.accumulo.core.conf.AccumuloConfiguration;
-import org.apache.accumulo.core.conf.SiteConfiguration;
 import org.apache.accumulo.core.util.ArgumentChecker;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.hadoop.conf.Configuration;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/64d66e1d/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
--
diff --git 
a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
 
b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
index cb6b2ad..165c7f7 100644
--- 
a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
+++ 
b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
@@ -401,7 +401,7 @@ public class AccumuloInputFormatTest {
 
   @Test
   public void testEmptyColumnFamily() throws IOException {
-Job job = new Job();
+Job job = Job.getInstance();
 SetPairText,Text cols = new HashSetPairText,Text();
 cols.add(new PairText,Text(new Text(), null));
 cols.add(new PairText,Text(new Text(foo), new Text(bar)));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/64d66e1d/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
--
diff --git 
a/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java 
b/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
index 7d43381..6e6a3c3 100644
---

[1/2] git commit: ACCUMULO-1961 eliminate warnings

2014-01-24 Thread ecn

Updated Branches:
  refs/heads/master b2cde1917 - bdded2cd0


ACCUMULO-1961 eliminate warnings


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/64d66e1d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/64d66e1d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/64d66e1d

Branch: refs/heads/master
Commit: 64d66e1dca281e7022ca5329f31b553ac8ebc172
Parents: 04a89fc
Author: Eric Newton eric.new...@gmail.com
Authored: Fri Jan 24 13:26:01 2014 -0500
Committer: Eric Newton eric.new...@gmail.com
Committed: Fri Jan 24 13:26:01 2014 -0500

--
 .../java/org/apache/accumulo/core/client/impl/OfflineScanner.java  | 2 --
 .../accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java  | 2 --
 .../accumulo/core/client/mapreduce/AccumuloInputFormatTest.java| 2 +-
 .../test/java/org/apache/accumulo/fate/util/AddressUtilTest.java   | 2 +-
 .../java/org/apache/accumulo/test/continuous/ContinuousVerify.java | 1 -
 5 files changed, 2 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/64d66e1d/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java 
b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
index 42088ea..c60e153 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
@@ -22,12 +22,10 @@ import java.util.Arrays;
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
-import java.util.Map;
 import java.util.Map.Entry;
 
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.AccumuloException;
-import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.Connector;
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.RowIterator;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/64d66e1d/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
 
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
index 8bce08b..cf861ce 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/util/ConfiguratorBase.java
@@ -29,8 +29,6 @@ import org.apache.accumulo.core.client.mock.MockInstance;
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
 import 
org.apache.accumulo.core.client.security.tokens.AuthenticationToken.AuthenticationTokenSerializer;
 import org.apache.accumulo.core.security.Credentials;
-import org.apache.accumulo.core.conf.AccumuloConfiguration;
-import org.apache.accumulo.core.conf.SiteConfiguration;
 import org.apache.accumulo.core.util.ArgumentChecker;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.hadoop.conf.Configuration;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/64d66e1d/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
--
diff --git 
a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
 
b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
index cb6b2ad..165c7f7 100644
--- 
a/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
+++ 
b/core/src/test/java/org/apache/accumulo/core/client/mapreduce/AccumuloInputFormatTest.java
@@ -401,7 +401,7 @@ public class AccumuloInputFormatTest {
 
   @Test
   public void testEmptyColumnFamily() throws IOException {
-Job job = new Job();
+Job job = Job.getInstance();
 SetPairText,Text cols = new HashSetPairText,Text();
 cols.add(new PairText,Text(new Text(), null));
 cols.add(new PairText,Text(new Text(foo), new Text(bar)));

http://git-wip-us.apache.org/repos/asf/accumulo/blob/64d66e1d/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
--
diff --git 
a/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java 
b/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
index 7d43381..6e6a3c3 100644
--- a/fate/src/test/java/org/apache/accumulo/fate/util/AddressUtilTest.java
+++

[6/6] git commit: Merge branch '1.6.0-SNAPSHOT'

2014-01-24 Thread elserj

Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/c4af6f26
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c4af6f26
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c4af6f26

Branch: refs/heads/master
Commit: c4af6f26da78cc2b4e75379545a77fd931bb0b5d
Parents: bdded2c 3321493
Author: Josh Elser els...@apache.org
Authored: Fri Jan 24 13:43:19 2014 -0500
Committer: Josh Elser els...@apache.org
Committed: Fri Jan 24 13:43:19 2014 -0500

--
 contrib/README.findbugs| 24 +++
 contrib/findbugs_build.xml | 96 -
 contrib/run_findbugs.sh| 18 
 3 files changed, 24 insertions(+), 114 deletions(-)
--

[04/10] git commit: ACCUMULO-2252 Backport ACCUMULO-684 to 1.4.x

2014-01-24 Thread bhavanki

ACCUMULO-2252 Backport ACCUMULO-684 to 1.4.x

A one-line manual backport of the one-line fix in ACCUMULO-684. The ZooUtil 
class
modified here is the one residing under the fate component in later releases.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6593a9f5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6593a9f5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6593a9f5

Branch: refs/heads/master
Commit: 6593a9f5466e465ea7b8d46edfdef0544c42ada9
Parents: 6d6ca9d
Author: Bill Havanki bhava...@cloudera.com
Authored: Fri Jan 24 15:22:06 2014 -0500
Committer: Bill Havanki bhava...@cloudera.com
Committed: Fri Jan 24 15:22:06 2014 -0500

--
 .../src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6593a9f5/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java
--
diff --git 
a/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java 
b/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java
index 7d490c5..cfbe5ef 100644
--- a/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java
+++ b/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java
@@ -236,7 +236,7 @@ public class ZooUtil {
 
 ListString children = zc.getChildren(path);
 
-if (children.size() == 0) {
+if (children == null || children.size() == 0) {
   return null;
 }

[06/10] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT (-sours)

2014-01-24 Thread bhavanki

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT (-sours)


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/295643ab
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/295643ab
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/295643ab

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 295643ab039e813d35d00f8c7e248b4ca79d199c
Parents: 8981ba0 6593a9f
Author: Bill Havanki bhava...@cloudera.com
Authored: Fri Jan 24 15:24:17 2014 -0500
Committer: Bill Havanki bhava...@cloudera.com
Committed: Fri Jan 24 15:24:17 2014 -0500

--

--

[01/10] git commit: ACCUMULO-2252 Backport ACCUMULO-684 to 1.4.x

2014-01-24 Thread bhavanki

Updated Branches:
  refs/heads/1.4.5-SNAPSHOT 6d6ca9d9e - 6593a9f54
  refs/heads/1.5.1-SNAPSHOT 8981ba04e - 295643ab0
  refs/heads/1.6.0-SNAPSHOT 332149304 - 19da920aa
  refs/heads/master c4af6f26d - 0524ddbfb


ACCUMULO-2252 Backport ACCUMULO-684 to 1.4.x

A one-line manual backport of the one-line fix in ACCUMULO-684. The ZooUtil 
class
modified here is the one residing under the fate component in later releases.


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/6593a9f5
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/6593a9f5
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/6593a9f5

Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 6593a9f5466e465ea7b8d46edfdef0544c42ada9
Parents: 6d6ca9d
Author: Bill Havanki bhava...@cloudera.com
Authored: Fri Jan 24 15:22:06 2014 -0500
Committer: Bill Havanki bhava...@cloudera.com
Committed: Fri Jan 24 15:22:06 2014 -0500

--
 .../src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6593a9f5/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java
--
diff --git 
a/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java 
b/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java
index 7d490c5..cfbe5ef 100644
--- a/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java
+++ b/src/core/src/main/java/org/apache/accumulo/core/zookeeper/ZooUtil.java
@@ -236,7 +236,7 @@ public class ZooUtil {
 
 ListString children = zc.getChildren(path);
 
-if (children.size() == 0) {
+if (children == null || children.size() == 0) {
   return null;
 }

[10/10] git commit: Merge branch '1.6.0-SNAPSHOT'

2014-01-24 Thread bhavanki

Merge branch '1.6.0-SNAPSHOT'


Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo
Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/0524ddbf
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0524ddbf
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0524ddbf

Branch: refs/heads/master
Commit: 0524ddbfb143336fdc56fb6d56c7c602c9f3e62f
Parents: c4af6f2 19da920
Author: Bill Havanki bhava...@cloudera.com
Authored: Fri Jan 24 15:24:43 2014 -0500
Committer: Bill Havanki bhava...@cloudera.com
Committed: Fri Jan 24 15:24:43 2014 -0500

--

--

48 matches

Mail list logo