[1/2] ACCUMULO-2010 Remove Closeable from interfaces

[ctubbsii]

Updated Branches:
  refs/heads/1.4.5-SNAPSHOT 07a0433bd -> 335f693a4


http://git-wip-us.apache.org/repos/asf/accumulo/blob/335f693a/src/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java
--
diff --git 
a/src/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java
 
b/src/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java
index 491b8ec..2caf7cd 100644
--- 
a/src/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java
+++ 
b/src/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java
@@ -49,96 +49,100 @@ import org.apache.hadoop.io.Text;
  * 
  */
 public class UndefinedAnalyzer {
-  
+
   static class UndefinedNode {
-
+
 public UndefinedNode(String undef2, String ref2) {
   this.undef = undef2;
   this.ref = ref2;
 }
-
+
 String undef;
 String ref;
   }
-  
+
   static class IngestInfo {
-
+
 Map> flushes = new 
HashMap>();
-
+
 public IngestInfo(String logDir) throws Exception {
   File dir = new File(logDir);
   File[] ingestLogs = dir.listFiles(new FilenameFilter() {
+@Override
 public boolean accept(java.io.File dir, String name) {
   return name.endsWith("ingest.out");
 }
   });
-  
+
   for (File log : ingestLogs) {
 parseLog(log);
   }
 }
-
+
 private void parseLog(File log) throws Exception {
   BufferedReader reader = new BufferedReader(new FileReader(log));
-  
-  String line;
-  TreeMap tm = null;
-  
-  while ((line = reader.readLine()) != null) {
-if (!line.startsWith("UUID"))
-  continue;
-String[] tokens = line.split("\\s");
-String time = tokens[1];
-String uuid = tokens[2];
-
-if (flushes.containsKey(uuid)) {
-  System.err.println("WARN Duplicate uuid " + log);
+  try {
+String line;
+TreeMap tm = null;
+
+while ((line = reader.readLine()) != null) {
+  if (!line.startsWith("UUID"))
+continue;
+  String[] tokens = line.split("\\s");
+  String time = tokens[1];
+  String uuid = tokens[2];
+
+  if (flushes.containsKey(uuid)) {
+System.err.println("WARN Duplicate uuid " + log);
+return;
+  }
+
+  tm = new TreeMap(Collections.reverseOrder());
+  tm.put(0l, Long.parseLong(time));
+  flushes.put(uuid, tm);
+  break;
+
+}
+
+if (tm == null) {
+  System.err.println("WARN Bad ingest log " + log);
   return;
 }
-
-tm = new TreeMap(Collections.reverseOrder());
-tm.put(0l, Long.parseLong(time));
-flushes.put(uuid, tm);
-break;
-
-  }
-  
-  if (tm == null) {
-System.err.println("WARN Bad ingest log " + log);
-return;
-  }
-  
-  while ((line = reader.readLine()) != null) {
-String[] tokens = line.split("\\s");
-
-if (!tokens[0].equals("FLUSH"))
-  continue;
-
-String time = tokens[1];
-String count = tokens[4];
-
-tm.put(Long.parseLong(count), Long.parseLong(time));
+
+while ((line = reader.readLine()) != null) {
+  String[] tokens = line.split("\\s");
+
+  if (!tokens[0].equals("FLUSH"))
+continue;
+
+  String time = tokens[1];
+  String count = tokens[4];
+
+  tm.put(Long.parseLong(count), Long.parseLong(time));
+}
+  } finally {
+if (reader != null)
+  reader.close();
   }
-  
 }
-
+
 Iterator getTimes(String uuid, long count) {
   TreeMap tm = flushes.get(uuid);
-  
+
   if (tm == null)
 return null;
-  
+
   return tm.tailMap(count).values().iterator();
 }
   }
-  
+
   static class TabletAssignment {
 String tablet;
 String endRow;
 String prevEndRow;
 String server;
 long time;
-
+
 TabletAssignment(String tablet, String er, String per, String server, long 
time) {
   this.tablet = new String(tablet);
   this.endRow = new String(er);
@@ -146,133 +150,139 @@ public class UndefinedAnalyzer {
   this.server = new String(server);
   this.time = time;
 }
-
+
 public boolean contains(String row) {
   return prevEndRow.compareTo(row) < 0 && endRow.compareTo(row) >= 0;
 }
   }
-  
+
   static class TabletHistory {
-
+
 List assignments = new ArrayList();
-
+
 TabletHistory(String tableId, String acuLogDir) throws Exception {
   File dir = new File(acuLogDir);
   File[] masterLogs = dir.listFiles(new FilenameFilter() {
+@Override
 public boolean accept(java.io.File dir, String name) {

[1/3] ACCUMULO-2010 Remove Closeable from interfaces

[ctubbsii]

Updated Branches:
  refs/heads/1.5.1-SNAPSHOT b65bdd60c -> c84acfc9a


http://git-wip-us.apache.org/repos/asf/accumulo/blob/335f693a/src/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java
--
diff --git 
a/src/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java
 
b/src/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java
index 491b8ec..2caf7cd 100644
--- 
a/src/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java
+++ 
b/src/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java
@@ -49,96 +49,100 @@ import org.apache.hadoop.io.Text;
  * 
  */
 public class UndefinedAnalyzer {
-  
+
   static class UndefinedNode {
-
+
 public UndefinedNode(String undef2, String ref2) {
   this.undef = undef2;
   this.ref = ref2;
 }
-
+
 String undef;
 String ref;
   }
-  
+
   static class IngestInfo {
-
+
 Map> flushes = new 
HashMap>();
-
+
 public IngestInfo(String logDir) throws Exception {
   File dir = new File(logDir);
   File[] ingestLogs = dir.listFiles(new FilenameFilter() {
+@Override
 public boolean accept(java.io.File dir, String name) {
   return name.endsWith("ingest.out");
 }
   });
-  
+
   for (File log : ingestLogs) {
 parseLog(log);
   }
 }
-
+
 private void parseLog(File log) throws Exception {
   BufferedReader reader = new BufferedReader(new FileReader(log));
-  
-  String line;
-  TreeMap tm = null;
-  
-  while ((line = reader.readLine()) != null) {
-if (!line.startsWith("UUID"))
-  continue;
-String[] tokens = line.split("\\s");
-String time = tokens[1];
-String uuid = tokens[2];
-
-if (flushes.containsKey(uuid)) {
-  System.err.println("WARN Duplicate uuid " + log);
+  try {
+String line;
+TreeMap tm = null;
+
+while ((line = reader.readLine()) != null) {
+  if (!line.startsWith("UUID"))
+continue;
+  String[] tokens = line.split("\\s");
+  String time = tokens[1];
+  String uuid = tokens[2];
+
+  if (flushes.containsKey(uuid)) {
+System.err.println("WARN Duplicate uuid " + log);
+return;
+  }
+
+  tm = new TreeMap(Collections.reverseOrder());
+  tm.put(0l, Long.parseLong(time));
+  flushes.put(uuid, tm);
+  break;
+
+}
+
+if (tm == null) {
+  System.err.println("WARN Bad ingest log " + log);
   return;
 }
-
-tm = new TreeMap(Collections.reverseOrder());
-tm.put(0l, Long.parseLong(time));
-flushes.put(uuid, tm);
-break;
-
-  }
-  
-  if (tm == null) {
-System.err.println("WARN Bad ingest log " + log);
-return;
-  }
-  
-  while ((line = reader.readLine()) != null) {
-String[] tokens = line.split("\\s");
-
-if (!tokens[0].equals("FLUSH"))
-  continue;
-
-String time = tokens[1];
-String count = tokens[4];
-
-tm.put(Long.parseLong(count), Long.parseLong(time));
+
+while ((line = reader.readLine()) != null) {
+  String[] tokens = line.split("\\s");
+
+  if (!tokens[0].equals("FLUSH"))
+continue;
+
+  String time = tokens[1];
+  String count = tokens[4];
+
+  tm.put(Long.parseLong(count), Long.parseLong(time));
+}
+  } finally {
+if (reader != null)
+  reader.close();
   }
-  
 }
-
+
 Iterator getTimes(String uuid, long count) {
   TreeMap tm = flushes.get(uuid);
-  
+
   if (tm == null)
 return null;
-  
+
   return tm.tailMap(count).values().iterator();
 }
   }
-  
+
   static class TabletAssignment {
 String tablet;
 String endRow;
 String prevEndRow;
 String server;
 long time;
-
+
 TabletAssignment(String tablet, String er, String per, String server, long 
time) {
   this.tablet = new String(tablet);
   this.endRow = new String(er);
@@ -146,133 +150,139 @@ public class UndefinedAnalyzer {
   this.server = new String(server);
   this.time = time;
 }
-
+
 public boolean contains(String row) {
   return prevEndRow.compareTo(row) < 0 && endRow.compareTo(row) >= 0;
 }
   }
-  
+
   static class TabletHistory {
-
+
 List assignments = new ArrayList();
-
+
 TabletHistory(String tableId, String acuLogDir) throws Exception {
   File dir = new File(acuLogDir);
   File[] masterLogs = dir.listFiles(new FilenameFilter() {
+@Override
 public boolean accept(java.io.File dir, String name) {

[1/4] ACCUMULO-2010 Remove Closeable from interfaces

[ctubbsii]

Updated Branches:
  refs/heads/1.6.0-SNAPSHOT f6a3f907b -> 7fc8d8344


http://git-wip-us.apache.org/repos/asf/accumulo/blob/335f693a/src/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java
--
diff --git 
a/src/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java
 
b/src/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java
index 491b8ec..2caf7cd 100644
--- 
a/src/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java
+++ 
b/src/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java
@@ -49,96 +49,100 @@ import org.apache.hadoop.io.Text;
  * 
  */
 public class UndefinedAnalyzer {
-  
+
   static class UndefinedNode {
-
+
 public UndefinedNode(String undef2, String ref2) {
   this.undef = undef2;
   this.ref = ref2;
 }
-
+
 String undef;
 String ref;
   }
-  
+
   static class IngestInfo {
-
+
 Map> flushes = new 
HashMap>();
-
+
 public IngestInfo(String logDir) throws Exception {
   File dir = new File(logDir);
   File[] ingestLogs = dir.listFiles(new FilenameFilter() {
+@Override
 public boolean accept(java.io.File dir, String name) {
   return name.endsWith("ingest.out");
 }
   });
-  
+
   for (File log : ingestLogs) {
 parseLog(log);
   }
 }
-
+
 private void parseLog(File log) throws Exception {
   BufferedReader reader = new BufferedReader(new FileReader(log));
-  
-  String line;
-  TreeMap tm = null;
-  
-  while ((line = reader.readLine()) != null) {
-if (!line.startsWith("UUID"))
-  continue;
-String[] tokens = line.split("\\s");
-String time = tokens[1];
-String uuid = tokens[2];
-
-if (flushes.containsKey(uuid)) {
-  System.err.println("WARN Duplicate uuid " + log);
+  try {
+String line;
+TreeMap tm = null;
+
+while ((line = reader.readLine()) != null) {
+  if (!line.startsWith("UUID"))
+continue;
+  String[] tokens = line.split("\\s");
+  String time = tokens[1];
+  String uuid = tokens[2];
+
+  if (flushes.containsKey(uuid)) {
+System.err.println("WARN Duplicate uuid " + log);
+return;
+  }
+
+  tm = new TreeMap(Collections.reverseOrder());
+  tm.put(0l, Long.parseLong(time));
+  flushes.put(uuid, tm);
+  break;
+
+}
+
+if (tm == null) {
+  System.err.println("WARN Bad ingest log " + log);
   return;
 }
-
-tm = new TreeMap(Collections.reverseOrder());
-tm.put(0l, Long.parseLong(time));
-flushes.put(uuid, tm);
-break;
-
-  }
-  
-  if (tm == null) {
-System.err.println("WARN Bad ingest log " + log);
-return;
-  }
-  
-  while ((line = reader.readLine()) != null) {
-String[] tokens = line.split("\\s");
-
-if (!tokens[0].equals("FLUSH"))
-  continue;
-
-String time = tokens[1];
-String count = tokens[4];
-
-tm.put(Long.parseLong(count), Long.parseLong(time));
+
+while ((line = reader.readLine()) != null) {
+  String[] tokens = line.split("\\s");
+
+  if (!tokens[0].equals("FLUSH"))
+continue;
+
+  String time = tokens[1];
+  String count = tokens[4];
+
+  tm.put(Long.parseLong(count), Long.parseLong(time));
+}
+  } finally {
+if (reader != null)
+  reader.close();
   }
-  
 }
-
+
 Iterator getTimes(String uuid, long count) {
   TreeMap tm = flushes.get(uuid);
-  
+
   if (tm == null)
 return null;
-  
+
   return tm.tailMap(count).values().iterator();
 }
   }
-  
+
   static class TabletAssignment {
 String tablet;
 String endRow;
 String prevEndRow;
 String server;
 long time;
-
+
 TabletAssignment(String tablet, String er, String per, String server, long 
time) {
   this.tablet = new String(tablet);
   this.endRow = new String(er);
@@ -146,133 +150,139 @@ public class UndefinedAnalyzer {
   this.server = new String(server);
   this.time = time;
 }
-
+
 public boolean contains(String row) {
   return prevEndRow.compareTo(row) < 0 && endRow.compareTo(row) >= 0;
 }
   }
-  
+
   static class TabletHistory {
-
+
 List assignments = new ArrayList();
-
+
 TabletHistory(String tableId, String acuLogDir) throws Exception {
   File dir = new File(acuLogDir);
   File[] masterLogs = dir.listFiles(new FilenameFilter() {
+@Override
 public boolean accept(java.io.File dir, String name) {

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

[ctubbsii]

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/7fc8d834
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7fc8d834
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7fc8d834

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 7fc8d83444364ea30f72f663b9015f6e1603c756
Parents: f6a3f90 c84acfc
Author: Christopher Tubbs 
Authored: Fri Dec 13 18:00:45 2013 -0500
Committer: Christopher Tubbs 
Committed: Fri Dec 13 18:00:45 2013 -0500

--
 .../apache/accumulo/core/client/Instance.java   |   6 +-
 .../apache/accumulo/core/data/RangeTest.java| 337 ++-
 .../accumulo/fate/zookeeper/ZooCache.java   | 110 +++---
 .../accumulo/fate/zookeeper/ZooReader.java  |  39 ++-
 4 files changed, 244 insertions(+), 248 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7fc8d834/core/src/main/java/org/apache/accumulo/core/client/Instance.java
--

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

[ctubbsii]

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/f6a3f907
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/f6a3f907
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/f6a3f907

Branch: refs/heads/master
Commit: f6a3f907b50b6de7cbde8331581ae6636048d9a1
Parents: 6248299 b65bdd6
Author: Christopher Tubbs 
Authored: Fri Dec 13 17:13:19 2013 -0500
Committer: Christopher Tubbs 
Committed: Fri Dec 13 17:13:19 2013 -0500

--
 .../latex/accumulo_user_manual/chapters/administration.tex   | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f6a3f907/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex
--

[2/8] git commit: Merge remote-tracking branch 'origin/1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

[ctubbsii]

Merge remote-tracking branch 'origin/1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT


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

Branch: refs/heads/master
Commit: b65bdd60cd928e05da91d0b22658fac4c638624f
Parents: 5fa1a75 07a0433
Author: Christopher Tubbs 
Authored: Fri Dec 13 16:46:04 2013 -0500
Committer: Christopher Tubbs 
Committed: Fri Dec 13 16:46:04 2013 -0500

--
 .../latex/accumulo_user_manual/chapters/administration.tex   | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b65bdd60/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex
--
diff --cc docs/src/main/latex/accumulo_user_manual/chapters/administration.tex
index 086f41c,000..204f549
mode 100644,00..100644
--- a/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex
+++ b/docs/src/main/latex/accumulo_user_manual/chapters/administration.tex
@@@ -1,394 -1,0 +1,394 @@@
 +
 +% 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.
 +
 +\chapter{Administration}
 +
 +\section{Hardware}
 +
 +Because we are running essentially two or three systems simultaneously layered
 +across the cluster: HDFS, Accumulo and MapReduce, it is typical for hardware 
to
 +consist of 4 to 8 cores, and 8 to 32 GB RAM. This is so each running process 
can have
 +at least one core and 2 - 4 GB each.
 +
 +One core running HDFS can typically keep 2 to 4 disks busy, so each machine 
may
 +typically have as little as 2 x 300GB disks and as much as 4 x 1TB or 2TB 
disks.
 +
 +It is possible to do with less than this, such as with 1u servers with 2 
cores and 4GB
 +each, but in this case it is recommended to only run up to two processes per
 +machine - i.e. DataNode and TabletServer or DataNode and MapReduce worker but
 +not all three. The constraint here is having enough available heap space for 
all the
 +processes on a machine.
 +
 +\section{Network}
 +
 +Accumulo communicates via remote procedure calls over TCP/IP for both passing
 +data and control messages. In addition, Accumulo uses HDFS clients to
 +communicate with HDFS. To achieve good ingest and query performance, 
sufficient
 +network bandwidth must be available between any two machines.
 +
 +\section{Installation}
 +Choose a directory for the Accumulo installation. This directory will be 
referenced
 +by the environment variable \texttt{\$ACCUMULO\_HOME}. Run the following:
 +
 +\small
 +\begin{verbatim}
 +$ tar xzf accumulo-1.5.0-bin.tar.gz# unpack to subdirectory
 +$ mv accumulo-1.5.0 $ACCUMULO_HOME # move to desired location
 +\end{verbatim}
 +\normalsize
 +
 +Repeat this step at each machine within the cluster. Usually all machines 
have the
 +same \texttt{\$ACCUMULO\_HOME}.
 +
 +\section{Dependencies}
 +Accumulo requires HDFS and ZooKeeper to be configured and running
 +before starting. Password-less SSH should be configured between at least the
 +Accumulo master and TabletServer machines. It is also a good idea to run 
Network
 +Time Protocol (NTP) within the cluster to ensure nodes' clocks don't get too 
out of
 +sync, which can cause problems with automatically timestamped data. 
 +
 +\section{Configuration}
 +
 +Accumulo is configured by editing several Shell and XML files found in
 +\texttt{\$ACCUMULO\_HOME/conf}. The structure closely resembles Hadoop's 
configuration
 +files.
 +
 +\subsection{Edit conf/accumulo-env.sh}
 +
 +Accumulo needs to know where to find the software it depends on. Edit 
accumulo-env.sh 
 +and specify the following:
 +
 +\begin{enumerate}
 +\item{Enter the location of the installation directory of Accumulo for 
\texttt{\$ACCUMULO\_HOME}}
 +\item{Enter your system's Java home for \texttt{\$JAVA\_HOME}}
 +\item{Enter the location of Hadoop for \texttt{\$HADOOP\_PREFIX}}
 +\item{Choose a location for Accumulo logs and enter it f

[4/8] ACCUMULO-2010 Remove Closeable from interfaces

[ctubbsii]

http://git-wip-us.apache.org/repos/asf/accumulo/blob/335f693a/src/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java
--
diff --git 
a/src/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java
 
b/src/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java
index 491b8ec..2caf7cd 100644
--- 
a/src/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java
+++ 
b/src/server/src/main/java/org/apache/accumulo/server/test/continuous/UndefinedAnalyzer.java
@@ -49,96 +49,100 @@ import org.apache.hadoop.io.Text;
  * 
  */
 public class UndefinedAnalyzer {
-  
+
   static class UndefinedNode {
-
+
 public UndefinedNode(String undef2, String ref2) {
   this.undef = undef2;
   this.ref = ref2;
 }
-
+
 String undef;
 String ref;
   }
-  
+
   static class IngestInfo {
-
+
 Map> flushes = new 
HashMap>();
-
+
 public IngestInfo(String logDir) throws Exception {
   File dir = new File(logDir);
   File[] ingestLogs = dir.listFiles(new FilenameFilter() {
+@Override
 public boolean accept(java.io.File dir, String name) {
   return name.endsWith("ingest.out");
 }
   });
-  
+
   for (File log : ingestLogs) {
 parseLog(log);
   }
 }
-
+
 private void parseLog(File log) throws Exception {
   BufferedReader reader = new BufferedReader(new FileReader(log));
-  
-  String line;
-  TreeMap tm = null;
-  
-  while ((line = reader.readLine()) != null) {
-if (!line.startsWith("UUID"))
-  continue;
-String[] tokens = line.split("\\s");
-String time = tokens[1];
-String uuid = tokens[2];
-
-if (flushes.containsKey(uuid)) {
-  System.err.println("WARN Duplicate uuid " + log);
+  try {
+String line;
+TreeMap tm = null;
+
+while ((line = reader.readLine()) != null) {
+  if (!line.startsWith("UUID"))
+continue;
+  String[] tokens = line.split("\\s");
+  String time = tokens[1];
+  String uuid = tokens[2];
+
+  if (flushes.containsKey(uuid)) {
+System.err.println("WARN Duplicate uuid " + log);
+return;
+  }
+
+  tm = new TreeMap(Collections.reverseOrder());
+  tm.put(0l, Long.parseLong(time));
+  flushes.put(uuid, tm);
+  break;
+
+}
+
+if (tm == null) {
+  System.err.println("WARN Bad ingest log " + log);
   return;
 }
-
-tm = new TreeMap(Collections.reverseOrder());
-tm.put(0l, Long.parseLong(time));
-flushes.put(uuid, tm);
-break;
-
-  }
-  
-  if (tm == null) {
-System.err.println("WARN Bad ingest log " + log);
-return;
-  }
-  
-  while ((line = reader.readLine()) != null) {
-String[] tokens = line.split("\\s");
-
-if (!tokens[0].equals("FLUSH"))
-  continue;
-
-String time = tokens[1];
-String count = tokens[4];
-
-tm.put(Long.parseLong(count), Long.parseLong(time));
+
+while ((line = reader.readLine()) != null) {
+  String[] tokens = line.split("\\s");
+
+  if (!tokens[0].equals("FLUSH"))
+continue;
+
+  String time = tokens[1];
+  String count = tokens[4];
+
+  tm.put(Long.parseLong(count), Long.parseLong(time));
+}
+  } finally {
+if (reader != null)
+  reader.close();
   }
-  
 }
-
+
 Iterator getTimes(String uuid, long count) {
   TreeMap tm = flushes.get(uuid);
-  
+
   if (tm == null)
 return null;
-  
+
   return tm.tailMap(count).values().iterator();
 }
   }
-  
+
   static class TabletAssignment {
 String tablet;
 String endRow;
 String prevEndRow;
 String server;
 long time;
-
+
 TabletAssignment(String tablet, String er, String per, String server, long 
time) {
   this.tablet = new String(tablet);
   this.endRow = new String(er);
@@ -146,133 +150,139 @@ public class UndefinedAnalyzer {
   this.server = new String(server);
   this.time = time;
 }
-
+
 public boolean contains(String row) {
   return prevEndRow.compareTo(row) < 0 && endRow.compareTo(row) >= 0;
 }
   }
-  
+
   static class TabletHistory {
-
+
 List assignments = new ArrayList();
-
+
 TabletHistory(String tableId, String acuLogDir) throws Exception {
   File dir = new File(acuLogDir);
   File[] masterLogs = dir.listFiles(new FilenameFilter() {
+@Override
 public boolean accept(java.io.File dir, String name) {
   return name.matches("master.*debug.log.*");
 }
   })

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

[ctubbsii]

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/7fc8d834
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/7fc8d834
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/7fc8d834

Branch: refs/heads/master
Commit: 7fc8d83444364ea30f72f663b9015f6e1603c756
Parents: f6a3f90 c84acfc
Author: Christopher Tubbs 
Authored: Fri Dec 13 18:00:45 2013 -0500
Committer: Christopher Tubbs 
Committed: Fri Dec 13 18:00:45 2013 -0500

--
 .../apache/accumulo/core/client/Instance.java   |   6 +-
 .../apache/accumulo/core/data/RangeTest.java| 337 ++-
 .../accumulo/fate/zookeeper/ZooCache.java   | 110 +++---
 .../accumulo/fate/zookeeper/ZooReader.java  |  39 ++-
 4 files changed, 244 insertions(+), 248 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7fc8d834/core/src/main/java/org/apache/accumulo/core/client/Instance.java
--

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

[ctubbsii]

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/1ee57286
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/1ee57286
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/1ee57286

Branch: refs/heads/master
Commit: 1ee57286f49936f3dcd6d45b18fed574f49d5496
Parents: 3dc5630 7fc8d83
Author: Christopher Tubbs 
Authored: Fri Dec 13 18:01:22 2013 -0500
Committer: Christopher Tubbs 
Committed: Fri Dec 13 18:01:22 2013 -0500

--
 .../apache/accumulo/core/client/Instance.java   |   6 +-
 .../apache/accumulo/core/data/RangeTest.java| 337 ++-
 .../chapters/administration.tex |   8 +-
 .../accumulo/fate/zookeeper/ZooCache.java   | 110 +++---
 .../accumulo/fate/zookeeper/ZooReader.java  |  39 ++-
 5 files changed, 248 insertions(+), 252 deletions(-)
--

[1/8] git commit: ACCUMULO-2011 Escape unescaped underscores to fix LaTeX

[ctubbsii]

Updated Branches:
  refs/heads/master 3dc5630d8 -> 1ee57286f


ACCUMULO-2011 Escape unescaped underscores to fix LaTeX


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

Branch: refs/heads/master
Commit: 07a0433bd73295d733bc3430db64de86b4088ea3
Parents: 72106a6
Author: Christopher Tubbs 
Authored: Fri Dec 13 16:05:46 2013 -0500
Committer: Christopher Tubbs 
Committed: Fri Dec 13 16:05:46 2013 -0500

--
 docs/src/user_manual/chapters/administration.tex | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/07a0433b/docs/src/user_manual/chapters/administration.tex
--
diff --git a/docs/src/user_manual/chapters/administration.tex 
b/docs/src/user_manual/chapters/administration.tex
index d0533d9..4723481 100644
--- a/docs/src/user_manual/chapters/administration.tex
+++ b/docs/src/user_manual/chapters/administration.tex
@@ -186,14 +186,14 @@ take some time for particular configurations.
 
 \subsection{Adding a Node}
 
-Update your \texttt{\$ACCUMULO_HOME/conf/slaves} (or 
\texttt{\$ACCUMULO_CONF_DIR/slaves}) file to account for the addition.
+Update your \texttt{\$ACCUMULO\_HOME/conf/slaves} (or 
\texttt{\$ACCUMULO\_CONF\_DIR/slaves}) file to account for the addition.
 
 \begin{verbatim}
 $ACCUMULO_HOME/bin/accumulo admin start  { ...}
 \end{verbatim}
 
 Alternatively, you can ssh to each of the hosts you want to add and run 
-\texttt{\$ACCUMULO_HOME/bin/start-here.sh}.
+\texttt{\$ACCUMULO\_HOME/bin/start-here.sh}.
 
 Make sure the host in question has the new configuration, or else the tablet 
 server won't start; at a minimum this needs to be on the host(s) being added, 
@@ -209,9 +209,9 @@ $ACCUMULO_HOME/bin/accumulo admin stop  { 
...}
 \end{verbatim}
 
 Alternatively, you can ssh to each of the hosts you want to remove and run 
-\texttt{\$ACCUMULO_HOME/bin/stop-here.sh}.
+\texttt{\$ACCUMULO\_HOME/bin/stop-here.sh}.
 
-Be sure to update your \texttt{\$ACCUMULO_HOME/conf/slaves} (or 
\texttt{\$ACCUMULO_CONF_DIR/slaves}) file to 
+Be sure to update your \texttt{\$ACCUMUL\_HOME/conf/slaves} (or 
\texttt{\$ACCUMULO\_CONF\_DIR/slaves}) file to 
 account for the removal of these hosts. Bear in mind that the monitor will not 
re-read the 
 slaves file automatically, so it will report the decomissioned servers as 
down; it's 
 recommended that you restart the monitor so that the node list is up to date.

git commit: ACCUMULO-2093 Exclude incomplete tables from listing.

[ctubbsii]

Updated Branches:
  refs/heads/1.6.0-SNAPSHOT db746960f -> 3cddee9ef


ACCUMULO-2093 Exclude incomplete tables from listing.

  Specifically, tables who can't resolve with a fully-qualified table
  name are excluded from a table listing. This ensures that tables being
  created and/or deleted aren't shown in an inconsistent state.


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 3cddee9ef10049219b551d578bbfa9f779697993
Parents: db74696
Author: Christopher Tubbs 
Authored: Tue Dec 24 16:18:15 2013 -0500
Committer: Christopher Tubbs 
Committed: Tue Dec 24 16:18:15 2013 -0500

--
 .../java/org/apache/accumulo/core/client/impl/Tables.java | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3cddee9e/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java 
b/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
index 7cf5ccc..f3f46d5 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
@@ -53,9 +53,7 @@ public class Tables {
 ZooCache zc = getZooCache(instance);
 
 List tableIds = zc.getChildren(ZooUtil.getRoot(instance) + 
Constants.ZTABLES);
-
 TreeMap tableMap = new TreeMap();
-
 Map namespaceIdToNameMap = new HashMap();
 
 for (String tableId : tableIds) {
@@ -63,7 +61,9 @@ public class Tables {
   byte[] nId = zc.get(ZooUtil.getRoot(instance) + Constants.ZTABLES + "/" 
+ tableId + Constants.ZTABLE_NAMESPACE);
   String namespaceName = Constants.DEFAULT_NAMESPACE;
   // create fully qualified table name
-  if (nId != null) {
+  if (nId == null) {
+namespaceName = null;
+  } else if (nId != null) {
 String namespaceId = new String(nId, Constants.UTF8);
 if (!namespaceId.equals(Constants.DEFAULT_NAMESPACE_ID)) {
   try {
@@ -73,12 +73,12 @@ public class Tables {
   namespaceIdToNameMap.put(namespaceId, namespaceName);
 }
   } catch (NamespaceNotFoundException e) {
-log.error("Table (" + tableId + ") contains reference to namespace 
(" + namespaceId + ") that doesn't exist");
+log.error("Table (" + tableId + ") contains reference to namespace 
(" + namespaceId + ") that doesn't exist", e);
 continue;
   }
 }
   }
-  if (tableName != null) {
+  if (tableName != null && namespaceName != null) {
 String tableNameStr = qualified(new String(tableName, Constants.UTF8), 
namespaceName);
 if (nameAsKey)
   tableMap.put(tableNameStr, tableId);

git commit: ACCUMULO-2094 Consolidate namespaceId addition with creating table

[ctubbsii]

Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 3cddee9ef -> 86f5927f1


ACCUMULO-2094 Consolidate namespaceId addition with creating table

  Also clean up related initialize and upgrade code, and consolidate
  duplicate code.


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 86f5927f1177730ab09e9e9c1df055639adadee3
Parents: 3cddee9
Author: Christopher Tubbs 
Authored: Tue Dec 24 18:25:08 2013 -0500
Committer: Christopher Tubbs 
Committed: Tue Dec 24 18:25:08 2013 -0500

--
 .../accumulo/core/client/impl/Namespaces.java   |  6 ++
 .../apache/accumulo/server/init/Initialize.java | 24 ++---
 .../accumulo/server/tables/TableManager.java| 95 +---
 .../java/org/apache/accumulo/master/Master.java | 62 +
 .../master/tableOps/CreateNamespace.java|  2 +-
 .../accumulo/master/tableOps/CreateTable.java   |  4 +-
 .../accumulo/master/tableOps/ImportTable.java   |  4 +-
 7 files changed, 58 insertions(+), 139 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/86f5927f/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java 
b/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
index 2480f68..64a6441 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
@@ -58,6 +58,12 @@ public class Namespaces {
 return namespaceMap;
   }
 
+  public static boolean exists(Instance instance, String namespaceId) {
+ZooCache zc = getZooCache(instance);
+List namespaceIds = zc.getChildren(ZooUtil.getRoot(instance) + 
Constants.ZNAMESPACES);
+return namespaceIds.contains(namespaceId);
+  }
+
   public static String getNamespaceId(Instance instance, String namespace) 
throws NamespaceNotFoundException {
 String id = getNameToIdMap(instance).get(namespace);
 if (id == null)

http://git-wip-us.apache.org/repos/asf/accumulo/blob/86f5927f/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
--
diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java 
b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
index a120dbd..7f5e44e 100644
--- a/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
+++ b/server/base/src/main/java/org/apache/accumulo/server/init/Initialize.java
@@ -394,8 +394,11 @@ public class Initialize {
 String zkInstanceRoot = Constants.ZROOT + "/" + uuid;
 zoo.putPersistentData(zkInstanceRoot, new byte[0], NodeExistsPolicy.FAIL);
 zoo.putPersistentData(zkInstanceRoot + Constants.ZTABLES, 
Constants.ZTABLES_INITIAL_ID, NodeExistsPolicy.FAIL);
-TableManager.prepareNewTableState(uuid, RootTable.ID, RootTable.NAME, 
TableState.ONLINE, NodeExistsPolicy.FAIL);
-TableManager.prepareNewTableState(uuid, MetadataTable.ID, 
MetadataTable.NAME, TableState.ONLINE, NodeExistsPolicy.FAIL);
+zoo.putPersistentData(zkInstanceRoot + Constants.ZNAMESPACES, new byte[0], 
NodeExistsPolicy.FAIL);
+TableManager.prepareNewNamespaceState(uuid, 
Constants.DEFAULT_NAMESPACE_ID, Constants.DEFAULT_NAMESPACE, 
NodeExistsPolicy.FAIL);
+TableManager.prepareNewNamespaceState(uuid, 
Constants.ACCUMULO_NAMESPACE_ID, Constants.ACCUMULO_NAMESPACE, 
NodeExistsPolicy.FAIL);
+TableManager.prepareNewTableState(uuid, RootTable.ID, 
Constants.ACCUMULO_NAMESPACE_ID, RootTable.NAME, TableState.ONLINE, 
NodeExistsPolicy.FAIL);
+TableManager.prepareNewTableState(uuid, MetadataTable.ID, 
Constants.ACCUMULO_NAMESPACE_ID, MetadataTable.NAME, TableState.ONLINE, 
NodeExistsPolicy.FAIL);
 zoo.putPersistentData(zkInstanceRoot + Constants.ZTSERVERS, new byte[0], 
NodeExistsPolicy.FAIL);
 zoo.putPersistentData(zkInstanceRoot + Constants.ZPROBLEMS, new byte[0], 
NodeExistsPolicy.FAIL);
 zoo.putPersistentData(zkInstanceRoot + RootTable.ZROOT_TABLET, new 
byte[0], NodeExistsPolicy.FAIL);
@@ -412,23 +415,6 @@ public class Initialize {
 zoo.putPersistentData(zkInstanceRoot + Constants.ZHDFS_RESERVATIONS, new 
byte[0], NodeExistsPolicy.FAIL);
 zoo.putPersistentData(zkInstanceRoot + Constants.ZNEXT_FILE, new byte[] 
{'0'}, NodeExistsPolicy.FAIL);
 zoo.putPersistentData(zkInstanceRoot + Constants.ZRECOVERY, new byte[] 
{'0'}, NodeExistsPolicy.FAIL);
-zoo.putPersistentData(zkInstanceRoot + Constant

git commit: ACCUMULO-2108 set dependency management version for submodules via maven project version.

[ctubbsii]

Updated Branches:
  refs/heads/1.4.5-SNAPSHOT 79266cba1 -> fc7a0a336


ACCUMULO-2108 set dependency management version for submodules via maven 
project version.

Signed-off-by: Christopher Tubbs 


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

Branch: refs/heads/1.4.5-SNAPSHOT
Commit: fc7a0a336a8e2623fb7eca1f01ab8a63cdc24967
Parents: 79266cb
Author: Sean Busbey 
Authored: Fri Dec 27 16:51:32 2013 -0600
Committer: Christopher Tubbs 
Committed: Fri Dec 27 17:59:30 2013 -0500

--
 pom.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/fc7a0a33/pom.xml
--
diff --git a/pom.xml b/pom.xml
index fc0222e..20916c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -778,27 +778,27 @@
   
 org.apache.accumulo
 cloudtrace
-1.4.5-SNAPSHOT
+${project.version}
   
   
 org.apache.accumulo
 accumulo-start
-1.4.5-SNAPSHOT
+${project.version}
   
   
 org.apache.accumulo
 accumulo-core
-1.4.5-SNAPSHOT
+${project.version}
   
   
 org.apache.accumulo
 accumulo-server
-1.4.5-SNAPSHOT
+${project.version}
   
   
 org.apache.accumulo
 accumulo-minicluster
-1.4.5-SNAPSHOT
+${project.version}
   
 
   

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

[ctubbsii]

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/0c1ea722
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0c1ea722
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0c1ea722

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 0c1ea722afe36c2acd22bf517666e320d6d7284b
Parents: b315fe2 fc7a0a3
Author: Christopher Tubbs 
Authored: Fri Dec 27 18:02:10 2013 -0500
Committer: Christopher Tubbs 
Committed: Fri Dec 27 18:02:10 2013 -0500

--

--

[1/2] git commit: ACCUMULO-2108 set dependency management version for submodules via maven project version.

[ctubbsii]

Updated Branches:
  refs/heads/1.5.1-SNAPSHOT b315fe2d4 -> 0c1ea722a


ACCUMULO-2108 set dependency management version for submodules via maven 
project version.

Signed-off-by: Christopher Tubbs 


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

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: fc7a0a336a8e2623fb7eca1f01ab8a63cdc24967
Parents: 79266cb
Author: Sean Busbey 
Authored: Fri Dec 27 16:51:32 2013 -0600
Committer: Christopher Tubbs 
Committed: Fri Dec 27 17:59:30 2013 -0500

--
 pom.xml | 10 +-
 1 file changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/fc7a0a33/pom.xml
--
diff --git a/pom.xml b/pom.xml
index fc0222e..20916c7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -778,27 +778,27 @@
   
 org.apache.accumulo
 cloudtrace
-1.4.5-SNAPSHOT
+${project.version}
   
   
 org.apache.accumulo
 accumulo-start
-1.4.5-SNAPSHOT
+${project.version}
   
   
 org.apache.accumulo
 accumulo-core
-1.4.5-SNAPSHOT
+${project.version}
   
   
 org.apache.accumulo
 accumulo-server
-1.4.5-SNAPSHOT
+${project.version}
   
   
 org.apache.accumulo
 accumulo-minicluster
-1.4.5-SNAPSHOT
+${project.version}
   
 
   

[2/7] ACCUMULO-1965 Fix exception handling for namespaces

[ctubbsii]

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f35e3f47/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
--
diff --git 
a/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
 
b/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
new file mode 100644
index 000..dc654ae
--- /dev/null
+++ 
b/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
@@ -0,0 +1,463 @@
+/*
+ * 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.master;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map.Entry;
+import java.util.Set;
+
+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.IsolatedScanner;
+import org.apache.accumulo.core.client.RowIterator;
+import org.apache.accumulo.core.client.Scanner;
+import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.impl.Tables;
+import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode;
+import org.apache.accumulo.core.client.impl.thrift.TableOperation;
+import org.apache.accumulo.core.client.impl.thrift.TableOperationExceptionType;
+import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException;
+import 
org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException;
+import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.KeyExtent;
+import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.data.thrift.TKeyExtent;
+import org.apache.accumulo.core.master.thrift.MasterClientService;
+import org.apache.accumulo.core.master.thrift.MasterGoalState;
+import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
+import org.apache.accumulo.core.master.thrift.MasterState;
+import org.apache.accumulo.core.master.thrift.TableInfo;
+import org.apache.accumulo.core.master.thrift.TabletLoadState;
+import org.apache.accumulo.core.master.thrift.TabletServerStatus;
+import org.apache.accumulo.core.master.thrift.TabletSplit;
+import org.apache.accumulo.core.metadata.MetadataTable;
+import org.apache.accumulo.core.metadata.RootTable;
+import org.apache.accumulo.core.metadata.schema.MetadataSchema;
+import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
+import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.LogColumnFamily;
+import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.security.thrift.TCredentials;
+import org.apache.accumulo.core.util.ByteBufferUtil;
+import org.apache.accumulo.core.util.UtilWaitThread;
+import org.apache.accumulo.core.zookeeper.ZooUtil;
+import org.apache.accumulo.fate.zookeeper.IZooReaderWriter;
+import org.apache.accumulo.fate.zookeeper.IZooReaderWriter.Mutator;
+import org.apache.accumulo.master.tableOps.TraceRepo;
+import org.apache.accumulo.master.tserverOps.ShutdownTServer;
+import org.apache.accumulo.server.client.ClientServiceHandler;
+import org.apache.accumulo.server.conf.ServerConfiguration;
+import org.apache.accumulo.server.master.LiveTServerSet.TServerConnection;
+import org.apache.accumulo.server.master.balancer.DefaultLoadBalancer;
+import org.apache.accumulo.server.master.balancer.TabletBalancer;
+import org.apache.accumulo.server.master.state.DeadServerList;
+import org.apache.accumulo.server.master.state.TServerInstance;
+import org.apache.accumulo.server.master.state.TabletServerState;
+import org.apache.accumulo.server.util.DefaultMap;
+import org.apache.accumulo.server.util.NamespacePropUtil;
+import org.apache.accumulo.server.util.SystemPropUtil;
+import org.apache.accumulo.server.util.TableInfoUtil;
+import org.apache.accumulo.server.util.TablePropUtil;
+import org.apache.accumulo.server.util.Table

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

[ctubbsii]

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/a267d349
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a267d349
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a267d349

Branch: refs/heads/master
Commit: a267d349dc6ad46b9da4ae4cfa010d5a279166c9
Parents: 2c37c45 f35e3f4
Author: Christopher Tubbs 
Authored: Fri Dec 27 20:07:06 2013 -0500
Committer: Christopher Tubbs 
Committed: Fri Dec 27 20:07:06 2013 -0500

--
 .../org/apache/accumulo/core/Constants.java |4 -
 .../core/client/TableNotFoundException.java |   21 +-
 .../core/client/admin/NamespaceOperations.java  |2 +-
 .../client/admin/NamespaceOperationsImpl.java   |  193 +-
 .../client/admin/TableOperationsHelper.java |   35 +-
 .../core/client/admin/TableOperationsImpl.java  |  256 +-
 .../core/client/impl/ConnectorImpl.java |   55 +-
 .../accumulo/core/client/impl/MasterClient.java |   76 +-
 .../accumulo/core/client/impl/Namespaces.java   |   33 +-
 .../accumulo/core/client/impl/Tables.java   |   32 +-
 .../thrift/TableOperationExceptionType.java |   11 +-
 .../accumulo/core/client/mock/MockAccumulo.java |6 +-
 .../core/client/mock/MockTableOperations.java   |   12 +-
 .../core/master/thrift/FateOperation.java   |  103 +
 .../core/master/thrift/FateService.java | 5017 +
 .../core/master/thrift/MasterClientService.java | 9946 +-
 .../core/master/thrift/TableOperation.java  |   94 -
 .../accumulo/core/metadata/MetadataTable.java   |4 +-
 .../accumulo/core/metadata/RootTable.java   |4 +-
 .../util/shell/commands/NamespacesCommand.java  |4 +-
 core/src/main/thrift/client.thrift  |  203 +-
 core/src/main/thrift/master.thrift  |  222 +-
 .../core/client/mock/MockNamespacesTest.java|5 +-
 .../client/mock/MockTableOperationsTest.java|   49 +-
 .../server/client/ClientServiceHandler.java |   37 +-
 .../server/conf/NamespaceConfiguration.java |5 +-
 .../apache/accumulo/server/init/Initialize.java |9 +-
 .../accumulo/server/master/LiveTServerSet.java  |  114 +-
 .../security/AuditedSecurityOperation.java  |8 +-
 .../server/security/SecurityOperation.java  |6 +-
 .../server/security/handler/ZKPermHandler.java  |6 +-
 .../accumulo/master/FateServiceHandler.java |  412 +
 .../java/org/apache/accumulo/master/Master.java |  852 +-
 .../master/MasterClientServiceHandler.java  |  463 +
 .../accumulo/master/tableOps/CloneTable.java|   10 +-
 .../master/tableOps/RenameNamespace.java|3 +-
 .../accumulo/master/tableOps/RenameTable.java   |3 +-
 .../apache/accumulo/master/tableOps/Utils.java  |4 +-
 .../test/randomwalk/concurrent/Config.java  |4 +-
 .../org/apache/accumulo/test/NamespacesIT.java  | 1202 ++-
 .../org/apache/accumulo/test/ShellServerIT.java |6 +-
 41 files changed, 7683 insertions(+), 11848 deletions(-)
--

[2/8] ACCUMULO-1965 Fix exception handling for namespaces

[ctubbsii]

http://git-wip-us.apache.org/repos/asf/accumulo/blob/f35e3f47/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
--
diff --git 
a/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
 
b/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
new file mode 100644
index 000..dc654ae
--- /dev/null
+++ 
b/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
@@ -0,0 +1,463 @@
+/*
+ * 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.master;
+
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Map.Entry;
+import java.util.Set;
+
+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.IsolatedScanner;
+import org.apache.accumulo.core.client.RowIterator;
+import org.apache.accumulo.core.client.Scanner;
+import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.accumulo.core.client.impl.Tables;
+import org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode;
+import org.apache.accumulo.core.client.impl.thrift.TableOperation;
+import org.apache.accumulo.core.client.impl.thrift.TableOperationExceptionType;
+import org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException;
+import 
org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException;
+import org.apache.accumulo.core.conf.Property;
+import org.apache.accumulo.core.data.Key;
+import org.apache.accumulo.core.data.KeyExtent;
+import org.apache.accumulo.core.data.Value;
+import org.apache.accumulo.core.data.thrift.TKeyExtent;
+import org.apache.accumulo.core.master.thrift.MasterClientService;
+import org.apache.accumulo.core.master.thrift.MasterGoalState;
+import org.apache.accumulo.core.master.thrift.MasterMonitorInfo;
+import org.apache.accumulo.core.master.thrift.MasterState;
+import org.apache.accumulo.core.master.thrift.TableInfo;
+import org.apache.accumulo.core.master.thrift.TabletLoadState;
+import org.apache.accumulo.core.master.thrift.TabletServerStatus;
+import org.apache.accumulo.core.master.thrift.TabletSplit;
+import org.apache.accumulo.core.metadata.MetadataTable;
+import org.apache.accumulo.core.metadata.RootTable;
+import org.apache.accumulo.core.metadata.schema.MetadataSchema;
+import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
+import 
org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection.LogColumnFamily;
+import org.apache.accumulo.core.security.Authorizations;
+import org.apache.accumulo.core.security.thrift.TCredentials;
+import org.apache.accumulo.core.util.ByteBufferUtil;
+import org.apache.accumulo.core.util.UtilWaitThread;
+import org.apache.accumulo.core.zookeeper.ZooUtil;
+import org.apache.accumulo.fate.zookeeper.IZooReaderWriter;
+import org.apache.accumulo.fate.zookeeper.IZooReaderWriter.Mutator;
+import org.apache.accumulo.master.tableOps.TraceRepo;
+import org.apache.accumulo.master.tserverOps.ShutdownTServer;
+import org.apache.accumulo.server.client.ClientServiceHandler;
+import org.apache.accumulo.server.conf.ServerConfiguration;
+import org.apache.accumulo.server.master.LiveTServerSet.TServerConnection;
+import org.apache.accumulo.server.master.balancer.DefaultLoadBalancer;
+import org.apache.accumulo.server.master.balancer.TabletBalancer;
+import org.apache.accumulo.server.master.state.DeadServerList;
+import org.apache.accumulo.server.master.state.TServerInstance;
+import org.apache.accumulo.server.master.state.TabletServerState;
+import org.apache.accumulo.server.util.DefaultMap;
+import org.apache.accumulo.server.util.NamespacePropUtil;
+import org.apache.accumulo.server.util.SystemPropUtil;
+import org.apache.accumulo.server.util.TableInfoUtil;
+import org.apache.accumulo.server.util.TablePropUtil;
+import org.apache.accumulo.server.util.Table

git commit: ACCUMULO-2030 Clean up javadoc

[ctubbsii]

Updated Branches:
  refs/heads/1.6.0-SNAPSHOT cbbcaac88 -> 063c88d7e


ACCUMULO-2030 Clean up javadoc

  Fix ambiguous javadoc reference by removing it
  Remove incorrect exception declaration
  Remove unused import warning


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 063c88d7e28573888ebb56773071ba344920a1dd
Parents: cbbcaac
Author: Christopher Tubbs 
Authored: Mon Dec 30 13:01:00 2013 -0500
Committer: Christopher Tubbs 
Committed: Mon Dec 30 13:01:00 2013 -0500

--
 .../accumulo/core/security/Authorizations.java  | 137 ++-
 .../accumulo/core/security/Credentials.java |  48 ---
 .../apache/accumulo/test/randomwalk/State.java  |  59 
 3 files changed, 127 insertions(+), 117 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/063c88d7/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java 
b/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
index 67349d4..6047352 100644
--- a/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
+++ b/core/src/main/java/org/apache/accumulo/core/security/Authorizations.java
@@ -38,72 +38,74 @@ import org.apache.commons.codec.binary.Base64;
  * A collection of authorization strings.
  */
 public class Authorizations implements Iterable, Serializable, 
AuthorizationContainer {
-  
+
   private static final long serialVersionUID = 1L;
-  
+
   private Set auths = new HashSet();
-  private List authsList = new ArrayList();  // sorted order
-  
+  private List authsList = new ArrayList(); // sorted order
+
   /**
* An empty set of authorizations.
*/
   public static final Authorizations EMPTY = new Authorizations();
-  
+
   private static final boolean[] validAuthChars = new boolean[256];
-  
+
   /**
* A special header string used when serializing instances of this class.
-   *
+   * 
* @see #serialize()
*/
   public static final String HEADER = "!AUTH1:";
-  
+
   static {
 for (int i = 0; i < 256; i++) {
   validAuthChars[i] = false;
 }
-
+
 for (int i = 'a'; i <= 'z'; i++) {
   validAuthChars[i] = true;
 }
-
+
 for (int i = 'A'; i <= 'Z'; i++) {
   validAuthChars[i] = true;
 }
-
+
 for (int i = '0'; i <= '9'; i++) {
   validAuthChars[i] = true;
 }
-
+
 validAuthChars['_'] = true;
 validAuthChars['-'] = true;
 validAuthChars[':'] = true;
 validAuthChars['.'] = true;
 validAuthChars['/'] = true;
   }
-  
+
   static final boolean isValidAuthChar(byte b) {
 return validAuthChars[0xff & b];
   }
-  
+
   private void checkAuths() {
 Set sortedAuths = new TreeSet(auths);
-
+
 for (ByteSequence bs : sortedAuths) {
   if (bs.length() == 0) {
 throw new IllegalArgumentException("Empty authorization");
   }
-  
+
   authsList.add(bs.toArray());
 }
   }
-  
+
   /**
-   * Constructs an authorization object from a collection of string 
authorizations that have each already been encoded as UTF-8 bytes. Warning: 
This method
-   * does not verify that each encoded string is valid UTF-8.
+   * Constructs an authorization object from a collection of string 
authorizations that have each already been encoded as UTF-8 bytes. Warning: 
This method does
+   * not verify that each encoded string is valid UTF-8.
* 
-   * @param authorizations collection of authorizations, as strings encoded in 
UTF-8
-   * @throws IllegalArgumentException if authorizations is null
+   * @param authorizations
+   *  collection of authorizations, as strings encoded in UTF-8
+   * @throws IllegalArgumentException
+   *   if authorizations is null
* @see #Authorizations(String...)
*/
   public Authorizations(Collection authorizations) {
@@ -112,13 +114,15 @@ public class Authorizations implements Iterable, 
Serializable, Authoriza
   auths.add(new ArrayByteSequence(auth));
 checkAuths();
   }
-  
+
   /**
* Constructs an authorization object from a list of string authorizations 
that have each already been encoded as UTF-8 bytes. Warning: This method does 
not
* verify that each encoded string is valid UTF-8.
* 
-   * @param authorizations list of authorizations, as strings encoded in UTF-8 
and placed in buffers
-   * @throws IllegalArgumentException if authorizations is null
+   * @param authorizations
+   *  list of authorizations, as strings encoded i

git commit: ACCUMULO-2110 cannot remove a FileRef with a Path

[ctubbsii]

Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 379881e69 -> 16ccbf5e1


ACCUMULO-2110 cannot remove a FileRef with a Path


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 16ccbf5e16467729b558cf08a379770cba10f5ab
Parents: 379881e
Author: Eric Newton 
Authored: Tue Dec 31 14:26:29 2013 -0500
Committer: Christopher Tubbs 
Committed: Tue Dec 31 15:22:11 2013 -0500

--
 .../src/main/java/org/apache/accumulo/tserver/Tablet.java| 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/16ccbf5e/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
--
diff --git 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
index 3c62a86..c4a2770 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
@@ -704,7 +704,7 @@ public class Tablet {
 List files = MetadataTableUtil.getBulkFilesLoaded(conn, 
extent, tid);
 
 for (FileRef file : files)
-  if (paths.keySet().remove(file.path()))
+  if (paths.keySet().remove(file))
 log.debug("Ignoring request to re-import a file already imported: 
" + extent + ": " + file);
 
 if (paths.size() > 0) {
@@ -3565,7 +3565,7 @@ public class Tablet {
   String time = tabletTime.getMetadataValue();
 
   // it is possible that some of the bulk loading flags will be deleted 
after being read below because the bulk load
-  // finishes therefore split could propogate load flags for a 
finished bulk load... there is a special iterator
+  // finishes therefore split could propagate load flags for a 
finished bulk load... there is a special iterator
   // on the metadata table to clean up this type of garbage
   Map bulkLoadedFiles = 
MetadataTableUtil.getBulkFilesLoaded(SystemCredentials.get(), extent);
 

git commit: ACCUMULO-2116 Examples functional test should run from outside of ACCUMULO_HOME.

[ctubbsii]

Updated Branches:
  refs/heads/1.4.5-SNAPSHOT d605ebb52 -> 1ad1151ab


ACCUMULO-2116 Examples functional test should run from outside of ACCUMULO_HOME.

Signed-off-by: Christopher Tubbs 


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

Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 1ad1151ab0ae2c57ff998cf563cbe6a019994724
Parents: d605ebb
Author: Sean Busbey 
Authored: Tue Dec 31 15:30:48 2013 -0600
Committer: Christopher Tubbs 
Committed: Tue Dec 31 17:28:43 2013 -0500

--
 test/system/auto/simple/examples.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1ad1151a/test/system/auto/simple/examples.py
--
diff --git a/test/system/auto/simple/examples.py 
b/test/system/auto/simple/examples.py
index bed321f..f05e58f 100755
--- a/test/system/auto/simple/examples.py
+++ b/test/system/auto/simple/examples.py
@@ -124,8 +124,8 @@ class Examples(TestUtilsMixin, unittest.TestCase):
 self.comment("Creating a sharded index of the accumulo java files")
 self.ashell('createtable shard\ncreatetable doc2term\nquit\n')
 self.execute('/bin/sh', '-c',
- 'find src -name "*.java" | xargs ./bin/accumulo 
org.apache.accumulo.examples.simple.shard.Index %s %s shard %s %s 30' %
- (INSTANCE_NAME, ZOOKEEPERS, ROOT, ROOT_PASSWORD))
+ 'find %s/src -name "*.java" | xargs %s/bin/accumulo 
org.apache.accumulo.examples.simple.shard.Index %s %s shard %s %s 30' %
+ (ACCUMULO_HOME, ACCUMULO_HOME, INSTANCE_NAME, ZOOKEEPERS, 
ROOT, ROOT_PASSWORD))
 self.execute(self.accumulo_sh(), 
'org.apache.accumulo.examples.simple.shard.Query',
  INSTANCE_NAME, ZOOKEEPERS, 'shard', ROOT, ROOT_PASSWORD,
  'foo', 'bar')

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

[ctubbsii]

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Conflicts:
test/system/auto/simple/examples.py


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

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: d63cf6fe57ccc788e4b3a4ce3b187f0b252784e6
Parents: 89c9962 1ad1151
Author: Christopher Tubbs 
Authored: Tue Dec 31 17:33:35 2013 -0500
Committer: Christopher Tubbs 
Committed: Tue Dec 31 17:33:35 2013 -0500

--
 test/system/auto/simple/examples.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d63cf6fe/test/system/auto/simple/examples.py
--
diff --cc test/system/auto/simple/examples.py
index 3ba425e,f05e58f..ba05174
--- a/test/system/auto/simple/examples.py
+++ b/test/system/auto/simple/examples.py
@@@ -128,10 -124,10 +128,10 @@@ class Examples(TestUtilsMixin, unittest
  self.comment("Creating a sharded index of the accumulo java files")
  self.ashell('createtable shard\ncreatetable doc2term\nquit\n')
  self.execute('/bin/sh', '-c',
-  'find server -name "*.java" | xargs ./bin/accumulo 
org.apache.accumulo.examples.simple.shard.Index -i %s -z %s -t shard -u %s -p 
%s --partitions 30' %
-  (INSTANCE_NAME, ZOOKEEPERS, ROOT, ROOT_PASSWORD))
 - 'find %s/src -name "*.java" | xargs %s/bin/accumulo 
org.apache.accumulo.examples.simple.shard.Index %s %s shard %s %s 30' %
++ 'find %s/server -name "*.java" | xargs %s/bin/accumulo 
org.apache.accumulo.examples.simple.shard.Index -i %s -z %s -t shard -u %s -p 
%s --partitions 30' %
+  (ACCUMULO_HOME, ACCUMULO_HOME, INSTANCE_NAME, 
ZOOKEEPERS, ROOT, ROOT_PASSWORD))
  self.execute(self.accumulo_sh(), 
'org.apache.accumulo.examples.simple.shard.Query',
 - INSTANCE_NAME, ZOOKEEPERS, 'shard', ROOT, ROOT_PASSWORD,
 + '-i', INSTANCE_NAME, '-z', ZOOKEEPERS, '-t', 'shard', 
'-u', ROOT, '-p', ROOT_PASSWORD,
   'foo', 'bar')
  self.comment("Creating a word index of the sharded files")
  self.execute(self.accumulo_sh(), 
'org.apache.accumulo.examples.simple.shard.Reverse',

[1/2] git commit: ACCUMULO-2116 Examples functional test should run from outside of ACCUMULO_HOME.

[ctubbsii]

Updated Branches:
  refs/heads/1.5.1-SNAPSHOT 89c996229 -> d63cf6fe5


ACCUMULO-2116 Examples functional test should run from outside of ACCUMULO_HOME.

Signed-off-by: Christopher Tubbs 


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

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 1ad1151ab0ae2c57ff998cf563cbe6a019994724
Parents: d605ebb
Author: Sean Busbey 
Authored: Tue Dec 31 15:30:48 2013 -0600
Committer: Christopher Tubbs 
Committed: Tue Dec 31 17:28:43 2013 -0500

--
 test/system/auto/simple/examples.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1ad1151a/test/system/auto/simple/examples.py
--
diff --git a/test/system/auto/simple/examples.py 
b/test/system/auto/simple/examples.py
index bed321f..f05e58f 100755
--- a/test/system/auto/simple/examples.py
+++ b/test/system/auto/simple/examples.py
@@ -124,8 +124,8 @@ class Examples(TestUtilsMixin, unittest.TestCase):
 self.comment("Creating a sharded index of the accumulo java files")
 self.ashell('createtable shard\ncreatetable doc2term\nquit\n')
 self.execute('/bin/sh', '-c',
- 'find src -name "*.java" | xargs ./bin/accumulo 
org.apache.accumulo.examples.simple.shard.Index %s %s shard %s %s 30' %
- (INSTANCE_NAME, ZOOKEEPERS, ROOT, ROOT_PASSWORD))
+ 'find %s/src -name "*.java" | xargs %s/bin/accumulo 
org.apache.accumulo.examples.simple.shard.Index %s %s shard %s %s 30' %
+ (ACCUMULO_HOME, ACCUMULO_HOME, INSTANCE_NAME, ZOOKEEPERS, 
ROOT, ROOT_PASSWORD))
 self.execute(self.accumulo_sh(), 
'org.apache.accumulo.examples.simple.shard.Query',
  INSTANCE_NAME, ZOOKEEPERS, 'shard', ROOT, ROOT_PASSWORD,
  'foo', 'bar')

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

[ctubbsii]

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:
test/system/auto/simple/examples.py


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: b5e84bcd3108b446747e92a4915f7c7afe7f4a2c
Parents: 114b58d d63cf6f
Author: Christopher Tubbs 
Authored: Tue Dec 31 17:43:13 2013 -0500
Committer: Christopher Tubbs 
Committed: Tue Dec 31 17:43:13 2013 -0500

--

--

[1/3] git commit: ACCUMULO-2116 Examples functional test should run from outside of ACCUMULO_HOME.

[ctubbsii]

Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 114b58dca -> b5e84bcd3


ACCUMULO-2116 Examples functional test should run from outside of ACCUMULO_HOME.

Signed-off-by: Christopher Tubbs 


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 1ad1151ab0ae2c57ff998cf563cbe6a019994724
Parents: d605ebb
Author: Sean Busbey 
Authored: Tue Dec 31 15:30:48 2013 -0600
Committer: Christopher Tubbs 
Committed: Tue Dec 31 17:28:43 2013 -0500

--
 test/system/auto/simple/examples.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1ad1151a/test/system/auto/simple/examples.py
--
diff --git a/test/system/auto/simple/examples.py 
b/test/system/auto/simple/examples.py
index bed321f..f05e58f 100755
--- a/test/system/auto/simple/examples.py
+++ b/test/system/auto/simple/examples.py
@@ -124,8 +124,8 @@ class Examples(TestUtilsMixin, unittest.TestCase):
 self.comment("Creating a sharded index of the accumulo java files")
 self.ashell('createtable shard\ncreatetable doc2term\nquit\n')
 self.execute('/bin/sh', '-c',
- 'find src -name "*.java" | xargs ./bin/accumulo 
org.apache.accumulo.examples.simple.shard.Index %s %s shard %s %s 30' %
- (INSTANCE_NAME, ZOOKEEPERS, ROOT, ROOT_PASSWORD))
+ 'find %s/src -name "*.java" | xargs %s/bin/accumulo 
org.apache.accumulo.examples.simple.shard.Index %s %s shard %s %s 30' %
+ (ACCUMULO_HOME, ACCUMULO_HOME, INSTANCE_NAME, ZOOKEEPERS, 
ROOT, ROOT_PASSWORD))
 self.execute(self.accumulo_sh(), 
'org.apache.accumulo.examples.simple.shard.Query',
  INSTANCE_NAME, ZOOKEEPERS, 'shard', ROOT, ROOT_PASSWORD,
  'foo', 'bar')

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

[ctubbsii]

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT

Conflicts:
test/system/auto/simple/examples.py


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: d63cf6fe57ccc788e4b3a4ce3b187f0b252784e6
Parents: 89c9962 1ad1151
Author: Christopher Tubbs 
Authored: Tue Dec 31 17:33:35 2013 -0500
Committer: Christopher Tubbs 
Committed: Tue Dec 31 17:33:35 2013 -0500

--
 test/system/auto/simple/examples.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/d63cf6fe/test/system/auto/simple/examples.py
--
diff --cc test/system/auto/simple/examples.py
index 3ba425e,f05e58f..ba05174
--- a/test/system/auto/simple/examples.py
+++ b/test/system/auto/simple/examples.py
@@@ -128,10 -124,10 +128,10 @@@ class Examples(TestUtilsMixin, unittest
  self.comment("Creating a sharded index of the accumulo java files")
  self.ashell('createtable shard\ncreatetable doc2term\nquit\n')
  self.execute('/bin/sh', '-c',
-  'find server -name "*.java" | xargs ./bin/accumulo 
org.apache.accumulo.examples.simple.shard.Index -i %s -z %s -t shard -u %s -p 
%s --partitions 30' %
-  (INSTANCE_NAME, ZOOKEEPERS, ROOT, ROOT_PASSWORD))
 - 'find %s/src -name "*.java" | xargs %s/bin/accumulo 
org.apache.accumulo.examples.simple.shard.Index %s %s shard %s %s 30' %
++ 'find %s/server -name "*.java" | xargs %s/bin/accumulo 
org.apache.accumulo.examples.simple.shard.Index -i %s -z %s -t shard -u %s -p 
%s --partitions 30' %
+  (ACCUMULO_HOME, ACCUMULO_HOME, INSTANCE_NAME, 
ZOOKEEPERS, ROOT, ROOT_PASSWORD))
  self.execute(self.accumulo_sh(), 
'org.apache.accumulo.examples.simple.shard.Query',
 - INSTANCE_NAME, ZOOKEEPERS, 'shard', ROOT, ROOT_PASSWORD,
 + '-i', INSTANCE_NAME, '-z', ZOOKEEPERS, '-t', 'shard', 
'-u', ROOT, '-p', ROOT_PASSWORD,
   'foo', 'bar')
  self.comment("Creating a word index of the sharded files")
  self.execute(self.accumulo_sh(), 
'org.apache.accumulo.examples.simple.shard.Reverse',

[1/2] git commit: ACCUMULO-2117 ClassLoader test fails to tell the difference on Combiner change.

[ctubbsii]

Updated Branches:
  refs/heads/1.5.1-SNAPSHOT d63cf6fe5 -> 712e946d1


ACCUMULO-2117 ClassLoader test fails to tell the difference on Combiner change.

Signed-off-by: Christopher Tubbs 


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

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 0b6749a4f75bc3fa3ea256c75e5e2ad86103fdb3
Parents: 1ad1151
Author: Sean Busbey 
Authored: Tue Dec 31 16:31:07 2013 -0600
Committer: Christopher Tubbs 
Committed: Tue Dec 31 17:48:50 2013 -0500

--
 test/system/auto/TestCombinerY.jar | Bin 4335 -> 4129 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0b6749a4/test/system/auto/TestCombinerY.jar
--
diff --git a/test/system/auto/TestCombinerY.jar 
b/test/system/auto/TestCombinerY.jar
index 6cffd86..30da0cb 100644
Binary files a/test/system/auto/TestCombinerY.jar and 
b/test/system/auto/TestCombinerY.jar differ

[1/3] git commit: ACCUMULO-2117 ClassLoader test fails to tell the difference on Combiner change.

[ctubbsii]

Updated Branches:
  refs/heads/1.6.0-SNAPSHOT b5e84bcd3 -> 417902e21


ACCUMULO-2117 ClassLoader test fails to tell the difference on Combiner change.

Signed-off-by: Christopher Tubbs 


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 0b6749a4f75bc3fa3ea256c75e5e2ad86103fdb3
Parents: 1ad1151
Author: Sean Busbey 
Authored: Tue Dec 31 16:31:07 2013 -0600
Committer: Christopher Tubbs 
Committed: Tue Dec 31 17:48:50 2013 -0500

--
 test/system/auto/TestCombinerY.jar | Bin 4335 -> 4129 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0b6749a4/test/system/auto/TestCombinerY.jar
--
diff --git a/test/system/auto/TestCombinerY.jar 
b/test/system/auto/TestCombinerY.jar
index 6cffd86..30da0cb 100644
Binary files a/test/system/auto/TestCombinerY.jar and 
b/test/system/auto/TestCombinerY.jar differ

git commit: ACCUMULO-2117 ClassLoader test fails to tell the difference on Combiner change.

[ctubbsii]

Updated Branches:
  refs/heads/1.4.5-SNAPSHOT 1ad1151ab -> 0b6749a4f


ACCUMULO-2117 ClassLoader test fails to tell the difference on Combiner change.

Signed-off-by: Christopher Tubbs 


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

Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 0b6749a4f75bc3fa3ea256c75e5e2ad86103fdb3
Parents: 1ad1151
Author: Sean Busbey 
Authored: Tue Dec 31 16:31:07 2013 -0600
Committer: Christopher Tubbs 
Committed: Tue Dec 31 17:48:50 2013 -0500

--
 test/system/auto/TestCombinerY.jar | Bin 4335 -> 4129 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0b6749a4/test/system/auto/TestCombinerY.jar
--
diff --git a/test/system/auto/TestCombinerY.jar 
b/test/system/auto/TestCombinerY.jar
index 6cffd86..30da0cb 100644
Binary files a/test/system/auto/TestCombinerY.jar and 
b/test/system/auto/TestCombinerY.jar differ

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

[ctubbsii]

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 712e946d15786a8bc8e7bed49790cdadcfd134b4
Parents: d63cf6f 0b6749a
Author: Christopher Tubbs 
Authored: Tue Dec 31 17:49:03 2013 -0500
Committer: Christopher Tubbs 
Committed: Tue Dec 31 17:49:03 2013 -0500

--
 test/system/auto/TestCombinerY.jar | Bin 4335 -> 4129 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
--

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

[ctubbsii]

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/417902e2
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/417902e2
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/417902e2

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 417902e218c566333b6ea5ac492186ae305e5e16
Parents: b5e84bc 712e946
Author: Christopher Tubbs 
Authored: Tue Dec 31 17:49:17 2013 -0500
Committer: Christopher Tubbs 
Committed: Tue Dec 31 17:49:17 2013 -0500

--
 test/src/test/resources/TestCombinerY.jar | Bin 4335 -> 4129 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/417902e2/test/src/test/resources/TestCombinerY.jar
--
diff --cc test/src/test/resources/TestCombinerY.jar
index 6cffd86,000..30da0cb
mode 100644,00..100644
Binary files differ

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

[ctubbsii]

Merge branch '1.4.5-SNAPSHOT' into 1.5.1-SNAPSHOT


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

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 712e946d15786a8bc8e7bed49790cdadcfd134b4
Parents: d63cf6f 0b6749a
Author: Christopher Tubbs 
Authored: Tue Dec 31 17:49:03 2013 -0500
Committer: Christopher Tubbs 
Committed: Tue Dec 31 17:49:03 2013 -0500

--
 test/system/auto/TestCombinerY.jar | Bin 4335 -> 4129 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
--

git commit: ACCUMULO-2079 Prevent table creation in system namespace

[ctubbsii]

Updated Branches:
  refs/heads/1.6.0-SNAPSHOT c44fa4f37 -> 764884e75


ACCUMULO-2079 Prevent table creation in system namespace

  Consolidated code that checked for preconditions in fate operations,
  and made the checks more explicit and readable, which common exception
  handling. This does not address client side exceptions, but does
  ensure that descriptive messages are sent back to the client.


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 764884e753ba4ff8bab071f622e0bfbb6c8fc6a4
Parents: c44fa4f
Author: Christopher Tubbs 
Authored: Fri Jan 3 21:58:47 2014 -0500
Committer: Christopher Tubbs 
Committed: Fri Jan 3 21:58:47 2014 -0500

--
 .../org/apache/accumulo/core/Constants.java |   2 -
 .../core/client/admin/TableOperations.java  |   2 +-
 .../accumulo/core/client/impl/Namespaces.java   |  41 
 .../accumulo/core/client/impl/Tables.java   |  74 ++-
 .../client/mock/MockNamespaceOperations.java|   4 +-
 .../core/client/mock/MockTableOperations.java   |   3 +-
 .../accumulo/core/util/ArgumentChecker.java |  33 +++
 .../util/shell/commands/CreateTableCommand.java |   4 +-
 .../server/client/ClientServiceHandler.java |  10 +-
 .../accumulo/master/FateServiceHandler.java | 215 +--
 .../master/MasterClientServiceHandler.java  |   4 +-
 .../org/apache/accumulo/test/NamespacesIT.java  |  37 ++--
 12 files changed, 285 insertions(+), 144 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/764884e7/core/src/main/java/org/apache/accumulo/core/Constants.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/Constants.java 
b/core/src/main/java/org/apache/accumulo/core/Constants.java
index c151abb..7dee32c 100644
--- a/core/src/main/java/org/apache/accumulo/core/Constants.java
+++ b/core/src/main/java/org/apache/accumulo/core/Constants.java
@@ -101,8 +101,6 @@ public class Constants {
 
   public static final int MAX_DATA_TO_PRINT = 64;
   public static final String CORE_PACKAGE_NAME = "org.apache.accumulo.core";
-  public static final String VALID_TABLE_NAME_REGEX = "^(\\w+\\.)?(\\w+)$";
-  public static final String VALID_NAMESPACE_REGEX = "^\\w+$";
   public static final String MAPFILE_EXTENSION = "map";
   public static final String GENERATED_TABLET_DIRECTORY_PREFIX = "t-";
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/764884e7/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java 
b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
index 97066c4..4f6c315 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
@@ -344,7 +344,7 @@ public interface TableOperations {
* @param oldTableName
*  the old table name
* @param newTableName
-   *  the new table name
+   *  the new table name, which must be either unqualified (no 
namespace) or in the same namespace as the oldTableName
* @throws AccumuloException
*   if a general error occurs
* @throws AccumuloSecurityException

http://git-wip-us.apache.org/repos/asf/accumulo/blob/764884e7/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java 
b/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
index 1ca5dee..c134c04 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
@@ -26,10 +26,50 @@ import java.util.TreeMap;
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.NamespaceNotFoundException;
+import org.apache.accumulo.core.util.ArgumentChecker.Validator;
 import org.apache.accumulo.core.zookeeper.ZooUtil;
 import org.apache.accumulo.fate.zookeeper.ZooCache;
 
 public class Namespaces {
+  public static final String VALID_NAME_REGEX = "^\\w*$";
+  public static final Validator VALID_NAME = new Validator() {
+@Override
+public boolean isValid(String namespace) {
+  return namespace != null && namespace.matches(VALID_NAME_REGEX);
+}

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

[ctubbsii]

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/de79c0c8
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/de79c0c8
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/de79c0c8

Branch: refs/heads/master
Commit: de79c0c8958aa08f89479b419e673f0cb6e15c90
Parents: 1bfa738 764884e
Author: Christopher Tubbs 
Authored: Fri Jan 3 22:01:53 2014 -0500
Committer: Christopher Tubbs 
Committed: Fri Jan 3 22:01:53 2014 -0500

--
 .../org/apache/accumulo/core/Constants.java |   2 -
 .../core/client/admin/TableOperations.java  |   2 +-
 .../accumulo/core/client/impl/Namespaces.java   |  41 
 .../accumulo/core/client/impl/Tables.java   |  74 ++-
 .../client/mock/MockNamespaceOperations.java|   4 +-
 .../core/client/mock/MockTableOperations.java   |   3 +-
 .../accumulo/core/util/ArgumentChecker.java |  33 +++
 .../util/shell/commands/CreateTableCommand.java |   4 +-
 .../server/client/ClientServiceHandler.java |  10 +-
 .../accumulo/master/FateServiceHandler.java | 215 +--
 .../master/MasterClientServiceHandler.java  |   4 +-
 .../org/apache/accumulo/test/NamespacesIT.java  |  37 ++--
 12 files changed, 285 insertions(+), 144 deletions(-)
--

[1/2] git commit: ACCUMULO-2079 Prevent table creation in system namespace

[ctubbsii]

Updated Branches:
  refs/heads/master 1bfa738a7 -> de79c0c89


ACCUMULO-2079 Prevent table creation in system namespace

  Consolidated code that checked for preconditions in fate operations,
  and made the checks more explicit and readable, which common exception
  handling. This does not address client side exceptions, but does
  ensure that descriptive messages are sent back to the client.


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

Branch: refs/heads/master
Commit: 764884e753ba4ff8bab071f622e0bfbb6c8fc6a4
Parents: c44fa4f
Author: Christopher Tubbs 
Authored: Fri Jan 3 21:58:47 2014 -0500
Committer: Christopher Tubbs 
Committed: Fri Jan 3 21:58:47 2014 -0500

--
 .../org/apache/accumulo/core/Constants.java |   2 -
 .../core/client/admin/TableOperations.java  |   2 +-
 .../accumulo/core/client/impl/Namespaces.java   |  41 
 .../accumulo/core/client/impl/Tables.java   |  74 ++-
 .../client/mock/MockNamespaceOperations.java|   4 +-
 .../core/client/mock/MockTableOperations.java   |   3 +-
 .../accumulo/core/util/ArgumentChecker.java |  33 +++
 .../util/shell/commands/CreateTableCommand.java |   4 +-
 .../server/client/ClientServiceHandler.java |  10 +-
 .../accumulo/master/FateServiceHandler.java | 215 +--
 .../master/MasterClientServiceHandler.java  |   4 +-
 .../org/apache/accumulo/test/NamespacesIT.java  |  37 ++--
 12 files changed, 285 insertions(+), 144 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/764884e7/core/src/main/java/org/apache/accumulo/core/Constants.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/Constants.java 
b/core/src/main/java/org/apache/accumulo/core/Constants.java
index c151abb..7dee32c 100644
--- a/core/src/main/java/org/apache/accumulo/core/Constants.java
+++ b/core/src/main/java/org/apache/accumulo/core/Constants.java
@@ -101,8 +101,6 @@ public class Constants {
 
   public static final int MAX_DATA_TO_PRINT = 64;
   public static final String CORE_PACKAGE_NAME = "org.apache.accumulo.core";
-  public static final String VALID_TABLE_NAME_REGEX = "^(\\w+\\.)?(\\w+)$";
-  public static final String VALID_NAMESPACE_REGEX = "^\\w+$";
   public static final String MAPFILE_EXTENSION = "map";
   public static final String GENERATED_TABLET_DIRECTORY_PREFIX = "t-";
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/764884e7/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java 
b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
index 97066c4..4f6c315 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperations.java
@@ -344,7 +344,7 @@ public interface TableOperations {
* @param oldTableName
*  the old table name
* @param newTableName
-   *  the new table name
+   *  the new table name, which must be either unqualified (no 
namespace) or in the same namespace as the oldTableName
* @throws AccumuloException
*   if a general error occurs
* @throws AccumuloSecurityException

http://git-wip-us.apache.org/repos/asf/accumulo/blob/764884e7/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java 
b/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
index 1ca5dee..c134c04 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Namespaces.java
@@ -26,10 +26,50 @@ import java.util.TreeMap;
 import org.apache.accumulo.core.Constants;
 import org.apache.accumulo.core.client.Instance;
 import org.apache.accumulo.core.client.NamespaceNotFoundException;
+import org.apache.accumulo.core.util.ArgumentChecker.Validator;
 import org.apache.accumulo.core.zookeeper.ZooUtil;
 import org.apache.accumulo.fate.zookeeper.ZooCache;
 
 public class Namespaces {
+  public static final String VALID_NAME_REGEX = "^\\w*$";
+  public static final Validator VALID_NAME = new Validator() {
+@Override
+public boolean isValid(String namespace) {
+  return namespace != null && namespace.matches(VALID_NAME_REGEX);
+}
+
+@Override

Git Push Summary

[ctubbsii]

Updated Branches:
  refs/heads/1.5.0 [deleted] 5266a71be

git commit: ACCUMULO-1976 Fix upgrade broken by ACCUMULO-2093

[ctubbsii]

Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 9c092cadd -> ea8fe5414


ACCUMULO-1976 Fix upgrade broken by ACCUMULO-2093


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: ea8fe54145b306310a93e9df65ea5277dff2853e
Parents: 9c092ca
Author: Christopher Tubbs 
Authored: Mon Jan 6 21:19:00 2014 -0500
Committer: Christopher Tubbs 
Committed: Mon Jan 6 21:22:16 2014 -0500

--
 .../accumulo/server/tables/TableManager.java|  5 ++-
 .../java/org/apache/accumulo/master/Master.java | 41 
 2 files changed, 28 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ea8fe541/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
--
diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java 
b/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
index 0766a17..0f73ae4 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
@@ -59,7 +59,7 @@ public class TableManager {
 
   public static void prepareNewNamespaceState(String instanceId, String 
namespaceId, String namespace, NodeExistsPolicy existsPolicy) throws 
KeeperException,
   InterruptedException {
-// state gets created last
+log.debug("Creating ZooKeeper entries for new namespace " + namespace + " 
(ID: " + namespaceId + ")");
 String zPath = Constants.ZROOT + "/" + instanceId + Constants.ZNAMESPACES 
+ "/" + namespaceId;
 
 IZooReaderWriter zoo = ZooReaderWriter.getRetryingInstance();
@@ -71,6 +71,7 @@ public class TableManager {
   public static void prepareNewTableState(String instanceId, String tableId, 
String namespaceId, String tableName, TableState state,
   NodeExistsPolicy existsPolicy) throws KeeperException, 
InterruptedException {
 // state gets created last
+log.debug("Creating ZooKeeper entries for new table " + tableName + " (ID: 
" + tableId + ") in namespace (ID: " + namespaceId + ")");
 Pair qualifiedTableName = Tables.qualify(tableName);
 tableName = qualifiedTableName.getSecond();
 String zTablePath = Constants.ZROOT + "/" + instanceId + Constants.ZTABLES 
+ "/" + tableId;
@@ -79,10 +80,10 @@ public class TableManager {
 zoo.putPersistentData(zTablePath + Constants.ZTABLE_CONF, new byte[0], 
existsPolicy);
 zoo.putPersistentData(zTablePath + Constants.ZTABLE_NAMESPACE, 
namespaceId.getBytes(Constants.UTF8), existsPolicy);
 zoo.putPersistentData(zTablePath + Constants.ZTABLE_NAME, 
tableName.getBytes(Constants.UTF8), existsPolicy);
-zoo.putPersistentData(zTablePath + Constants.ZTABLE_STATE, 
state.name().getBytes(Constants.UTF8), existsPolicy);
 zoo.putPersistentData(zTablePath + Constants.ZTABLE_FLUSH_ID, 
"0".getBytes(Constants.UTF8), existsPolicy);
 zoo.putPersistentData(zTablePath + Constants.ZTABLE_COMPACT_ID, 
"0".getBytes(Constants.UTF8), existsPolicy);
 zoo.putPersistentData(zTablePath + Constants.ZTABLE_COMPACT_CANCEL_ID, 
"0".getBytes(Constants.UTF8), existsPolicy);
+zoo.putPersistentData(zTablePath + Constants.ZTABLE_STATE, 
state.name().getBytes(Constants.UTF8), existsPolicy);
   }
 
   public synchronized static TableManager getInstance() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/ea8fe541/server/master/src/main/java/org/apache/accumulo/master/Master.java
--
diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java 
b/server/master/src/main/java/org/apache/accumulo/master/Master.java
index 304366c..86a35cd 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@ -64,6 +64,7 @@ import org.apache.accumulo.core.security.NamespacePermission;
 import org.apache.accumulo.core.security.SecurityUtil;
 import org.apache.accumulo.core.security.TablePermission;
 import org.apache.accumulo.core.util.Daemon;
+import org.apache.accumulo.core.util.Pair;
 import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.accumulo.core.zookeeper.ZooUtil;
 import org.apache.accumulo.fate.AgeOffStore;
@@ -127,6 +128,8 @@ import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.data.Stat;
 
+import com.google.common.collect.Iterables;
+
 /**
  * The Master is responsible for assigning and balancing tablets to t

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

[ctubbsii]

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/33a094de
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/33a094de
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/33a094de

Branch: refs/heads/master
Commit: 33a094de4aab9bb26c896a6744e168628316597a
Parents: 4fbba38 ea8fe54
Author: Christopher Tubbs 
Authored: Mon Jan 6 21:26:23 2014 -0500
Committer: Christopher Tubbs 
Committed: Mon Jan 6 21:26:23 2014 -0500

--
 .../accumulo/server/tables/TableManager.java|  5 ++-
 .../java/org/apache/accumulo/master/Master.java | 41 
 2 files changed, 28 insertions(+), 18 deletions(-)
--

[1/2] git commit: ACCUMULO-1976 Fix upgrade broken by ACCUMULO-2093

[ctubbsii]

Updated Branches:
  refs/heads/master 4fbba38ae -> 33a094de4


ACCUMULO-1976 Fix upgrade broken by ACCUMULO-2093


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

Branch: refs/heads/master
Commit: ea8fe54145b306310a93e9df65ea5277dff2853e
Parents: 9c092ca
Author: Christopher Tubbs 
Authored: Mon Jan 6 21:19:00 2014 -0500
Committer: Christopher Tubbs 
Committed: Mon Jan 6 21:22:16 2014 -0500

--
 .../accumulo/server/tables/TableManager.java|  5 ++-
 .../java/org/apache/accumulo/master/Master.java | 41 
 2 files changed, 28 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ea8fe541/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
--
diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java 
b/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
index 0766a17..0f73ae4 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/tables/TableManager.java
@@ -59,7 +59,7 @@ public class TableManager {
 
   public static void prepareNewNamespaceState(String instanceId, String 
namespaceId, String namespace, NodeExistsPolicy existsPolicy) throws 
KeeperException,
   InterruptedException {
-// state gets created last
+log.debug("Creating ZooKeeper entries for new namespace " + namespace + " 
(ID: " + namespaceId + ")");
 String zPath = Constants.ZROOT + "/" + instanceId + Constants.ZNAMESPACES 
+ "/" + namespaceId;
 
 IZooReaderWriter zoo = ZooReaderWriter.getRetryingInstance();
@@ -71,6 +71,7 @@ public class TableManager {
   public static void prepareNewTableState(String instanceId, String tableId, 
String namespaceId, String tableName, TableState state,
   NodeExistsPolicy existsPolicy) throws KeeperException, 
InterruptedException {
 // state gets created last
+log.debug("Creating ZooKeeper entries for new table " + tableName + " (ID: 
" + tableId + ") in namespace (ID: " + namespaceId + ")");
 Pair qualifiedTableName = Tables.qualify(tableName);
 tableName = qualifiedTableName.getSecond();
 String zTablePath = Constants.ZROOT + "/" + instanceId + Constants.ZTABLES 
+ "/" + tableId;
@@ -79,10 +80,10 @@ public class TableManager {
 zoo.putPersistentData(zTablePath + Constants.ZTABLE_CONF, new byte[0], 
existsPolicy);
 zoo.putPersistentData(zTablePath + Constants.ZTABLE_NAMESPACE, 
namespaceId.getBytes(Constants.UTF8), existsPolicy);
 zoo.putPersistentData(zTablePath + Constants.ZTABLE_NAME, 
tableName.getBytes(Constants.UTF8), existsPolicy);
-zoo.putPersistentData(zTablePath + Constants.ZTABLE_STATE, 
state.name().getBytes(Constants.UTF8), existsPolicy);
 zoo.putPersistentData(zTablePath + Constants.ZTABLE_FLUSH_ID, 
"0".getBytes(Constants.UTF8), existsPolicy);
 zoo.putPersistentData(zTablePath + Constants.ZTABLE_COMPACT_ID, 
"0".getBytes(Constants.UTF8), existsPolicy);
 zoo.putPersistentData(zTablePath + Constants.ZTABLE_COMPACT_CANCEL_ID, 
"0".getBytes(Constants.UTF8), existsPolicy);
+zoo.putPersistentData(zTablePath + Constants.ZTABLE_STATE, 
state.name().getBytes(Constants.UTF8), existsPolicy);
   }
 
   public synchronized static TableManager getInstance() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/ea8fe541/server/master/src/main/java/org/apache/accumulo/master/Master.java
--
diff --git a/server/master/src/main/java/org/apache/accumulo/master/Master.java 
b/server/master/src/main/java/org/apache/accumulo/master/Master.java
index 304366c..86a35cd 100644
--- a/server/master/src/main/java/org/apache/accumulo/master/Master.java
+++ b/server/master/src/main/java/org/apache/accumulo/master/Master.java
@@ -64,6 +64,7 @@ import org.apache.accumulo.core.security.NamespacePermission;
 import org.apache.accumulo.core.security.SecurityUtil;
 import org.apache.accumulo.core.security.TablePermission;
 import org.apache.accumulo.core.util.Daemon;
+import org.apache.accumulo.core.util.Pair;
 import org.apache.accumulo.core.util.UtilWaitThread;
 import org.apache.accumulo.core.zookeeper.ZooUtil;
 import org.apache.accumulo.fate.AgeOffStore;
@@ -127,6 +128,8 @@ import org.apache.zookeeper.WatchedEvent;
 import org.apache.zookeeper.Watcher;
 import org.apache.zookeeper.data.Stat;
 
+import com.google.common.collect.Iterables;
+
 /**
  * The Master is responsible for assigning and balancing tablets to tablet 
servers.

git commit: ACCUMULO-2128 Remove warnings introduced by merge

[ctubbsii]

Updated Branches:
  refs/heads/1.5.1-SNAPSHOT 400b991fb -> 21b1b1108


ACCUMULO-2128 Remove warnings introduced by merge


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

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: 21b1b1108b6094d9706d1a01125d8e36041b484c
Parents: 400b991
Author: Christopher Tubbs 
Authored: Mon Jan 6 21:38:20 2014 -0500
Committer: Christopher Tubbs 
Committed: Mon Jan 6 21:38:20 2014 -0500

--
 .../apache/accumulo/core/client/ZooKeeperInstance.java   | 11 +--
 .../org/apache/accumulo/test/functional/CleanUpTest.java |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/21b1b110/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java 
b/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
index ccfb328..18d55a6 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
@@ -37,7 +37,6 @@ import org.apache.accumulo.core.util.ByteBufferUtil;
 import org.apache.accumulo.core.util.CachedConfiguration;
 import org.apache.accumulo.core.util.OpTimer;
 import org.apache.accumulo.core.util.TextUtil;
-import org.apache.accumulo.core.util.ThriftUtil;
 import org.apache.accumulo.core.zookeeper.ZooUtil;
 import org.apache.accumulo.fate.zookeeper.ZooCache;
 import org.apache.hadoop.fs.FileStatus;
@@ -222,12 +221,12 @@ public class ZooKeeperInstance implements Instance {
   public Connector getConnector(String principal, AuthenticationToken token) 
throws AccumuloException, AccumuloSecurityException {
 return getConnector(CredentialHelper.create(principal, token, 
getInstanceID()));
   }
-  
+
   @SuppressWarnings("deprecation")
   private Connector getConnector(TCredentials credential) throws 
AccumuloException, AccumuloSecurityException {
 return new ConnectorImpl(this, credential);
   }
-  
+
   @Override
   @Deprecated
   public Connector getConnector(String principal, byte[] pass) throws 
AccumuloException, AccumuloSecurityException {
@@ -255,7 +254,7 @@ public class ZooKeeperInstance implements Instance {
   public static String 
lookupInstanceName(org.apache.accumulo.core.zookeeper.ZooCache zooCache, UUID 
instanceId) {
 return lookupInstanceName((ZooCache) zooCache, instanceId);
   }
-  
+
   /**
* Given a zooCache and instanceId, look up the instance name.
* 
@@ -275,7 +274,7 @@ public class ZooKeeperInstance implements Instance {
 }
 return null;
   }
-  
+
   /**
* To be moved to server code. Only lives here to support certain client 
side utilities to minimize command-line options.
*/
@@ -304,7 +303,7 @@ public class ZooKeeperInstance implements Instance {
   throw new RuntimeException("Accumulo not initialized, there is no 
instance id at " + instanceDirectory, e);
 }
   }
-  
+
   @Deprecated
   @Override
   public Connector 
getConnector(org.apache.accumulo.core.security.thrift.AuthInfo auth) throws 
AccumuloException, AccumuloSecurityException {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/21b1b110/test/src/main/java/org/apache/accumulo/test/functional/CleanUpTest.java
--
diff --git 
a/test/src/main/java/org/apache/accumulo/test/functional/CleanUpTest.java 
b/test/src/main/java/org/apache/accumulo/test/functional/CleanUpTest.java
index 5a0ca26..e4cefbf 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CleanUpTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CleanUpTest.java
@@ -24,6 +24,7 @@ import java.util.Map.Entry;
 import java.util.Set;
 
 import org.apache.accumulo.core.client.BatchWriter;
+import org.apache.accumulo.core.client.BatchWriterConfig;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Mutation;
@@ -49,10 +50,9 @@ public class CleanUpTest extends FunctionalTest {
   @Override
   public void run() throws Exception {
 
-
 getConnector().tableOperations().create("test");
 
-BatchWriter bw = getConnector().createBatchWriter("test", 100, 6, 
1);
+BatchWriter bw = getConnector().createBatchWriter("test", new 
BatchWriterConfig());
 
 Mutation m1 = new Mutation("r1");
 m1.put("cf1", "cq1", 1, "5");

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

[ctubbsii]

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:

core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
test/src/test/java/org/apache/accumulo/test/functional/CleanUpIT.java


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 98211f5812c3900963953b38f231827af7ea6397
Parents: da9e0f4 21b1b11
Author: Christopher Tubbs 
Authored: Mon Jan 6 21:49:41 2014 -0500
Committer: Christopher Tubbs 
Committed: Mon Jan 6 21:49:41 2014 -0500

--
 .../java/org/apache/accumulo/core/client/ZooKeeperInstance.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/98211f58/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
--
diff --cc 
core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
index 1497153,18d55a6..8b0546a
--- a/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
@@@ -28,17 -28,20 +28,16 @@@ import org.apache.accumulo.core.client.
  import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
  import org.apache.accumulo.core.client.security.tokens.PasswordToken;
  import org.apache.accumulo.core.conf.AccumuloConfiguration;
 -import org.apache.accumulo.core.conf.Property;
 -import org.apache.accumulo.core.file.FileUtil;
 -import org.apache.accumulo.core.security.CredentialHelper;
 -import org.apache.accumulo.core.security.thrift.TCredentials;
 +import org.apache.accumulo.core.conf.DefaultConfiguration;
 +import org.apache.accumulo.core.metadata.RootTable;
 +import org.apache.accumulo.core.security.Credentials;
  import org.apache.accumulo.core.util.ArgumentChecker;
  import org.apache.accumulo.core.util.ByteBufferUtil;
 -import org.apache.accumulo.core.util.CachedConfiguration;
  import org.apache.accumulo.core.util.OpTimer;
  import org.apache.accumulo.core.util.TextUtil;
- import org.apache.accumulo.core.util.ThriftUtil;
  import org.apache.accumulo.core.zookeeper.ZooUtil;
  import org.apache.accumulo.fate.zookeeper.ZooCache;
 -import org.apache.hadoop.fs.FileStatus;
 -import org.apache.hadoop.fs.FileSystem;
 -import org.apache.hadoop.fs.Path;
 +import org.apache.commons.configuration.Configuration;
  import org.apache.hadoop.io.Text;
  import org.apache.log4j.Level;
  import org.apache.log4j.Logger;

[1/2] git commit: ACCUMULO-2128 Remove warnings introduced by merge

[ctubbsii]

Updated Branches:
  refs/heads/1.6.0-SNAPSHOT da9e0f40a -> 98211f581


ACCUMULO-2128 Remove warnings introduced by merge


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 21b1b1108b6094d9706d1a01125d8e36041b484c
Parents: 400b991
Author: Christopher Tubbs 
Authored: Mon Jan 6 21:38:20 2014 -0500
Committer: Christopher Tubbs 
Committed: Mon Jan 6 21:38:20 2014 -0500

--
 .../apache/accumulo/core/client/ZooKeeperInstance.java   | 11 +--
 .../org/apache/accumulo/test/functional/CleanUpTest.java |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/21b1b110/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java 
b/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
index ccfb328..18d55a6 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
@@ -37,7 +37,6 @@ import org.apache.accumulo.core.util.ByteBufferUtil;
 import org.apache.accumulo.core.util.CachedConfiguration;
 import org.apache.accumulo.core.util.OpTimer;
 import org.apache.accumulo.core.util.TextUtil;
-import org.apache.accumulo.core.util.ThriftUtil;
 import org.apache.accumulo.core.zookeeper.ZooUtil;
 import org.apache.accumulo.fate.zookeeper.ZooCache;
 import org.apache.hadoop.fs.FileStatus;
@@ -222,12 +221,12 @@ public class ZooKeeperInstance implements Instance {
   public Connector getConnector(String principal, AuthenticationToken token) 
throws AccumuloException, AccumuloSecurityException {
 return getConnector(CredentialHelper.create(principal, token, 
getInstanceID()));
   }
-  
+
   @SuppressWarnings("deprecation")
   private Connector getConnector(TCredentials credential) throws 
AccumuloException, AccumuloSecurityException {
 return new ConnectorImpl(this, credential);
   }
-  
+
   @Override
   @Deprecated
   public Connector getConnector(String principal, byte[] pass) throws 
AccumuloException, AccumuloSecurityException {
@@ -255,7 +254,7 @@ public class ZooKeeperInstance implements Instance {
   public static String 
lookupInstanceName(org.apache.accumulo.core.zookeeper.ZooCache zooCache, UUID 
instanceId) {
 return lookupInstanceName((ZooCache) zooCache, instanceId);
   }
-  
+
   /**
* Given a zooCache and instanceId, look up the instance name.
* 
@@ -275,7 +274,7 @@ public class ZooKeeperInstance implements Instance {
 }
 return null;
   }
-  
+
   /**
* To be moved to server code. Only lives here to support certain client 
side utilities to minimize command-line options.
*/
@@ -304,7 +303,7 @@ public class ZooKeeperInstance implements Instance {
   throw new RuntimeException("Accumulo not initialized, there is no 
instance id at " + instanceDirectory, e);
 }
   }
-  
+
   @Deprecated
   @Override
   public Connector 
getConnector(org.apache.accumulo.core.security.thrift.AuthInfo auth) throws 
AccumuloException, AccumuloSecurityException {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/21b1b110/test/src/main/java/org/apache/accumulo/test/functional/CleanUpTest.java
--
diff --git 
a/test/src/main/java/org/apache/accumulo/test/functional/CleanUpTest.java 
b/test/src/main/java/org/apache/accumulo/test/functional/CleanUpTest.java
index 5a0ca26..e4cefbf 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CleanUpTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CleanUpTest.java
@@ -24,6 +24,7 @@ import java.util.Map.Entry;
 import java.util.Set;
 
 import org.apache.accumulo.core.client.BatchWriter;
+import org.apache.accumulo.core.client.BatchWriterConfig;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Mutation;
@@ -49,10 +50,9 @@ public class CleanUpTest extends FunctionalTest {
   @Override
   public void run() throws Exception {
 
-
 getConnector().tableOperations().create("test");
 
-BatchWriter bw = getConnector().createBatchWriter("test", 100, 6, 
1);
+BatchWriter bw = getConnector().createBatchWriter("test", new 
BatchWriterConfig());
 
 Mutation m1 = new Mutation("r1");
 m1.put("cf1", "cq1", 1, "5");

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

[ctubbsii]

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/a2652c3c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a2652c3c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a2652c3c

Branch: refs/heads/master
Commit: a2652c3c41fd2c4b50c5b4d98d8edf07dcbc99f3
Parents: ac28b22 98211f5
Author: Christopher Tubbs 
Authored: Mon Jan 6 21:50:12 2014 -0500
Committer: Christopher Tubbs 
Committed: Mon Jan 6 21:50:12 2014 -0500

--
 .../java/org/apache/accumulo/core/client/ZooKeeperInstance.java | 1 -
 1 file changed, 1 deletion(-)
--

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

[ctubbsii]

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:

core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
test/src/test/java/org/apache/accumulo/test/functional/CleanUpIT.java


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

Branch: refs/heads/master
Commit: 98211f5812c3900963953b38f231827af7ea6397
Parents: da9e0f4 21b1b11
Author: Christopher Tubbs 
Authored: Mon Jan 6 21:49:41 2014 -0500
Committer: Christopher Tubbs 
Committed: Mon Jan 6 21:49:41 2014 -0500

--
 .../java/org/apache/accumulo/core/client/ZooKeeperInstance.java | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/98211f58/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
--
diff --cc 
core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
index 1497153,18d55a6..8b0546a
--- a/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
@@@ -28,17 -28,20 +28,16 @@@ import org.apache.accumulo.core.client.
  import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
  import org.apache.accumulo.core.client.security.tokens.PasswordToken;
  import org.apache.accumulo.core.conf.AccumuloConfiguration;
 -import org.apache.accumulo.core.conf.Property;
 -import org.apache.accumulo.core.file.FileUtil;
 -import org.apache.accumulo.core.security.CredentialHelper;
 -import org.apache.accumulo.core.security.thrift.TCredentials;
 +import org.apache.accumulo.core.conf.DefaultConfiguration;
 +import org.apache.accumulo.core.metadata.RootTable;
 +import org.apache.accumulo.core.security.Credentials;
  import org.apache.accumulo.core.util.ArgumentChecker;
  import org.apache.accumulo.core.util.ByteBufferUtil;
 -import org.apache.accumulo.core.util.CachedConfiguration;
  import org.apache.accumulo.core.util.OpTimer;
  import org.apache.accumulo.core.util.TextUtil;
- import org.apache.accumulo.core.util.ThriftUtil;
  import org.apache.accumulo.core.zookeeper.ZooUtil;
  import org.apache.accumulo.fate.zookeeper.ZooCache;
 -import org.apache.hadoop.fs.FileStatus;
 -import org.apache.hadoop.fs.FileSystem;
 -import org.apache.hadoop.fs.Path;
 +import org.apache.commons.configuration.Configuration;
  import org.apache.hadoop.io.Text;
  import org.apache.log4j.Level;
  import org.apache.log4j.Logger;

[1/3] git commit: ACCUMULO-2128 Remove warnings introduced by merge

[ctubbsii]

Updated Branches:
  refs/heads/master ac28b2253 -> a2652c3c4


ACCUMULO-2128 Remove warnings introduced by merge


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

Branch: refs/heads/master
Commit: 21b1b1108b6094d9706d1a01125d8e36041b484c
Parents: 400b991
Author: Christopher Tubbs 
Authored: Mon Jan 6 21:38:20 2014 -0500
Committer: Christopher Tubbs 
Committed: Mon Jan 6 21:38:20 2014 -0500

--
 .../apache/accumulo/core/client/ZooKeeperInstance.java   | 11 +--
 .../org/apache/accumulo/test/functional/CleanUpTest.java |  4 ++--
 2 files changed, 7 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/21b1b110/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java 
b/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
index ccfb328..18d55a6 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ZooKeeperInstance.java
@@ -37,7 +37,6 @@ import org.apache.accumulo.core.util.ByteBufferUtil;
 import org.apache.accumulo.core.util.CachedConfiguration;
 import org.apache.accumulo.core.util.OpTimer;
 import org.apache.accumulo.core.util.TextUtil;
-import org.apache.accumulo.core.util.ThriftUtil;
 import org.apache.accumulo.core.zookeeper.ZooUtil;
 import org.apache.accumulo.fate.zookeeper.ZooCache;
 import org.apache.hadoop.fs.FileStatus;
@@ -222,12 +221,12 @@ public class ZooKeeperInstance implements Instance {
   public Connector getConnector(String principal, AuthenticationToken token) 
throws AccumuloException, AccumuloSecurityException {
 return getConnector(CredentialHelper.create(principal, token, 
getInstanceID()));
   }
-  
+
   @SuppressWarnings("deprecation")
   private Connector getConnector(TCredentials credential) throws 
AccumuloException, AccumuloSecurityException {
 return new ConnectorImpl(this, credential);
   }
-  
+
   @Override
   @Deprecated
   public Connector getConnector(String principal, byte[] pass) throws 
AccumuloException, AccumuloSecurityException {
@@ -255,7 +254,7 @@ public class ZooKeeperInstance implements Instance {
   public static String 
lookupInstanceName(org.apache.accumulo.core.zookeeper.ZooCache zooCache, UUID 
instanceId) {
 return lookupInstanceName((ZooCache) zooCache, instanceId);
   }
-  
+
   /**
* Given a zooCache and instanceId, look up the instance name.
* 
@@ -275,7 +274,7 @@ public class ZooKeeperInstance implements Instance {
 }
 return null;
   }
-  
+
   /**
* To be moved to server code. Only lives here to support certain client 
side utilities to minimize command-line options.
*/
@@ -304,7 +303,7 @@ public class ZooKeeperInstance implements Instance {
   throw new RuntimeException("Accumulo not initialized, there is no 
instance id at " + instanceDirectory, e);
 }
   }
-  
+
   @Deprecated
   @Override
   public Connector 
getConnector(org.apache.accumulo.core.security.thrift.AuthInfo auth) throws 
AccumuloException, AccumuloSecurityException {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/21b1b110/test/src/main/java/org/apache/accumulo/test/functional/CleanUpTest.java
--
diff --git 
a/test/src/main/java/org/apache/accumulo/test/functional/CleanUpTest.java 
b/test/src/main/java/org/apache/accumulo/test/functional/CleanUpTest.java
index 5a0ca26..e4cefbf 100644
--- a/test/src/main/java/org/apache/accumulo/test/functional/CleanUpTest.java
+++ b/test/src/main/java/org/apache/accumulo/test/functional/CleanUpTest.java
@@ -24,6 +24,7 @@ import java.util.Map.Entry;
 import java.util.Set;
 
 import org.apache.accumulo.core.client.BatchWriter;
+import org.apache.accumulo.core.client.BatchWriterConfig;
 import org.apache.accumulo.core.client.Scanner;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.Mutation;
@@ -49,10 +50,9 @@ public class CleanUpTest extends FunctionalTest {
   @Override
   public void run() throws Exception {
 
-
 getConnector().tableOperations().create("test");
 
-BatchWriter bw = getConnector().createBatchWriter("test", 100, 6, 
1);
+BatchWriter bw = getConnector().createBatchWriter("test", new 
BatchWriterConfig());
 
 Mutation m1 = new Mutation("r1");
 m1.put("cf1", "cq1", 1, "5");

git commit: ACCUMULO-2196 ConfigurableMacIT tests should each use their own dirs

[ctubbsii]

Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 9440d15cb -> e36ac378d


ACCUMULO-2196 ConfigurableMacIT tests should each use their own dirs

Signed-off-by: Christopher Tubbs 


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: e36ac378d13535b869336c0e6737274d255c72df
Parents: 9440d15
Author: Vikram Srivastava 
Authored: Thu Jan 23 15:33:49 2014 -0800
Committer: Christopher Tubbs 
Committed: Thu Jan 23 18:38:37 2014 -0500

--
 .../org/apache/accumulo/test/functional/ConfigurableMacIT.java| 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e36ac378/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacIT.java
--
diff --git 
a/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacIT.java 
b/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacIT.java
index 8dafe53..7899bf9 100644
--- 
a/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacIT.java
+++ 
b/test/src/test/java/org/apache/accumulo/test/functional/ConfigurableMacIT.java
@@ -41,7 +41,8 @@ public class ConfigurableMacIT extends AbstractMacIT {
 
   @Before
   public void setUp() throws Exception {
-MiniAccumuloConfigImpl cfg = new 
MiniAccumuloConfigImpl(createTestDir(this.getClass().getName()), ROOT_PASSWORD);
+MiniAccumuloConfigImpl cfg = new MiniAccumuloConfigImpl(
+createTestDir(this.getClass().getName() + "_" + 
this.testName.getMethodName()), ROOT_PASSWORD);
 cfg.setNativeLibPaths(NativeMapIT.nativeMapLocation().getAbsolutePath());
 configure(cfg);
 cfg.setProperty(Property.TSERV_NATIVEMAP_ENABLED, Boolean.TRUE.toString());

git commit: ACCUMULO-1961 Fix/remove some more trivial warnings

[ctubbsii]

Updated Branches:
  refs/heads/1.6.0-SNAPSHOT a72dd7867 -> 7820120fb


ACCUMULO-1961 Fix/remove some more trivial warnings


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 7820120fb2ce4c18317ab77b6439197084ceac8f
Parents: a72dd78
Author: Christopher Tubbs 
Authored: Wed Feb 5 15:36:27 2014 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 5 15:36:27 2014 -0500

--
 .../core/client/ClientConfiguration.java|   2 +-
 .../lib/partition/RangePartitioner.java |  27 ++--
 .../mapreduce/AccumuloInputFormatTest.java  |   3 +-
 .../apache/accumulo/fate/util/AddressUtil.java  |  27 ++--
 .../minicluster/MiniAccumuloCluster.java|   2 -
 .../impl/MiniAccumuloConfigImpl.java|   2 -
 .../accumulo/server/util/SendLogToChainsaw.java |  69 +-
 .../org/apache/accumulo/test/VerifyIngest.java  |  89 ++--
 .../test/continuous/UndefinedAnalyzer.java  | 134 ++-
 .../accumulo/test/functional/TabletIT.java  |   2 -
 10 files changed, 177 insertions(+), 180 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7820120f/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java 
b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
index a3d51cf..b0ae537 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
@@ -128,7 +128,7 @@ public class ClientConfiguration extends 
CompositeConfiguration {
* the one in the configuration.
* 
* @see PropertiesConfiguration
-   * @see File.pathSeparator
+   * @see File#pathSeparator
*/
   public static ClientConfiguration loadDefault() {
 return loadFromSearchPath(getDefaultSearchPath());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7820120f/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
 
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
index 3cb69ad..1569579 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
@@ -19,7 +19,6 @@ package 
org.apache.accumulo.core.client.mapreduce.lib.partition;
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.URI;
@@ -45,9 +44,9 @@ public class RangePartitioner extends 
Partitioner implements Conf
   private static final String PREFIX = RangePartitioner.class.getName();
   private static final String CUTFILE_KEY = PREFIX + ".cutFile";
   private static final String NUM_SUBBINS = PREFIX + ".subBins";
-  
+
   private Configuration conf;
-  
+
   @Override
   public int getPartition(Text key, Writable value, int numPartitions) {
 try {
@@ -56,21 +55,21 @@ public class RangePartitioner extends 
Partitioner implements Conf
   throw new RuntimeException(e);
 }
   }
-  
+
   int findPartition(Text key, Text[] array, int numSubBins) {
 // find the bin for the range, and guarantee it is positive
 int index = Arrays.binarySearch(array, key);
 index = index < 0 ? (index + 1) * -1 : index;
-
+
 // both conditions work with numSubBins == 1, but this check is to avoid
 // hashing, when we don't need to, for speed
 if (numSubBins < 2)
   return index;
 return (key.toString().hashCode() & Integer.MAX_VALUE) % numSubBins + 
index * numSubBins;
   }
-  
+
   private int _numSubBins = 0;
-  
+
   private synchronized int getNumSubBins() {
 if (_numSubBins < 1) {
   // get number of sub-bins and guarantee it is positive
@@ -78,14 +77,14 @@ public class RangePartitioner extends 
Partitioner implements Conf
 }
 return _numSubBins;
   }
-  
+
   private Text cutPointArray[] = null;
-  
+
   private synchronized Text[] getCutPoints() throws IOException {
 if (cutPointArray == null) {
   String cutFileName = conf.get(CUTFILE_KEY);
   Path[] cf = DistributedCacheHelper.getLocalCacheF

git commit: ACCUMULO-2114 Move built-in namespace names to a method

[ctubbsii]

Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 7820120fb -> 7f789ecbd


ACCUMULO-2114 Move built-in namespace names to a method


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 7f789ecbdcb902f9a14ddb2192ffa5a42bb2787b
Parents: 7820120
Author: Christopher Tubbs 
Authored: Wed Feb 5 15:53:08 2014 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 5 15:53:08 2014 -0500

--
 .../accumulo/core/client/ClientConstants.java   | 22 ---
 .../core/client/admin/NamespaceOperations.java  | 23 
 .../client/admin/NamespaceOperationsHelper.java | 11 ++
 .../accumulo/core/client/impl/Namespaces.java   |  3 +--
 .../org/apache/accumulo/test/NamespacesIT.java  |  8 ++-
 5 files changed, 38 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7f789ecb/core/src/main/java/org/apache/accumulo/core/client/ClientConstants.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/ClientConstants.java 
b/core/src/main/java/org/apache/accumulo/core/client/ClientConstants.java
deleted file mode 100644
index 4514e82..000
--- a/core/src/main/java/org/apache/accumulo/core/client/ClientConstants.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * 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.core.client;
-
-
-public class ClientConstants {
-  public static final String DEFAULT_NAMESPACE = "";
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7f789ecb/core/src/main/java/org/apache/accumulo/core/client/admin/NamespaceOperations.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/admin/NamespaceOperations.java
 
b/core/src/main/java/org/apache/accumulo/core/client/admin/NamespaceOperations.java
index 269e563..c6dff92 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/admin/NamespaceOperations.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/admin/NamespaceOperations.java
@@ -40,6 +40,22 @@ import 
org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
 public interface NamespaceOperations {
 
   /**
+   * Returns the name of the system reserved namespace
+   * 
+   * @return the name of the system namespace
+   * @since 1.6.0
+   */
+  String systemNamespace();
+
+  /**
+   * Returns the name of the default namespace
+   * 
+   * @return the name of the default namespace
+   * @since 1.6.0
+   */
+  String defaultNamespace();
+
+  /**
* Retrieve a list of namespaces in Accumulo.
* 
* @return List of namespaces in accumulo
@@ -293,8 +309,8 @@ public interface NamespaceOperations {
*   if the specified namespace doesn't exist
* @since 1.6.0
*/
-  void checkIteratorConflicts(String namespace, IteratorSetting setting, 
EnumSet scopes) throws AccumuloException,
-  AccumuloSecurityException, NamespaceNotFoundException;
+  void checkIteratorConflicts(String namespace, IteratorSetting setting, 
EnumSet scopes) throws AccumuloException, 
AccumuloSecurityException,
+  NamespaceNotFoundException;
 
   /**
* Add a new constraint to a namespace.
@@ -365,6 +381,5 @@ public interface NamespaceOperations {
*   if the specified namespace doesn't exist
* @since 1.6.0
*/
-  boolean testClassLoad(String namespace, String className, String asTypeName) 
throws AccumuloException, AccumuloSecurityException,
-  NamespaceNotFoundException;
+  boolean testClassLoad(String namespace, String className, String asTypeName) 
throws AccumuloException, AccumuloSecurityException, NamespaceNotFoundException;
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7f789ecb/core/src/main/java/org/apache/accumulo/core/client/admin/NamespaceOperatio

[2/2] git commit: ACCUMULO-1989 Use default namespace name explicitly in shell

[ctubbsii]

ACCUMULO-1989 Use default namespace name explicitly in shell


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: a8f154e45d60304827e681d6a74cc7f9dc3aab94
Parents: ec4bc2f
Author: Christopher Tubbs 
Authored: Wed Feb 5 18:59:56 2014 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 5 18:59:56 2014 -0500

--
 .../org/apache/accumulo/core/util/shell/Shell.java |  4 ++--
 .../core/util/shell/commands/NamespacesCommand.java|  2 +-
 .../java/org/apache/accumulo/test/ShellServerIT.java   | 13 +++--
 3 files changed, 10 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a8f154e4/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java 
b/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
index e4a01f9..7f1b8dc 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
@@ -751,8 +751,7 @@ public class Shell extends ShellOptions {
   modifiedUserlist.add(a.replaceAll("([\\s'\"])", "$1"));
 for (String a : namespaces) {
   String b = a.replaceAll("([\\s'\"])", "$1");
-  if (!b.isEmpty())
-modifiedNamespaces.add(b);
+  modifiedNamespaces.add(b.isEmpty() ? "\"\"" : b);
 }
 
 options.put(Command.CompletionSet.USERNAMES, modifiedUserlist);
@@ -881,6 +880,7 @@ public class Shell extends ShellOptions {
 
   public interface PrintLine {
 void print(String s);
+
 void close();
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a8f154e4/core/src/main/java/org/apache/accumulo/core/util/shell/commands/NamespacesCommand.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/NamespacesCommand.java
 
b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/NamespacesCommand.java
index 7f41c32..16ee645 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/NamespacesCommand.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/NamespacesCommand.java
@@ -37,7 +37,7 @@ import com.google.common.collect.Iterators;
 public class NamespacesCommand extends Command {
   private Option disablePaginationOpt, namespaceIdOption;
 
-  private static final String DEFAULT_NAMESPACE_DISPLAY_NAME = "(default)";
+  private static final String DEFAULT_NAMESPACE_DISPLAY_NAME = "\"\"";
 
   @Override
   public int execute(final String fullCommand, final CommandLine cl, final 
Shell shellState) throws AccumuloException, AccumuloSecurityException, 
IOException {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a8f154e4/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
--
diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java 
b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
index 58652c7..5e6a353 100644
--- a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
@@ -415,9 +415,9 @@ public class ShellServerIT extends SimpleMacIT {
 tableName = tableName + "1";
 
 exec("createtable " + tableName, true);
- 
+
 input.set("customcfcounter\nname1 value1\nname2 value2\n\n");
- 
+
 // Name on the CLI should override OptionDescriber (or user input name, in 
this case)
 exec("setiter -scan -class 
org.apache.accumulo.core.iterators.ColumnFamilyCounter -p 30", true);
 expectedKey = "table.iterator.scan.customcfcounter";
@@ -432,7 +432,7 @@ public class ShellServerIT extends SimpleMacIT {
 
 exec("deletetable " + tableName, true);
 tableName = tableName + "1";
- 
+
 exec("createtable " + tableName, true);
 
 input.set("\nname1 value1.1,value1.2,value1.3\nname2 value2\n\n");
@@ -449,7 +449,7 @@ public class ShellServerIT extends SimpleMacIT {
 expectedValue = "value2";
 checkTableForProperty(tops, tableName, expectedKey, expectedValue);
   }
-  
+
   protected void checkTableForProperty(TableOperations tops, String tableName, 
String expectedKey, String expectedValue) throws Exception {
 for (int i = 0; i < 5; i++) {
   for (Entry entry : tops.getProperties(tableName)) {
@@ -460,7 +460,7 @@ public class ShellServerIT extends SimpleMacIT {
   }
   Thread.sleep(500);
 }
-
+
 fa

[1/2] git commit: ACCUMULO-2317 Apply ClientOpts fix to shell also

[ctubbsii]

Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 7f789ecbd -> a8f154e45


ACCUMULO-2317 Apply ClientOpts fix to shell also


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: ec4bc2fb274003e09fab0107f0b6d37a7df0df3a
Parents: 7f789ec
Author: Christopher Tubbs 
Authored: Wed Feb 5 18:57:59 2014 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 5 18:57:59 2014 -0500

--
 .../core/util/shell/ShellOptionsJC.java | 100 ++-
 1 file changed, 52 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ec4bc2fb/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java 
b/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
index 7032e0d..38692a0 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
@@ -40,12 +40,13 @@ import com.beust.jcommander.converters.FileConverter;
 public class ShellOptionsJC {
   // Use the Shell logger because this is really just an extension.
   public static final Logger log = Logger.getLogger(Shell.class);
-  
+
   @Parameter(names = {"-u", "--user"}, description = "username (defaults to 
your OS user)")
   private String username = System.getProperty("user.name", "root");
-  
+
   public static class PasswordConverter implements IStringConverter {
 public static final String STDIN = "stdin";
+
 private enum KeyType {
   PASS("pass:"), ENV("env:") {
 @Override
@@ -74,49 +75,50 @@ public class ShellOptionsJC {
 public boolean matches(String value) {
   return prefix.equals(value);
 }
-
+
 @Override
 public String convert(String value) {
   // Will check for this later
   return prefix;
 }
   };
-  
+
   String prefix;
-  
+
   private KeyType(String prefix) {
 this.prefix = prefix;
   }
-  
+
   public boolean matches(String value) {
 return value.startsWith(prefix);
   }
-  
+
   public String convert(String value) {
 return process(value.substring(prefix.length()));
   }
-  
+
   String process(String value) {
 return value;
   }
 };
-
+
+@Override
 public String convert(String value) {
   for (KeyType keyType : KeyType.values()) {
 if (keyType.matches(value)) {
   return keyType.convert(value);
 }
   }
-  
+
   return value;
 }
   }
-  
+
   // Note: Don't use "password = true" because then it will prompt even if we 
have a token
   @Parameter(names = {"-p", "--password"}, description = "password (can be 
specified as 'pass:', 'file:', "
   + "'env:', or stdin)", converter = 
PasswordConverter.class)
   private String password;
-  
+
   public static class TokenConverter implements 
IStringConverter {
 @Override
 public AuthenticationToken convert(String value) {
@@ -128,114 +130,116 @@ public class ShellOptionsJC {
   }
 }
   }
-  
+
   @Parameter(names = {"-tc", "--tokenClass"}, description = "token type to 
create, use the -l to pass options", converter = TokenConverter.class)
   private AuthenticationToken authenticationToken;
-  
+
   @DynamicParameter(names = {"-l", "--tokenProperty"}, description = "login 
properties in the format key=value. Reuse -l for each property")
   private Map tokenProperties = new TreeMap();
-  
+
   @Parameter(names = "--disable-tab-completion", description = "disables tab 
completion (for less overhead when scripting)")
   private boolean tabCompletionDisabled;
-  
+
   @Parameter(names = "--debug", description = "enables client debugging")
   private boolean debugEnabled;
-  
+
   @Parameter(names = "--fake", description = "fake a connection to accumulo")
   private boolean fake;
-  
+
   @Parameter(names = {"-?", "--help"}, help = true, description = "display 
this help")
   private boolean helpEnabled;
-  
+
   @Parameter(names = {"-e", "--execute-command"}, description = "executes a 
command, and then exits")
   private String execCommand;
-  
+
   @Parameter(names = {"-f", "--execute-file"}, description = "executes 
commands from a file at startup", converter = FileConverter.class)
   private File execFile;
-  
+
   @Parameter(names = {"-fv", "--execute-file-verbose"}, description = 
"executes commands from a file at startup, with 

git commit: ACCUMULO-2092 Make client view of table existence consistent

[ctubbsii]

Updated Branches:
  refs/heads/1.6.0-SNAPSHOT a8f154e45 -> b0b2c4992


ACCUMULO-2092 Make client view of table existence consistent

  Clear the cache after exceptions, instead of just successful fate
  operations. This ensures that a failure as the result of a
  TableNotFoundException or TableExistsException will be consistent with
  the client's view, if they check it right after the failure.


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: b0b2c49925735ca02019773e31c0ebee0e4a4260
Parents: a8f154e
Author: Christopher Tubbs 
Authored: Wed Feb 5 19:14:06 2014 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 5 19:14:06 2014 -0500

--
 .../core/client/admin/TableOperationsImpl.java| 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b0b2c499/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
 
b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
index f459275..0245ef1 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
@@ -309,7 +309,6 @@ public class TableOperationsImpl extends 
TableOperationsHelper {
 return null;
   }
   String ret = waitForFateOperation(opid);
-  Tables.clearCache(instance);
   return ret;
 } catch (ThriftSecurityException e) {
   String tableName = ByteBufferUtil.toString(args.get(0));
@@ -340,6 +339,7 @@ public class TableOperationsImpl extends 
TableOperationsHelper {
 } catch (Exception e) {
   throw new AccumuloException(e.getMessage(), e);
 } finally {
+  Tables.clearCache(instance);
   // always finish table op, even when exception
   if (opid != null)
 try {
@@ -528,8 +528,8 @@ public class TableOperationsImpl extends 
TableOperationsHelper {
 
 ArgumentChecker.notNull(tableName);
 ByteBuffer EMPTY = ByteBuffer.allocate(0);
-List args = 
Arrays.asList(ByteBuffer.wrap(tableName.getBytes(Constants.UTF8)), start == 
null ? EMPTY : TextUtil.getByteBuffer(start), end == null ? EMPTY
-: TextUtil.getByteBuffer(end));
+List args = 
Arrays.asList(ByteBuffer.wrap(tableName.getBytes(Constants.UTF8)), start == 
null ? EMPTY : TextUtil.getByteBuffer(start),
+end == null ? EMPTY : TextUtil.getByteBuffer(end));
 Map opts = new HashMap();
 try {
   doTableFateOperation(tableName, TableNotFoundException.class, 
FateOperation.TABLE_MERGE, args, opts);
@@ -544,8 +544,8 @@ public class TableOperationsImpl extends 
TableOperationsHelper {
 
 ArgumentChecker.notNull(tableName);
 ByteBuffer EMPTY = ByteBuffer.allocate(0);
-List args = 
Arrays.asList(ByteBuffer.wrap(tableName.getBytes(Constants.UTF8)), start == 
null ? EMPTY : TextUtil.getByteBuffer(start), end == null ? EMPTY
-: TextUtil.getByteBuffer(end));
+List args = 
Arrays.asList(ByteBuffer.wrap(tableName.getBytes(Constants.UTF8)), start == 
null ? EMPTY : TextUtil.getByteBuffer(start),
+end == null ? EMPTY : TextUtil.getByteBuffer(end));
 Map opts = new HashMap();
 try {
   doTableFateOperation(tableName, TableNotFoundException.class, 
FateOperation.TABLE_DELETE_RANGE, args, opts);
@@ -787,8 +787,8 @@ public class TableOperationsImpl extends 
TableOperationsHelper {
 if (flush)
   _flush(tableId, start, end, true);
 
-List args = 
Arrays.asList(ByteBuffer.wrap(tableId.getBytes(Constants.UTF8)), start == null 
? EMPTY : TextUtil.getByteBuffer(start), end == null ? EMPTY
-: TextUtil.getByteBuffer(end), 
ByteBuffer.wrap(IteratorUtil.encodeIteratorSettings(iterators)));
+List args = 
Arrays.asList(ByteBuffer.wrap(tableId.getBytes(Constants.UTF8)), start == null 
? EMPTY : TextUtil.getByteBuffer(start),
+end == null ? EMPTY : TextUtil.getByteBuffer(end), 
ByteBuffer.wrap(IteratorUtil.encodeIteratorSettings(iterators)));
 
 Map opts = new HashMap();
 try {

[3/6] git commit: ACCUMULO-2317 Apply ClientOpts fix to shell also

[ctubbsii]

ACCUMULO-2317 Apply ClientOpts fix to shell also


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

Branch: refs/heads/master
Commit: ec4bc2fb274003e09fab0107f0b6d37a7df0df3a
Parents: 7f789ec
Author: Christopher Tubbs 
Authored: Wed Feb 5 18:57:59 2014 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 5 18:57:59 2014 -0500

--
 .../core/util/shell/ShellOptionsJC.java | 100 ++-
 1 file changed, 52 insertions(+), 48 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ec4bc2fb/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java 
b/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
index 7032e0d..38692a0 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/ShellOptionsJC.java
@@ -40,12 +40,13 @@ import com.beust.jcommander.converters.FileConverter;
 public class ShellOptionsJC {
   // Use the Shell logger because this is really just an extension.
   public static final Logger log = Logger.getLogger(Shell.class);
-  
+
   @Parameter(names = {"-u", "--user"}, description = "username (defaults to 
your OS user)")
   private String username = System.getProperty("user.name", "root");
-  
+
   public static class PasswordConverter implements IStringConverter {
 public static final String STDIN = "stdin";
+
 private enum KeyType {
   PASS("pass:"), ENV("env:") {
 @Override
@@ -74,49 +75,50 @@ public class ShellOptionsJC {
 public boolean matches(String value) {
   return prefix.equals(value);
 }
-
+
 @Override
 public String convert(String value) {
   // Will check for this later
   return prefix;
 }
   };
-  
+
   String prefix;
-  
+
   private KeyType(String prefix) {
 this.prefix = prefix;
   }
-  
+
   public boolean matches(String value) {
 return value.startsWith(prefix);
   }
-  
+
   public String convert(String value) {
 return process(value.substring(prefix.length()));
   }
-  
+
   String process(String value) {
 return value;
   }
 };
-
+
+@Override
 public String convert(String value) {
   for (KeyType keyType : KeyType.values()) {
 if (keyType.matches(value)) {
   return keyType.convert(value);
 }
   }
-  
+
   return value;
 }
   }
-  
+
   // Note: Don't use "password = true" because then it will prompt even if we 
have a token
   @Parameter(names = {"-p", "--password"}, description = "password (can be 
specified as 'pass:', 'file:', "
   + "'env:', or stdin)", converter = 
PasswordConverter.class)
   private String password;
-  
+
   public static class TokenConverter implements 
IStringConverter {
 @Override
 public AuthenticationToken convert(String value) {
@@ -128,114 +130,116 @@ public class ShellOptionsJC {
   }
 }
   }
-  
+
   @Parameter(names = {"-tc", "--tokenClass"}, description = "token type to 
create, use the -l to pass options", converter = TokenConverter.class)
   private AuthenticationToken authenticationToken;
-  
+
   @DynamicParameter(names = {"-l", "--tokenProperty"}, description = "login 
properties in the format key=value. Reuse -l for each property")
   private Map tokenProperties = new TreeMap();
-  
+
   @Parameter(names = "--disable-tab-completion", description = "disables tab 
completion (for less overhead when scripting)")
   private boolean tabCompletionDisabled;
-  
+
   @Parameter(names = "--debug", description = "enables client debugging")
   private boolean debugEnabled;
-  
+
   @Parameter(names = "--fake", description = "fake a connection to accumulo")
   private boolean fake;
-  
+
   @Parameter(names = {"-?", "--help"}, help = true, description = "display 
this help")
   private boolean helpEnabled;
-  
+
   @Parameter(names = {"-e", "--execute-command"}, description = "executes a 
command, and then exits")
   private String execCommand;
-  
+
   @Parameter(names = {"-f", "--execute-file"}, description = "executes 
commands from a file at startup", converter = FileConverter.class)
   private File execFile;
-  
+
   @Parameter(names = {"-fv", "--execute-file-verbose"}, description = 
"executes commands from a file at startup, with commands shown",
   converter = FileConverter.class)
   private File execFi

[2/6] git commit: ACCUMULO-2114 Move built-in namespace names to a method

[ctubbsii]

ACCUMULO-2114 Move built-in namespace names to a method


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

Branch: refs/heads/master
Commit: 7f789ecbdcb902f9a14ddb2192ffa5a42bb2787b
Parents: 7820120
Author: Christopher Tubbs 
Authored: Wed Feb 5 15:53:08 2014 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 5 15:53:08 2014 -0500

--
 .../accumulo/core/client/ClientConstants.java   | 22 ---
 .../core/client/admin/NamespaceOperations.java  | 23 
 .../client/admin/NamespaceOperationsHelper.java | 11 ++
 .../accumulo/core/client/impl/Namespaces.java   |  3 +--
 .../org/apache/accumulo/test/NamespacesIT.java  |  8 ++-
 5 files changed, 38 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7f789ecb/core/src/main/java/org/apache/accumulo/core/client/ClientConstants.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/ClientConstants.java 
b/core/src/main/java/org/apache/accumulo/core/client/ClientConstants.java
deleted file mode 100644
index 4514e82..000
--- a/core/src/main/java/org/apache/accumulo/core/client/ClientConstants.java
+++ /dev/null
@@ -1,22 +0,0 @@
-/*
- * 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.core.client;
-
-
-public class ClientConstants {
-  public static final String DEFAULT_NAMESPACE = "";
-}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7f789ecb/core/src/main/java/org/apache/accumulo/core/client/admin/NamespaceOperations.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/admin/NamespaceOperations.java
 
b/core/src/main/java/org/apache/accumulo/core/client/admin/NamespaceOperations.java
index 269e563..c6dff92 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/admin/NamespaceOperations.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/admin/NamespaceOperations.java
@@ -40,6 +40,22 @@ import 
org.apache.accumulo.core.iterators.IteratorUtil.IteratorScope;
 public interface NamespaceOperations {
 
   /**
+   * Returns the name of the system reserved namespace
+   * 
+   * @return the name of the system namespace
+   * @since 1.6.0
+   */
+  String systemNamespace();
+
+  /**
+   * Returns the name of the default namespace
+   * 
+   * @return the name of the default namespace
+   * @since 1.6.0
+   */
+  String defaultNamespace();
+
+  /**
* Retrieve a list of namespaces in Accumulo.
* 
* @return List of namespaces in accumulo
@@ -293,8 +309,8 @@ public interface NamespaceOperations {
*   if the specified namespace doesn't exist
* @since 1.6.0
*/
-  void checkIteratorConflicts(String namespace, IteratorSetting setting, 
EnumSet scopes) throws AccumuloException,
-  AccumuloSecurityException, NamespaceNotFoundException;
+  void checkIteratorConflicts(String namespace, IteratorSetting setting, 
EnumSet scopes) throws AccumuloException, 
AccumuloSecurityException,
+  NamespaceNotFoundException;
 
   /**
* Add a new constraint to a namespace.
@@ -365,6 +381,5 @@ public interface NamespaceOperations {
*   if the specified namespace doesn't exist
* @since 1.6.0
*/
-  boolean testClassLoad(String namespace, String className, String asTypeName) 
throws AccumuloException, AccumuloSecurityException,
-  NamespaceNotFoundException;
+  boolean testClassLoad(String namespace, String className, String asTypeName) 
throws AccumuloException, AccumuloSecurityException, NamespaceNotFoundException;
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7f789ecb/core/src/main/java/org/apache/accumulo/core/client/admin/NamespaceOperationsHelper.java
-

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

[ctubbsii]

Merge remote-tracking branch 'origin/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/275d7941
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/275d7941
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/275d7941

Branch: refs/heads/master
Commit: 275d7941b3215087d068ea6924b87bac7462f821
Parents: fcc17fc b0b2c49
Author: Christopher Tubbs 
Authored: Wed Feb 5 19:26:45 2014 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 5 19:26:45 2014 -0500

--
 .../core/client/ClientConfiguration.java|   2 +-
 .../accumulo/core/client/ClientConstants.java   |  22 ---
 .../core/client/admin/NamespaceOperations.java  |  23 +++-
 .../client/admin/NamespaceOperationsHelper.java |  11 ++
 .../core/client/admin/TableOperationsImpl.java  |  14 +-
 .../accumulo/core/client/impl/Namespaces.java   |   3 +-
 .../lib/partition/RangePartitioner.java |  27 ++--
 .../apache/accumulo/core/util/shell/Shell.java  |   4 +-
 .../core/util/shell/ShellOptionsJC.java | 100 +++---
 .../util/shell/commands/NamespacesCommand.java  |   2 +-
 .../mapreduce/AccumuloInputFormatTest.java  |   3 +-
 .../apache/accumulo/fate/util/AddressUtil.java  |  27 ++--
 .../minicluster/MiniAccumuloCluster.java|   1 -
 .../accumulo/server/util/SendLogToChainsaw.java |  69 +-
 .../org/apache/accumulo/test/VerifyIngest.java  |  89 ++--
 .../test/continuous/UndefinedAnalyzer.java  | 134 ++-
 .../org/apache/accumulo/test/NamespacesIT.java  |   8 +-
 .../org/apache/accumulo/test/ShellServerIT.java |  13 +-
 .../accumulo/test/functional/TabletIT.java  |   2 -
 19 files changed, 284 insertions(+), 270 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/275d7941/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
--

[1/6] git commit: ACCUMULO-1961 Fix/remove some more trivial warnings

[ctubbsii]

Updated Branches:
  refs/heads/master fcc17fc0a -> 275d7941b


ACCUMULO-1961 Fix/remove some more trivial warnings


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

Branch: refs/heads/master
Commit: 7820120fb2ce4c18317ab77b6439197084ceac8f
Parents: a72dd78
Author: Christopher Tubbs 
Authored: Wed Feb 5 15:36:27 2014 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 5 15:36:27 2014 -0500

--
 .../core/client/ClientConfiguration.java|   2 +-
 .../lib/partition/RangePartitioner.java |  27 ++--
 .../mapreduce/AccumuloInputFormatTest.java  |   3 +-
 .../apache/accumulo/fate/util/AddressUtil.java  |  27 ++--
 .../minicluster/MiniAccumuloCluster.java|   2 -
 .../impl/MiniAccumuloConfigImpl.java|   2 -
 .../accumulo/server/util/SendLogToChainsaw.java |  69 +-
 .../org/apache/accumulo/test/VerifyIngest.java  |  89 ++--
 .../test/continuous/UndefinedAnalyzer.java  | 134 ++-
 .../accumulo/test/functional/TabletIT.java  |   2 -
 10 files changed, 177 insertions(+), 180 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7820120f/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java 
b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
index a3d51cf..b0ae537 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/ClientConfiguration.java
@@ -128,7 +128,7 @@ public class ClientConfiguration extends 
CompositeConfiguration {
* the one in the configuration.
* 
* @see PropertiesConfiguration
-   * @see File.pathSeparator
+   * @see File#pathSeparator
*/
   public static ClientConfiguration loadDefault() {
 return loadFromSearchPath(getDefaultSearchPath());

http://git-wip-us.apache.org/repos/asf/accumulo/blob/7820120f/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
 
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
index 3cb69ad..1569579 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/mapreduce/lib/partition/RangePartitioner.java
@@ -19,7 +19,6 @@ package 
org.apache.accumulo.core.client.mapreduce.lib.partition;
 import java.io.BufferedReader;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.net.URI;
@@ -45,9 +44,9 @@ public class RangePartitioner extends 
Partitioner implements Conf
   private static final String PREFIX = RangePartitioner.class.getName();
   private static final String CUTFILE_KEY = PREFIX + ".cutFile";
   private static final String NUM_SUBBINS = PREFIX + ".subBins";
-  
+
   private Configuration conf;
-  
+
   @Override
   public int getPartition(Text key, Writable value, int numPartitions) {
 try {
@@ -56,21 +55,21 @@ public class RangePartitioner extends 
Partitioner implements Conf
   throw new RuntimeException(e);
 }
   }
-  
+
   int findPartition(Text key, Text[] array, int numSubBins) {
 // find the bin for the range, and guarantee it is positive
 int index = Arrays.binarySearch(array, key);
 index = index < 0 ? (index + 1) * -1 : index;
-
+
 // both conditions work with numSubBins == 1, but this check is to avoid
 // hashing, when we don't need to, for speed
 if (numSubBins < 2)
   return index;
 return (key.toString().hashCode() & Integer.MAX_VALUE) % numSubBins + 
index * numSubBins;
   }
-  
+
   private int _numSubBins = 0;
-  
+
   private synchronized int getNumSubBins() {
 if (_numSubBins < 1) {
   // get number of sub-bins and guarantee it is positive
@@ -78,14 +77,14 @@ public class RangePartitioner extends 
Partitioner implements Conf
 }
 return _numSubBins;
   }
-  
+
   private Text cutPointArray[] = null;
-  
+
   private synchronized Text[] getCutPoints() throws IOException {
 if (cutPointArray == null) {
   String cutFileName = conf.get(CUTFILE_KEY);
   Path[] cf = DistributedCacheHelper.getLocalCacheFiles(conf);
-   

[4/6] git commit: ACCUMULO-1989 Use default namespace name explicitly in shell

[ctubbsii]

ACCUMULO-1989 Use default namespace name explicitly in shell


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

Branch: refs/heads/master
Commit: a8f154e45d60304827e681d6a74cc7f9dc3aab94
Parents: ec4bc2f
Author: Christopher Tubbs 
Authored: Wed Feb 5 18:59:56 2014 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 5 18:59:56 2014 -0500

--
 .../org/apache/accumulo/core/util/shell/Shell.java |  4 ++--
 .../core/util/shell/commands/NamespacesCommand.java|  2 +-
 .../java/org/apache/accumulo/test/ShellServerIT.java   | 13 +++--
 3 files changed, 10 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a8f154e4/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java 
b/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
index e4a01f9..7f1b8dc 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
@@ -751,8 +751,7 @@ public class Shell extends ShellOptions {
   modifiedUserlist.add(a.replaceAll("([\\s'\"])", "$1"));
 for (String a : namespaces) {
   String b = a.replaceAll("([\\s'\"])", "$1");
-  if (!b.isEmpty())
-modifiedNamespaces.add(b);
+  modifiedNamespaces.add(b.isEmpty() ? "\"\"" : b);
 }
 
 options.put(Command.CompletionSet.USERNAMES, modifiedUserlist);
@@ -881,6 +880,7 @@ public class Shell extends ShellOptions {
 
   public interface PrintLine {
 void print(String s);
+
 void close();
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a8f154e4/core/src/main/java/org/apache/accumulo/core/util/shell/commands/NamespacesCommand.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/NamespacesCommand.java
 
b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/NamespacesCommand.java
index 7f41c32..16ee645 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/NamespacesCommand.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/NamespacesCommand.java
@@ -37,7 +37,7 @@ import com.google.common.collect.Iterators;
 public class NamespacesCommand extends Command {
   private Option disablePaginationOpt, namespaceIdOption;
 
-  private static final String DEFAULT_NAMESPACE_DISPLAY_NAME = "(default)";
+  private static final String DEFAULT_NAMESPACE_DISPLAY_NAME = "\"\"";
 
   @Override
   public int execute(final String fullCommand, final CommandLine cl, final 
Shell shellState) throws AccumuloException, AccumuloSecurityException, 
IOException {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a8f154e4/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
--
diff --git a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java 
b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
index 58652c7..5e6a353 100644
--- a/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
+++ b/test/src/test/java/org/apache/accumulo/test/ShellServerIT.java
@@ -415,9 +415,9 @@ public class ShellServerIT extends SimpleMacIT {
 tableName = tableName + "1";
 
 exec("createtable " + tableName, true);
- 
+
 input.set("customcfcounter\nname1 value1\nname2 value2\n\n");
- 
+
 // Name on the CLI should override OptionDescriber (or user input name, in 
this case)
 exec("setiter -scan -class 
org.apache.accumulo.core.iterators.ColumnFamilyCounter -p 30", true);
 expectedKey = "table.iterator.scan.customcfcounter";
@@ -432,7 +432,7 @@ public class ShellServerIT extends SimpleMacIT {
 
 exec("deletetable " + tableName, true);
 tableName = tableName + "1";
- 
+
 exec("createtable " + tableName, true);
 
 input.set("\nname1 value1.1,value1.2,value1.3\nname2 value2\n\n");
@@ -449,7 +449,7 @@ public class ShellServerIT extends SimpleMacIT {
 expectedValue = "value2";
 checkTableForProperty(tops, tableName, expectedKey, expectedValue);
   }
-  
+
   protected void checkTableForProperty(TableOperations tops, String tableName, 
String expectedKey, String expectedValue) throws Exception {
 for (int i = 0; i < 5; i++) {
   for (Entry entry : tops.getProperties(tableName)) {
@@ -460,7 +460,7 @@ public class ShellServerIT extends SimpleMacIT {
   }
   Thread.sleep(500);
 }
-
+
 fail("Fail

[5/6] git commit: ACCUMULO-2092 Make client view of table existence consistent

[ctubbsii]

ACCUMULO-2092 Make client view of table existence consistent

  Clear the cache after exceptions, instead of just successful fate
  operations. This ensures that a failure as the result of a
  TableNotFoundException or TableExistsException will be consistent with
  the client's view, if they check it right after the failure.


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

Branch: refs/heads/master
Commit: b0b2c49925735ca02019773e31c0ebee0e4a4260
Parents: a8f154e
Author: Christopher Tubbs 
Authored: Wed Feb 5 19:14:06 2014 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 5 19:14:06 2014 -0500

--
 .../core/client/admin/TableOperationsImpl.java| 14 +++---
 1 file changed, 7 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b0b2c499/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
 
b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
index f459275..0245ef1 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/admin/TableOperationsImpl.java
@@ -309,7 +309,6 @@ public class TableOperationsImpl extends 
TableOperationsHelper {
 return null;
   }
   String ret = waitForFateOperation(opid);
-  Tables.clearCache(instance);
   return ret;
 } catch (ThriftSecurityException e) {
   String tableName = ByteBufferUtil.toString(args.get(0));
@@ -340,6 +339,7 @@ public class TableOperationsImpl extends 
TableOperationsHelper {
 } catch (Exception e) {
   throw new AccumuloException(e.getMessage(), e);
 } finally {
+  Tables.clearCache(instance);
   // always finish table op, even when exception
   if (opid != null)
 try {
@@ -528,8 +528,8 @@ public class TableOperationsImpl extends 
TableOperationsHelper {
 
 ArgumentChecker.notNull(tableName);
 ByteBuffer EMPTY = ByteBuffer.allocate(0);
-List args = 
Arrays.asList(ByteBuffer.wrap(tableName.getBytes(Constants.UTF8)), start == 
null ? EMPTY : TextUtil.getByteBuffer(start), end == null ? EMPTY
-: TextUtil.getByteBuffer(end));
+List args = 
Arrays.asList(ByteBuffer.wrap(tableName.getBytes(Constants.UTF8)), start == 
null ? EMPTY : TextUtil.getByteBuffer(start),
+end == null ? EMPTY : TextUtil.getByteBuffer(end));
 Map opts = new HashMap();
 try {
   doTableFateOperation(tableName, TableNotFoundException.class, 
FateOperation.TABLE_MERGE, args, opts);
@@ -544,8 +544,8 @@ public class TableOperationsImpl extends 
TableOperationsHelper {
 
 ArgumentChecker.notNull(tableName);
 ByteBuffer EMPTY = ByteBuffer.allocate(0);
-List args = 
Arrays.asList(ByteBuffer.wrap(tableName.getBytes(Constants.UTF8)), start == 
null ? EMPTY : TextUtil.getByteBuffer(start), end == null ? EMPTY
-: TextUtil.getByteBuffer(end));
+List args = 
Arrays.asList(ByteBuffer.wrap(tableName.getBytes(Constants.UTF8)), start == 
null ? EMPTY : TextUtil.getByteBuffer(start),
+end == null ? EMPTY : TextUtil.getByteBuffer(end));
 Map opts = new HashMap();
 try {
   doTableFateOperation(tableName, TableNotFoundException.class, 
FateOperation.TABLE_DELETE_RANGE, args, opts);
@@ -787,8 +787,8 @@ public class TableOperationsImpl extends 
TableOperationsHelper {
 if (flush)
   _flush(tableId, start, end, true);
 
-List args = 
Arrays.asList(ByteBuffer.wrap(tableId.getBytes(Constants.UTF8)), start == null 
? EMPTY : TextUtil.getByteBuffer(start), end == null ? EMPTY
-: TextUtil.getByteBuffer(end), 
ByteBuffer.wrap(IteratorUtil.encodeIteratorSettings(iterators)));
+List args = 
Arrays.asList(ByteBuffer.wrap(tableId.getBytes(Constants.UTF8)), start == null 
? EMPTY : TextUtil.getByteBuffer(start),
+end == null ? EMPTY : TextUtil.getByteBuffer(end), 
ByteBuffer.wrap(IteratorUtil.encodeIteratorSettings(iterators)));
 
 Map opts = new HashMap();
 try {

Git Push Summary

[ctubbsii]

Repository: accumulo
Updated Branches:
  refs/heads/INFRA-7312-test [created] b0a1f6d61

Git Push Summary

[ctubbsii]

Repository: accumulo
Updated Branches:
  refs/heads/INFRA-7312-test [deleted] b0a1f6d61

Git Push Summary

[ctubbsii]

Repository: accumulo-wikisearch
Updated Branches:
  refs/heads/INFRA-7312-test [created] f11759eb5

Git Push Summary

[ctubbsii]

Repository: accumulo-wikisearch
Updated Branches:
  refs/heads/INFRA-7312-test [deleted] 78a7ca1a3

Git Push Summary

[ctubbsii]

Repository: accumulo-wikisearch
Updated Branches:
  refs/heads/INFRA-7312-test f11759eb5 -> 78a7ca1a3 (forced update)

git commit: ACCUMULO-1961 Fix more recently introduced javadoc problems.

[ctubbsii]

Repository: accumulo
Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 732f037ea -> 4abb3f1af


ACCUMULO-1961 Fix more recently introduced javadoc problems.


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 4abb3f1afd7c0f44cb71671148629cfcbbf5746f
Parents: 732f037
Author: Christopher Tubbs 
Authored: Tue Feb 18 15:33:36 2014 -0500
Committer: Christopher Tubbs 
Committed: Tue Feb 18 15:33:36 2014 -0500

--
 .../java/org/apache/accumulo/core/client/Instance.java| 10 --
 .../accumulo/server/watcher/MonitorLog4jWatcher.java  | 10 ++
 2 files changed, 6 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4abb3f1a/core/src/main/java/org/apache/accumulo/core/client/Instance.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/client/Instance.java 
b/core/src/main/java/org/apache/accumulo/core/client/Instance.java
index c6f6f33..05cc7f2 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/Instance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/Instance.java
@@ -121,14 +121,13 @@ public interface Instance {
*/
   @Deprecated
   Connector getConnector(String user, CharSequence pass) throws 
AccumuloException, AccumuloSecurityException;
-  
+
   /**
* Returns the AccumuloConfiguration to use when interacting with this 
instance.
* 
* @return the AccumuloConfiguration that specifies properties related to 
interacting with this instance
-   * @deprecated since 1.6.0.
-   * This method makes very little sense in the context of the client API and 
never should have been exposed.
-   * @see {@link InstanceOperations#getConfiguration()} for client-side 
reading of the server-side configuration.
+   * @deprecated since 1.6.0. This method makes very little sense in the 
context of the client API and never should have been exposed.
+   * @see {@link InstanceOperations#getSystemConfiguration()} for client-side 
reading of the server-side configuration.
*/
   @Deprecated
   AccumuloConfiguration getConfiguration();
@@ -138,8 +137,7 @@ public interface Instance {
* 
* @param conf
*  accumulo configuration
-   * @deprecated since 1.6.0.
-   * This method makes very little sense in the context of the client API and 
never should have been exposed.
+   * @deprecated since 1.6.0. This method makes very little sense in the 
context of the client API and never should have been exposed.
* @see {@link InstanceOperations#setProperty(String, String)}
*/
   @Deprecated

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4abb3f1a/server/base/src/main/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcher.java
--
diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcher.java
 
b/server/base/src/main/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcher.java
index d0ca27f..ac3426e 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcher.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/watcher/MonitorLog4jWatcher.java
@@ -43,12 +43,6 @@ public class MonitorLog4jWatcher extends FileWatchdog 
implements Watcher {
   private boolean loggingDisabled = false;
   protected String path;
 
-  /**
-   * @param zkPath
-   * @param filename
-   * @param delay
-   * @param propertyName
-   */
   public MonitorLog4jWatcher(String instance, String filename, int delay) {
 super(filename);
 setDelay(delay);
@@ -78,7 +72,7 @@ public class MonitorLog4jWatcher extends FileWatchdog 
implements Watcher {
   resetLogger();
   return;
 }
-
+
 synchronized (lock) {
   // We might triggered by file-reloading or from ZK update.
   // Either way will result in log-forwarding being restarted
@@ -87,7 +81,7 @@ public class MonitorLog4jWatcher extends FileWatchdog 
implements Watcher {
   resetLogger();
 }
   }
-  
+
   private void resetLogger() {
 // Force a reset on the logger's configuration
 LogManager.resetConfiguration();

git commit: ACCUMULO-1961 Re-apply inadvertently dropped 4abb3f1 to master branch

[ctubbsii]

Repository: accumulo
Updated Branches:
  refs/heads/master 47a1a72a7 -> dcc19ccba


ACCUMULO-1961 Re-apply inadvertently dropped 4abb3f1 to master branch

  Fixes trivial warnings and broken javadocs which have been recently
  introduced. Specifically, removes references to private and
  package-private (default) classes in public javadoc comments (internal
  details aren't relevant to the API and subject to change). Another
  common warning was unused imports and javadoc param tags that refer to
  non-existent parameters.

  Commits against the following JIRA issues introduced these:
  ACCUMULO-1948, ACCUMULO-1974, ACCUMULO-2021, ACCUMULO-2136,
  ACCUMULO-2322, ACCUMULO-2334, ACCUMULO-2350


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

Branch: refs/heads/master
Commit: dcc19ccbada8c2f0a206ec797455294015e8ca6d
Parents: 47a1a72
Author: Christopher Tubbs 
Authored: Wed Feb 19 14:59:58 2014 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 19 14:59:58 2014 -0500

--
 .../apache/accumulo/core/client/Instance.java   |  36 +++---
 .../org/apache/accumulo/core/conf/Property.java |  87 +++---
 .../accumulo/core/util/ValidatorTest.java   |   6 +-
 .../java/org/apache/accumulo/fate/Fate.java |  67 ++-
 .../server/watcher/MonitorLog4jWatcher.java |  10 +-
 .../tserver/log/TabletServerLogger.java | 112 ++-
 .../tserver/TabletResourceManagerTest.java  |   8 +-
 7 files changed, 158 insertions(+), 168 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/dcc19ccb/core/src/main/java/org/apache/accumulo/core/client/Instance.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/client/Instance.java 
b/core/src/main/java/org/apache/accumulo/core/client/Instance.java
index c6f6f33..bcdd0e5 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/Instance.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/Instance.java
@@ -26,54 +26,54 @@ import org.apache.accumulo.core.conf.AccumuloConfiguration;
 
 /**
  * This class represents the information a client needs to know to connect to 
an instance of accumulo.
- * 
+ *
  */
 public interface Instance {
   /**
* Returns the location of the tablet server that is serving the root tablet.
-   * 
+   *
* @return location in "hostname:port" form
*/
   String getRootTabletLocation();
 
   /**
* Returns the location(s) of the accumulo master and any redundant servers.
-   * 
+   *
* @return a list of locations in "hostname:port" form
*/
   List getMasterLocations();
 
   /**
* Returns a unique string that identifies this instance of accumulo.
-   * 
+   *
* @return a UUID
*/
   String getInstanceID();
 
   /**
* Returns the instance name given at system initialization time.
-   * 
+   *
* @return current instance name
*/
   String getInstanceName();
 
   /**
* Returns a comma-separated list of zookeeper servers the instance is using.
-   * 
+   *
* @return the zookeeper servers this instance is using in "hostname:port" 
form
*/
   String getZooKeepers();
 
   /**
* Returns the zookeeper connection timeout.
-   * 
+   *
* @return the configured timeout to connect to zookeeper
*/
   int getZooKeepersSessionTimeOut();
 
   /**
* Returns a connection to accumulo.
-   * 
+   *
* @param user
*  a valid accumulo user
* @param pass
@@ -90,7 +90,7 @@ public interface Instance {
 
   /**
* Returns a connection to accumulo.
-   * 
+   *
* @param user
*  a valid accumulo user
* @param pass
@@ -107,7 +107,7 @@ public interface Instance {
 
   /**
* Returns a connection to this instance of accumulo.
-   * 
+   *
* @param user
*  a valid accumulo user
* @param pass
@@ -121,25 +121,23 @@ public interface Instance {
*/
   @Deprecated
   Connector getConnector(String user, CharSequence pass) throws 
AccumuloException, AccumuloSecurityException;
-  
+
   /**
* Returns the AccumuloConfiguration to use when interacting with this 
instance.
-   * 
+   *
* @return the AccumuloConfiguration that specifies properties related to 
interacting with this instance
-   * @deprecated since 1.6.0.
-   * This method makes very little sense in the context of the client API and 
never should have been exposed.
-   * @see {@link InstanceOperations#getConfiguration()} for client-side 
reading of the server-side configuration.
+   * @deprecated since 1.6.0. This method makes very little sense in the 
context of the client API and never should ha

git commit: ACCUMULO-2411 Fix warnings in 1.5 branch

[ctubbsii]

Repository: accumulo
Updated Branches:
  refs/heads/1.5.1-SNAPSHOT 625801848 -> e2efee6d5


ACCUMULO-2411 Fix warnings in 1.5 branch

  Remove useless/no-op/broken javadocs and unused warnings. Isolate and
  suppress deprecation warning related to hadoop FileSystem replication
  support across HDFS versions.


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

Branch: refs/heads/1.5.1-SNAPSHOT
Commit: e2efee6d58f1ad67554134dddbfb3f28df025f3a
Parents: 6258018
Author: Christopher Tubbs 
Authored: Wed Feb 26 14:35:36 2014 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 26 14:35:36 2014 -0500

--
 .../apache/accumulo/fate/util/AddressUtil.java  | 27 ++--
 .../server/tabletserver/log/DfsLogger.java  | 44 +++-
 .../server/watcher/MonitorLog4jWatcher.java | 10 +
 3 files changed, 30 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e2efee6d/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java
--
diff --git a/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java 
b/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java
index 7a8c269..fce7a62 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java
@@ -16,7 +16,7 @@
  */
 package org.apache.accumulo.fate.util;
 
-import java.net.InetAddress; // workaround to enable @see/@link hyperlink
+import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.security.Security;
 
@@ -27,28 +27,29 @@ public class AddressUtil {
   private static final Logger log = Logger.getLogger(AddressUtil.class);
 
   /**
-   * Fetch the security value that determines how long DNS failures are cached.
-   * Looks up the security property 'networkaddress.cache.negative.ttl'. 
Should that fail returns
-   * the default value used in the Oracle JVM 1.4+, which is 10 seconds.
-   *
-   * @param originalException the host lookup that is the source of needing 
this lookup. maybe be null.
+   * Fetch the security value that determines how long DNS failures are 
cached. Looks up the security property 'networkaddress.cache.negative.ttl'. 
Should that
+   * fail returns the default value used in the Oracle JVM 1.4+, which is 10 
seconds.
+   * 
+   * @param originalException
+   *  the host lookup that is the source of needing this lookup. maybe 
be null.
* @return positive integer number of seconds
-   * @see java.net.InetAddress
-   * @throws IllegalArgumentException if dns failures are cached forever
+   * @see InetAddress
+   * @throws IllegalArgumentException
+   *   if dns failures are cached forever
*/
   static public int getAddressCacheNegativeTtl(UnknownHostException 
originalException) {
 int negativeTtl = 10;
 try {
   negativeTtl = 
Integer.parseInt(Security.getProperty("networkaddress.cache.negative.ttl"));
 } catch (NumberFormatException exception) {
-  log.warn("Failed to get JVM negative DNS respones cache TTL due to 
format problem (e.g. this JVM might not have the " +
-"property). Falling back to default based on Oracle JVM 1.6 
(10s)", exception);
+  log.warn("Failed to get JVM negative DNS respones cache TTL due to 
format problem (e.g. this JVM might not have the "
+  + "property). Falling back to default based on Oracle JVM 1.6 
(10s)", exception);
 } catch (SecurityException exception) {
   log.warn("Failed to get JVM negative DNS response cache TTL due to 
security manager. Falling back to default based on Oracle JVM 1.6 (10s)", 
exception);
 }
 if (-1 == negativeTtl) {
-  log.error("JVM negative DNS repsonse cache TTL is set to 'forever' and 
host lookup failed. TTL can be changed with security property " +
-"'networkaddress.cache.negative.ttl', see 
java.net.InetAddress.", originalException);
+  log.error("JVM negative DNS repsonse cache TTL is set to 'forever' and 
host lookup failed. TTL can be changed with security property "
+  + "'networkaddress.cache.negative.ttl', see java.net.InetAddress.", 
originalException);
   throw new IllegalArgumentException(originalException);
 } else if (0 > negativeTtl) {
   log.warn("JVM specified negative DNS response cache TTL was negative 
(and not 'forever'). Falling back to default based on Oracle JVM 1.6 (10s)");
@@ -56,5 +57,5 @@ public class AddressUtil {
 }
 return negativeTtl;
   }
-  
+
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e2efee

[2/3] git commit: Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT

[ctubbsii]

Merge branch '1.5.1-SNAPSHOT' of 
https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 5dba407cce3da15900b0fbbecea234ee55943dbf
Parents: 0bd62e3 e2efee6
Author: Eric Newton 
Authored: Wed Feb 26 14:40:51 2014 -0500
Committer: Eric Newton 
Committed: Wed Feb 26 14:40:51 2014 -0500

--
 .../apache/accumulo/fate/util/AddressUtil.java  | 27 ++--
 .../server/tabletserver/log/DfsLogger.java  | 44 +++-
 .../server/watcher/MonitorLog4jWatcher.java | 10 +
 3 files changed, 30 insertions(+), 51 deletions(-)
--

[1/3] git commit: ACCUMULO-2411 Fix warnings in 1.5 branch

[ctubbsii]

Repository: accumulo
Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 4e7251601 -> 59716f06b


ACCUMULO-2411 Fix warnings in 1.5 branch

  Remove useless/no-op/broken javadocs and unused warnings. Isolate and
  suppress deprecation warning related to hadoop FileSystem replication
  support across HDFS versions.


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: e2efee6d58f1ad67554134dddbfb3f28df025f3a
Parents: 6258018
Author: Christopher Tubbs 
Authored: Wed Feb 26 14:35:36 2014 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 26 14:35:36 2014 -0500

--
 .../apache/accumulo/fate/util/AddressUtil.java  | 27 ++--
 .../server/tabletserver/log/DfsLogger.java  | 44 +++-
 .../server/watcher/MonitorLog4jWatcher.java | 10 +
 3 files changed, 30 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e2efee6d/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java
--
diff --git a/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java 
b/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java
index 7a8c269..fce7a62 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java
@@ -16,7 +16,7 @@
  */
 package org.apache.accumulo.fate.util;
 
-import java.net.InetAddress; // workaround to enable @see/@link hyperlink
+import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.security.Security;
 
@@ -27,28 +27,29 @@ public class AddressUtil {
   private static final Logger log = Logger.getLogger(AddressUtil.class);
 
   /**
-   * Fetch the security value that determines how long DNS failures are cached.
-   * Looks up the security property 'networkaddress.cache.negative.ttl'. 
Should that fail returns
-   * the default value used in the Oracle JVM 1.4+, which is 10 seconds.
-   *
-   * @param originalException the host lookup that is the source of needing 
this lookup. maybe be null.
+   * Fetch the security value that determines how long DNS failures are 
cached. Looks up the security property 'networkaddress.cache.negative.ttl'. 
Should that
+   * fail returns the default value used in the Oracle JVM 1.4+, which is 10 
seconds.
+   * 
+   * @param originalException
+   *  the host lookup that is the source of needing this lookup. maybe 
be null.
* @return positive integer number of seconds
-   * @see java.net.InetAddress
-   * @throws IllegalArgumentException if dns failures are cached forever
+   * @see InetAddress
+   * @throws IllegalArgumentException
+   *   if dns failures are cached forever
*/
   static public int getAddressCacheNegativeTtl(UnknownHostException 
originalException) {
 int negativeTtl = 10;
 try {
   negativeTtl = 
Integer.parseInt(Security.getProperty("networkaddress.cache.negative.ttl"));
 } catch (NumberFormatException exception) {
-  log.warn("Failed to get JVM negative DNS respones cache TTL due to 
format problem (e.g. this JVM might not have the " +
-"property). Falling back to default based on Oracle JVM 1.6 
(10s)", exception);
+  log.warn("Failed to get JVM negative DNS respones cache TTL due to 
format problem (e.g. this JVM might not have the "
+  + "property). Falling back to default based on Oracle JVM 1.6 
(10s)", exception);
 } catch (SecurityException exception) {
   log.warn("Failed to get JVM negative DNS response cache TTL due to 
security manager. Falling back to default based on Oracle JVM 1.6 (10s)", 
exception);
 }
 if (-1 == negativeTtl) {
-  log.error("JVM negative DNS repsonse cache TTL is set to 'forever' and 
host lookup failed. TTL can be changed with security property " +
-"'networkaddress.cache.negative.ttl', see 
java.net.InetAddress.", originalException);
+  log.error("JVM negative DNS repsonse cache TTL is set to 'forever' and 
host lookup failed. TTL can be changed with security property "
+  + "'networkaddress.cache.negative.ttl', see java.net.InetAddress.", 
originalException);
   throw new IllegalArgumentException(originalException);
 } else if (0 > negativeTtl) {
   log.warn("JVM specified negative DNS response cache TTL was negative 
(and not 'forever'). Falling back to default based on Oracle JVM 1.6 (10s)");
@@ -56,5 +57,5 @@ public class AddressUtil {
 }
 return negativeTtl;
   }
-  
+
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e2efee

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

[ctubbsii]

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:

server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 59716f06bad0b9d8a63c699ac75a645c7e2f4a8e
Parents: 4e72516 5dba407
Author: Christopher Tubbs 
Authored: Wed Feb 26 15:41:42 2014 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 26 15:41:42 2014 -0500

--
 .../apache/accumulo/tserver/log/DfsLogger.java  | 137 +--
 1 file changed, 65 insertions(+), 72 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/59716f06/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
--
diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
index 33d7722,000..55df118
mode 100644,00..100644
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
@@@ -1,545 -1,0 +1,538 @@@
 +/*
 + * 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.tserver.log;
 +
 +import static org.apache.accumulo.tserver.logger.LogEvents.COMPACTION_FINISH;
 +import static org.apache.accumulo.tserver.logger.LogEvents.COMPACTION_START;
 +import static org.apache.accumulo.tserver.logger.LogEvents.DEFINE_TABLET;
 +import static org.apache.accumulo.tserver.logger.LogEvents.MANY_MUTATIONS;
 +import static org.apache.accumulo.tserver.logger.LogEvents.OPEN;
 +
 +import java.io.DataInputStream;
 +import java.io.DataOutputStream;
 +import java.io.IOException;
 +import java.io.OutputStream;
 +import java.lang.reflect.Method;
 +import java.nio.channels.ClosedChannelException;
 +import java.util.ArrayList;
 +import java.util.Arrays;
 +import java.util.Collections;
 +import java.util.HashMap;
 +import java.util.List;
 +import java.util.Map;
 +import java.util.Set;
 +import java.util.UUID;
 +import java.util.concurrent.CountDownLatch;
 +import java.util.concurrent.LinkedBlockingQueue;
 +
 +import org.apache.accumulo.core.Constants;
 +import org.apache.accumulo.core.conf.AccumuloConfiguration;
 +import org.apache.accumulo.core.conf.Property;
 +import org.apache.accumulo.core.data.KeyExtent;
 +import org.apache.accumulo.core.data.Mutation;
 +import org.apache.accumulo.core.security.crypto.CryptoModule;
 +import org.apache.accumulo.core.security.crypto.CryptoModuleFactory;
 +import org.apache.accumulo.core.security.crypto.CryptoModuleParameters;
 +import org.apache.accumulo.core.security.crypto.DefaultCryptoModule;
 +import org.apache.accumulo.core.security.crypto.NoFlushOutputStream;
 +import org.apache.accumulo.core.util.Daemon;
 +import org.apache.accumulo.core.util.Pair;
 +import org.apache.accumulo.core.util.StringUtil;
 +import org.apache.accumulo.server.ServerConstants;
 +import org.apache.accumulo.server.fs.VolumeManager;
 +import org.apache.accumulo.server.master.state.TServerInstance;
 +import org.apache.accumulo.tserver.TabletMutations;
 +import org.apache.accumulo.tserver.logger.LogFileKey;
 +import org.apache.accumulo.tserver.logger.LogFileValue;
 +import org.apache.hadoop.fs.FSDataInputStream;
 +import org.apache.hadoop.fs.FSDataOutputStream;
 +import org.apache.hadoop.fs.Path;
 +import org.apache.log4j.Logger;
 +
 +/**
 + * Wrap a connection to a logger.
 + * 
 + */
 +public class DfsLogger {
 +  // Package private so that LogSorter can find this
 +  static final String LOG_FILE_HEADER_V2 = "--- Log File Header (v2) ---";
 +  static final String LOG_FILE_HEADER_V3 = "--- Log File Header (v3) ---";
-   
++
 +  private static Logger log = Logger.getLogger(DfsLogger.class);
-   
++
 +  public static class LogClosedException extends IOException {
 +private static

[1/4] git commit: ACCUMULO-2411 Fix warnings in 1.5 branch

[ctubbsii]

Repository: accumulo
Updated Branches:
  refs/heads/master 66998005c -> c5f80656a


ACCUMULO-2411 Fix warnings in 1.5 branch

  Remove useless/no-op/broken javadocs and unused warnings. Isolate and
  suppress deprecation warning related to hadoop FileSystem replication
  support across HDFS versions.


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

Branch: refs/heads/master
Commit: e2efee6d58f1ad67554134dddbfb3f28df025f3a
Parents: 6258018
Author: Christopher Tubbs 
Authored: Wed Feb 26 14:35:36 2014 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 26 14:35:36 2014 -0500

--
 .../apache/accumulo/fate/util/AddressUtil.java  | 27 ++--
 .../server/tabletserver/log/DfsLogger.java  | 44 +++-
 .../server/watcher/MonitorLog4jWatcher.java | 10 +
 3 files changed, 30 insertions(+), 51 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e2efee6d/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java
--
diff --git a/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java 
b/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java
index 7a8c269..fce7a62 100644
--- a/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java
+++ b/fate/src/main/java/org/apache/accumulo/fate/util/AddressUtil.java
@@ -16,7 +16,7 @@
  */
 package org.apache.accumulo.fate.util;
 
-import java.net.InetAddress; // workaround to enable @see/@link hyperlink
+import java.net.InetAddress;
 import java.net.UnknownHostException;
 import java.security.Security;
 
@@ -27,28 +27,29 @@ public class AddressUtil {
   private static final Logger log = Logger.getLogger(AddressUtil.class);
 
   /**
-   * Fetch the security value that determines how long DNS failures are cached.
-   * Looks up the security property 'networkaddress.cache.negative.ttl'. 
Should that fail returns
-   * the default value used in the Oracle JVM 1.4+, which is 10 seconds.
-   *
-   * @param originalException the host lookup that is the source of needing 
this lookup. maybe be null.
+   * Fetch the security value that determines how long DNS failures are 
cached. Looks up the security property 'networkaddress.cache.negative.ttl'. 
Should that
+   * fail returns the default value used in the Oracle JVM 1.4+, which is 10 
seconds.
+   * 
+   * @param originalException
+   *  the host lookup that is the source of needing this lookup. maybe 
be null.
* @return positive integer number of seconds
-   * @see java.net.InetAddress
-   * @throws IllegalArgumentException if dns failures are cached forever
+   * @see InetAddress
+   * @throws IllegalArgumentException
+   *   if dns failures are cached forever
*/
   static public int getAddressCacheNegativeTtl(UnknownHostException 
originalException) {
 int negativeTtl = 10;
 try {
   negativeTtl = 
Integer.parseInt(Security.getProperty("networkaddress.cache.negative.ttl"));
 } catch (NumberFormatException exception) {
-  log.warn("Failed to get JVM negative DNS respones cache TTL due to 
format problem (e.g. this JVM might not have the " +
-"property). Falling back to default based on Oracle JVM 1.6 
(10s)", exception);
+  log.warn("Failed to get JVM negative DNS respones cache TTL due to 
format problem (e.g. this JVM might not have the "
+  + "property). Falling back to default based on Oracle JVM 1.6 
(10s)", exception);
 } catch (SecurityException exception) {
   log.warn("Failed to get JVM negative DNS response cache TTL due to 
security manager. Falling back to default based on Oracle JVM 1.6 (10s)", 
exception);
 }
 if (-1 == negativeTtl) {
-  log.error("JVM negative DNS repsonse cache TTL is set to 'forever' and 
host lookup failed. TTL can be changed with security property " +
-"'networkaddress.cache.negative.ttl', see 
java.net.InetAddress.", originalException);
+  log.error("JVM negative DNS repsonse cache TTL is set to 'forever' and 
host lookup failed. TTL can be changed with security property "
+  + "'networkaddress.cache.negative.ttl', see java.net.InetAddress.", 
originalException);
   throw new IllegalArgumentException(originalException);
 } else if (0 > negativeTtl) {
   log.warn("JVM specified negative DNS response cache TTL was negative 
(and not 'forever'). Falling back to default based on Oracle JVM 1.6 (10s)");
@@ -56,5 +57,5 @@ public class AddressUtil {
 }
 return negativeTtl;
   }
-  
+
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e2efee6d/server/src/ma

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

[ctubbsii]

Merge branch '1.5.1-SNAPSHOT' into 1.6.0-SNAPSHOT

Conflicts:

server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java


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

Branch: refs/heads/master
Commit: 59716f06bad0b9d8a63c699ac75a645c7e2f4a8e
Parents: 4e72516 5dba407
Author: Christopher Tubbs 
Authored: Wed Feb 26 15:41:42 2014 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 26 15:41:42 2014 -0500

--
 .../apache/accumulo/tserver/log/DfsLogger.java  | 137 +--
 1 file changed, 65 insertions(+), 72 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/59716f06/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
--
diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
index 33d7722,000..55df118
mode 100644,00..100644
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
@@@ -1,545 -1,0 +1,538 @@@
 +/*
 + * 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.tserver.log;
 +
 +import static org.apache.accumulo.tserver.logger.LogEvents.COMPACTION_FINISH;
 +import static org.apache.accumulo.tserver.logger.LogEvents.COMPACTION_START;
 +import static org.apache.accumulo.tserver.logger.LogEvents.DEFINE_TABLET;
 +import static org.apache.accumulo.tserver.logger.LogEvents.MANY_MUTATIONS;
 +import static org.apache.accumulo.tserver.logger.LogEvents.OPEN;
 +
 +import java.io.DataInputStream;
 +import java.io.DataOutputStream;
 +import java.io.IOException;
 +import java.io.OutputStream;
 +import java.lang.reflect.Method;
 +import java.nio.channels.ClosedChannelException;
 +import java.util.ArrayList;
 +import java.util.Arrays;
 +import java.util.Collections;
 +import java.util.HashMap;
 +import java.util.List;
 +import java.util.Map;
 +import java.util.Set;
 +import java.util.UUID;
 +import java.util.concurrent.CountDownLatch;
 +import java.util.concurrent.LinkedBlockingQueue;
 +
 +import org.apache.accumulo.core.Constants;
 +import org.apache.accumulo.core.conf.AccumuloConfiguration;
 +import org.apache.accumulo.core.conf.Property;
 +import org.apache.accumulo.core.data.KeyExtent;
 +import org.apache.accumulo.core.data.Mutation;
 +import org.apache.accumulo.core.security.crypto.CryptoModule;
 +import org.apache.accumulo.core.security.crypto.CryptoModuleFactory;
 +import org.apache.accumulo.core.security.crypto.CryptoModuleParameters;
 +import org.apache.accumulo.core.security.crypto.DefaultCryptoModule;
 +import org.apache.accumulo.core.security.crypto.NoFlushOutputStream;
 +import org.apache.accumulo.core.util.Daemon;
 +import org.apache.accumulo.core.util.Pair;
 +import org.apache.accumulo.core.util.StringUtil;
 +import org.apache.accumulo.server.ServerConstants;
 +import org.apache.accumulo.server.fs.VolumeManager;
 +import org.apache.accumulo.server.master.state.TServerInstance;
 +import org.apache.accumulo.tserver.TabletMutations;
 +import org.apache.accumulo.tserver.logger.LogFileKey;
 +import org.apache.accumulo.tserver.logger.LogFileValue;
 +import org.apache.hadoop.fs.FSDataInputStream;
 +import org.apache.hadoop.fs.FSDataOutputStream;
 +import org.apache.hadoop.fs.Path;
 +import org.apache.log4j.Logger;
 +
 +/**
 + * Wrap a connection to a logger.
 + * 
 + */
 +public class DfsLogger {
 +  // Package private so that LogSorter can find this
 +  static final String LOG_FILE_HEADER_V2 = "--- Log File Header (v2) ---";
 +  static final String LOG_FILE_HEADER_V3 = "--- Log File Header (v3) ---";
-   
++
 +  private static Logger log = Logger.getLogger(DfsLogger.class);
-   
++
 +  public static class LogClosedException extends IOException {
 +private static final l

[2/4] git commit: Merge branch '1.5.1-SNAPSHOT' of https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT

[ctubbsii]

Merge branch '1.5.1-SNAPSHOT' of 
https://git-wip-us.apache.org/repos/asf/accumulo into 1.5.1-SNAPSHOT


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

Branch: refs/heads/master
Commit: 5dba407cce3da15900b0fbbecea234ee55943dbf
Parents: 0bd62e3 e2efee6
Author: Eric Newton 
Authored: Wed Feb 26 14:40:51 2014 -0500
Committer: Eric Newton 
Committed: Wed Feb 26 14:40:51 2014 -0500

--
 .../apache/accumulo/fate/util/AddressUtil.java  | 27 ++--
 .../server/tabletserver/log/DfsLogger.java  | 44 +++-
 .../server/watcher/MonitorLog4jWatcher.java | 10 +
 3 files changed, 30 insertions(+), 51 deletions(-)
--

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

[ctubbsii]

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/c5f80656
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/c5f80656
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/c5f80656

Branch: refs/heads/master
Commit: c5f80656a40fd07e3ac4f25f68e1502b2d1951ba
Parents: 6699800 59716f0
Author: Christopher Tubbs 
Authored: Wed Feb 26 15:58:51 2014 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 26 15:58:51 2014 -0500

--
 .../apache/accumulo/tserver/log/DfsLogger.java  | 137 +--
 1 file changed, 65 insertions(+), 72 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c5f80656/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
--
diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
index e52f739,55df118..1504c94
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/DfsLogger.java
@@@ -320,10 -318,10 +319,10 @@@ public class DfsLogger 
  }
  return new DFSLoggerInputStreams(input, decryptingInput);
}
-   
+ 
public synchronized void open(String address) throws IOException {
  String filename = UUID.randomUUID().toString();
 -String logger = StringUtil.join(Arrays.asList(address.split(":")), "+");
 +String logger = Joiner.on("+").join(address.split(":"));
  
  log.debug("DfsLogger.open() begin");
  VolumeManager fs = conf.getFileSystem();
@@@ -540,7 -532,7 +533,7 @@@
  
public String getLogger() {
  String parts[] = logPath.split("/");
 -return StringUtil.join(Arrays.asList(parts[parts.length - 
2].split("[+]")), ":");
 +return Joiner.on(":").join(parts[parts.length - 2].split("[+]"));
}
-   
+ 
  }

[1/2] git commit: ACCUMULO-2291 CheckForMetadataProblems now checks the root table as well as the metadata table for problems. Also removed the fix option for the metadata table.

[ctubbsii]

Repository: accumulo
Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 59716f06b -> 818426c3a


ACCUMULO-2291 CheckForMetadataProblems now checks the root table as well as the 
metadata table for problems. Also removed the fix option for the metadata table.

Signed-off-by: Christopher Tubbs 


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 0c4a956633f96a3426df94dcfefee4e86e5aa3f6
Parents: 59716f0
Author: jpmcnamee 
Authored: Fri Feb 21 09:49:04 2014 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 26 16:01:00 2014 -0500

--
 .../server/util/CheckForMetadataProblems.java   | 100 ---
 1 file changed, 43 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0c4a9566/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
--
diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
 
b/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
index df9900f..d437bca 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
@@ -25,17 +25,14 @@ import java.util.TreeSet;
 
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.Scanner;
-import org.apache.accumulo.core.client.impl.Writer;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.KeyExtent;
-import org.apache.accumulo.core.data.Mutation;
 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.metadata.schema.MetadataSchema;
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
 import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.core.security.Credentials;
-import 
org.apache.accumulo.core.tabletserver.thrift.ConstraintViolationException;
 import org.apache.accumulo.server.cli.ClientOpts;
 import org.apache.accumulo.server.conf.ServerConfiguration;
 import org.apache.accumulo.server.fs.VolumeManager;
@@ -46,29 +43,29 @@ import com.beust.jcommander.Parameter;
 
 public class CheckForMetadataProblems {
   private static boolean sawProblems = false;
-  
+
   public static void checkTable(String tablename, TreeSet tablets, 
Opts opts) throws AccumuloSecurityException {
 // sanity check of metadata table entries
 // make sure tablets has no holes, and that it starts and ends w/ null
-
+
 if (tablets.size() == 0) {
   System.out.println("No entries found in metadata table for table " + 
tablename);
   sawProblems = true;
   return;
 }
-
+
 if (tablets.first().getPrevEndRow() != null) {
   System.out.println("First entry for table " + tablename + "- " + 
tablets.first() + " - has non null prev end row");
   sawProblems = true;
   return;
 }
-
+
 if (tablets.last().getEndRow() != null) {
   System.out.println("Last entry for table " + tablename + "- " + 
tablets.last() + " - has non null end row");
   sawProblems = true;
   return;
 }
-
+
 Iterator tabIter = tablets.iterator();
 Text lastEndRow = tabIter.next().getEndRow();
 boolean everythingLooksGood = true;
@@ -85,13 +82,7 @@ public class CheckForMetadataProblems {
   if (broke) {
 everythingLooksGood = false;
   }
-  if (broke && opts.fix) {
-KeyExtent ke = new KeyExtent(tabke);
-ke.setPrevEndRow(lastEndRow);
-MetadataTableUtil.updateTabletPrevEndRow(ke, new 
Credentials(opts.principal, opts.getToken()));
-System.out.println("KE " + tabke + " has been repaired to " + ke);
-  }
-  
+
   lastEndRow = tabke.getEndRow();
 }
 if (everythingLooksGood)
@@ -99,50 +90,51 @@ public class CheckForMetadataProblems {
 else
   sawProblems = true;
   }
-  
-  public static void checkMetadataTableEntries(Opts opts, VolumeManager fs) 
throws Exception {
+
+  public static void checkMetadataAndRootTableEntries(String tableNameToCheck, 
Opts opts, VolumeManager fs) throws Exception {
+System.out.println("Checking table: " + tableNameToCheck);
 Map> tables = new 
HashMap>();
-
+
 Scanner scanner;
-
+
 if (opts.offline) {
   scanner = new 
OfflineMetadataScanner(ServerConfiguration.getSystemConfiguration(opts.g

[2/2] git commit: ACCUMULO-2389 Removed the OfflineMetadataScanner and the offline option in the CheckForMetadataProblems.

[ctubbsii]

ACCUMULO-2389 Removed the OfflineMetadataScanner and the offline option in the 
CheckForMetadataProblems.

Signed-off-by: Christopher Tubbs 


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 818426c3aa87eee79df0f5d1768c0eeb24e98d4b
Parents: 0c4a956
Author: jpmcnamee 
Authored: Fri Feb 21 09:50:59 2014 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 26 16:10:54 2014 -0500

--
 .../server/util/CheckForMetadataProblems.java   |  26 +-
 .../server/util/OfflineMetadataScanner.java | 281 ---
 2 files changed, 5 insertions(+), 302 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/818426c3/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
--
diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
 
b/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
index d437bca..253b666 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
@@ -34,17 +34,14 @@ import 
org.apache.accumulo.core.metadata.schema.MetadataSchema;
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.server.cli.ClientOpts;
-import org.apache.accumulo.server.conf.ServerConfiguration;
 import org.apache.accumulo.server.fs.VolumeManager;
 import org.apache.accumulo.server.fs.VolumeManagerImpl;
 import org.apache.hadoop.io.Text;
 
-import com.beust.jcommander.Parameter;
-
 public class CheckForMetadataProblems {
   private static boolean sawProblems = false;
 
-  public static void checkTable(String tablename, TreeSet tablets, 
Opts opts) throws AccumuloSecurityException {
+  public static void checkTable(String tablename, TreeSet tablets, 
ClientOpts opts) throws AccumuloSecurityException {
 // sanity check of metadata table entries
 // make sure tablets has no holes, and that it starts and ends w/ null
 
@@ -91,17 +88,13 @@ public class CheckForMetadataProblems {
   sawProblems = true;
   }
 
-  public static void checkMetadataAndRootTableEntries(String tableNameToCheck, 
Opts opts, VolumeManager fs) throws Exception {
+  public static void checkMetadataAndRootTableEntries(String tableNameToCheck, 
ClientOpts opts, VolumeManager fs) throws Exception {
 System.out.println("Checking table: " + tableNameToCheck);
 Map> tables = new 
HashMap>();
 
 Scanner scanner;
 
-if (opts.offline) {
-  scanner = new 
OfflineMetadataScanner(ServerConfiguration.getSystemConfiguration(opts.getInstance()),
 fs);
-} else {
-  scanner = opts.getConnector().createScanner(tableNameToCheck, 
Authorizations.EMPTY);
-}
+scanner = opts.getConnector().createScanner(tableNameToCheck, 
Authorizations.EMPTY);
 
 scanner.setRange(MetadataSchema.TabletsSection.getRange());
 TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.fetch(scanner);
@@ -165,23 +158,14 @@ public class CheckForMetadataProblems {
 // end METADATA table sanity check
   }
 
-  static class Opts extends ClientOpts {
-@Parameter(names = "--offline", description = "perform the check on the 
files directly")
-boolean offline = false;
-  }
-
   public static void main(String[] args) throws Exception {
-Opts opts = new Opts();
+ClientOpts opts = new ClientOpts();
 opts.parseArgs(CheckForMetadataProblems.class.getName(), args);
-Opts dummyOpts = new Opts();
-dummyOpts.auths = opts.auths;
-dummyOpts.password = opts.password;
 
 VolumeManager fs = VolumeManagerImpl.get();
 
-checkMetadataAndRootTableEntries(RootTable.NAME, dummyOpts, fs);
+checkMetadataAndRootTableEntries(RootTable.NAME, opts, fs);
 checkMetadataAndRootTableEntries(MetadataTable.NAME, opts, fs);
-dummyOpts.stopTracing();
 opts.stopTracing();
 if (sawProblems)
   throw new RuntimeException();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/818426c3/server/base/src/main/java/org/apache/accumulo/server/util/OfflineMetadataScanner.java
--
diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/util/OfflineMetadataScanner.java
 
b/server/base/src/main/java/org/apache/accumulo/server/util/OfflineMetadataScanner.java
deleted file mode 100644
index cdb18a5..000
--- 
a/server/base/src/m

[2/4] git commit: ACCUMULO-2389 Removed the OfflineMetadataScanner and the offline option in the CheckForMetadataProblems.

[ctubbsii]

ACCUMULO-2389 Removed the OfflineMetadataScanner and the offline option in the 
CheckForMetadataProblems.

Signed-off-by: Christopher Tubbs 


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

Branch: refs/heads/master
Commit: 818426c3aa87eee79df0f5d1768c0eeb24e98d4b
Parents: 0c4a956
Author: jpmcnamee 
Authored: Fri Feb 21 09:50:59 2014 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 26 16:10:54 2014 -0500

--
 .../server/util/CheckForMetadataProblems.java   |  26 +-
 .../server/util/OfflineMetadataScanner.java | 281 ---
 2 files changed, 5 insertions(+), 302 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/818426c3/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
--
diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
 
b/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
index d437bca..253b666 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
@@ -34,17 +34,14 @@ import 
org.apache.accumulo.core.metadata.schema.MetadataSchema;
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
 import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.server.cli.ClientOpts;
-import org.apache.accumulo.server.conf.ServerConfiguration;
 import org.apache.accumulo.server.fs.VolumeManager;
 import org.apache.accumulo.server.fs.VolumeManagerImpl;
 import org.apache.hadoop.io.Text;
 
-import com.beust.jcommander.Parameter;
-
 public class CheckForMetadataProblems {
   private static boolean sawProblems = false;
 
-  public static void checkTable(String tablename, TreeSet tablets, 
Opts opts) throws AccumuloSecurityException {
+  public static void checkTable(String tablename, TreeSet tablets, 
ClientOpts opts) throws AccumuloSecurityException {
 // sanity check of metadata table entries
 // make sure tablets has no holes, and that it starts and ends w/ null
 
@@ -91,17 +88,13 @@ public class CheckForMetadataProblems {
   sawProblems = true;
   }
 
-  public static void checkMetadataAndRootTableEntries(String tableNameToCheck, 
Opts opts, VolumeManager fs) throws Exception {
+  public static void checkMetadataAndRootTableEntries(String tableNameToCheck, 
ClientOpts opts, VolumeManager fs) throws Exception {
 System.out.println("Checking table: " + tableNameToCheck);
 Map> tables = new 
HashMap>();
 
 Scanner scanner;
 
-if (opts.offline) {
-  scanner = new 
OfflineMetadataScanner(ServerConfiguration.getSystemConfiguration(opts.getInstance()),
 fs);
-} else {
-  scanner = opts.getConnector().createScanner(tableNameToCheck, 
Authorizations.EMPTY);
-}
+scanner = opts.getConnector().createScanner(tableNameToCheck, 
Authorizations.EMPTY);
 
 scanner.setRange(MetadataSchema.TabletsSection.getRange());
 TabletsSection.TabletColumnFamily.PREV_ROW_COLUMN.fetch(scanner);
@@ -165,23 +158,14 @@ public class CheckForMetadataProblems {
 // end METADATA table sanity check
   }
 
-  static class Opts extends ClientOpts {
-@Parameter(names = "--offline", description = "perform the check on the 
files directly")
-boolean offline = false;
-  }
-
   public static void main(String[] args) throws Exception {
-Opts opts = new Opts();
+ClientOpts opts = new ClientOpts();
 opts.parseArgs(CheckForMetadataProblems.class.getName(), args);
-Opts dummyOpts = new Opts();
-dummyOpts.auths = opts.auths;
-dummyOpts.password = opts.password;
 
 VolumeManager fs = VolumeManagerImpl.get();
 
-checkMetadataAndRootTableEntries(RootTable.NAME, dummyOpts, fs);
+checkMetadataAndRootTableEntries(RootTable.NAME, opts, fs);
 checkMetadataAndRootTableEntries(MetadataTable.NAME, opts, fs);
-dummyOpts.stopTracing();
 opts.stopTracing();
 if (sawProblems)
   throw new RuntimeException();

http://git-wip-us.apache.org/repos/asf/accumulo/blob/818426c3/server/base/src/main/java/org/apache/accumulo/server/util/OfflineMetadataScanner.java
--
diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/util/OfflineMetadataScanner.java
 
b/server/base/src/main/java/org/apache/accumulo/server/util/OfflineMetadataScanner.java
deleted file mode 100644
index cdb18a5..000
--- 
a/server/base/src/main/java

[4/4] git commit: ACCUMULO-841 Remove unused imports

[ctubbsii]

ACCUMULO-841 Remove unused imports


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

Branch: refs/heads/master
Commit: 6780a6970c186e639a3a693af6216f11469735f2
Parents: 29590f7
Author: Christopher Tubbs 
Authored: Wed Feb 26 16:20:46 2014 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 26 16:20:46 2014 -0500

--
 .../main/java/org/apache/accumulo/test/randomwalk/Environment.java  | 1 -
 .../apache/accumulo/test/randomwalk/security/SecurityHelper.java| 1 -
 2 files changed, 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6780a697/test/src/main/java/org/apache/accumulo/test/randomwalk/Environment.java
--
diff --git 
a/test/src/main/java/org/apache/accumulo/test/randomwalk/Environment.java 
b/test/src/main/java/org/apache/accumulo/test/randomwalk/Environment.java
index 3e19bed..b99ee77 100644
--- a/test/src/main/java/org/apache/accumulo/test/randomwalk/Environment.java
+++ b/test/src/main/java/org/apache/accumulo/test/randomwalk/Environment.java
@@ -30,7 +30,6 @@ import org.apache.accumulo.core.client.MultiTableBatchWriter;
 import org.apache.accumulo.core.client.ZooKeeperInstance;
 import org.apache.accumulo.core.client.security.tokens.AuthenticationToken;
 import org.apache.accumulo.core.client.security.tokens.PasswordToken;
-import org.apache.accumulo.core.security.Credentials;
 import org.apache.log4j.Logger;
 
 /**

http://git-wip-us.apache.org/repos/asf/accumulo/blob/6780a697/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityHelper.java
--
diff --git 
a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityHelper.java
 
b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityHelper.java
index 0cff0bf..81192bd 100644
--- 
a/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityHelper.java
+++ 
b/test/src/main/java/org/apache/accumulo/test/randomwalk/security/SecurityHelper.java
@@ -25,7 +25,6 @@ import org.apache.accumulo.core.security.Authorizations;
 import org.apache.accumulo.core.security.SystemPermission;
 import org.apache.accumulo.core.security.TablePermission;
 import org.apache.accumulo.core.util.CachedConfiguration;
-import org.apache.accumulo.test.randomwalk.Environment;
 import org.apache.accumulo.test.randomwalk.State;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.log4j.Logger;

[1/4] git commit: ACCUMULO-2291 CheckForMetadataProblems now checks the root table as well as the metadata table for problems. Also removed the fix option for the metadata table.

[ctubbsii]

Repository: accumulo
Updated Branches:
  refs/heads/master c5f80656a -> 6780a6970


ACCUMULO-2291 CheckForMetadataProblems now checks the root table as well as the 
metadata table for problems. Also removed the fix option for the metadata table.

Signed-off-by: Christopher Tubbs 


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

Branch: refs/heads/master
Commit: 0c4a956633f96a3426df94dcfefee4e86e5aa3f6
Parents: 59716f0
Author: jpmcnamee 
Authored: Fri Feb 21 09:49:04 2014 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 26 16:01:00 2014 -0500

--
 .../server/util/CheckForMetadataProblems.java   | 100 ---
 1 file changed, 43 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/0c4a9566/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
--
diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
 
b/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
index df9900f..d437bca 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/util/CheckForMetadataProblems.java
@@ -25,17 +25,14 @@ import java.util.TreeSet;
 
 import org.apache.accumulo.core.client.AccumuloSecurityException;
 import org.apache.accumulo.core.client.Scanner;
-import org.apache.accumulo.core.client.impl.Writer;
 import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.KeyExtent;
-import org.apache.accumulo.core.data.Mutation;
 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.metadata.schema.MetadataSchema;
 import org.apache.accumulo.core.metadata.schema.MetadataSchema.TabletsSection;
 import org.apache.accumulo.core.security.Authorizations;
-import org.apache.accumulo.core.security.Credentials;
-import 
org.apache.accumulo.core.tabletserver.thrift.ConstraintViolationException;
 import org.apache.accumulo.server.cli.ClientOpts;
 import org.apache.accumulo.server.conf.ServerConfiguration;
 import org.apache.accumulo.server.fs.VolumeManager;
@@ -46,29 +43,29 @@ import com.beust.jcommander.Parameter;
 
 public class CheckForMetadataProblems {
   private static boolean sawProblems = false;
-  
+
   public static void checkTable(String tablename, TreeSet tablets, 
Opts opts) throws AccumuloSecurityException {
 // sanity check of metadata table entries
 // make sure tablets has no holes, and that it starts and ends w/ null
-
+
 if (tablets.size() == 0) {
   System.out.println("No entries found in metadata table for table " + 
tablename);
   sawProblems = true;
   return;
 }
-
+
 if (tablets.first().getPrevEndRow() != null) {
   System.out.println("First entry for table " + tablename + "- " + 
tablets.first() + " - has non null prev end row");
   sawProblems = true;
   return;
 }
-
+
 if (tablets.last().getEndRow() != null) {
   System.out.println("Last entry for table " + tablename + "- " + 
tablets.last() + " - has non null end row");
   sawProblems = true;
   return;
 }
-
+
 Iterator tabIter = tablets.iterator();
 Text lastEndRow = tabIter.next().getEndRow();
 boolean everythingLooksGood = true;
@@ -85,13 +82,7 @@ public class CheckForMetadataProblems {
   if (broke) {
 everythingLooksGood = false;
   }
-  if (broke && opts.fix) {
-KeyExtent ke = new KeyExtent(tabke);
-ke.setPrevEndRow(lastEndRow);
-MetadataTableUtil.updateTabletPrevEndRow(ke, new 
Credentials(opts.principal, opts.getToken()));
-System.out.println("KE " + tabke + " has been repaired to " + ke);
-  }
-  
+
   lastEndRow = tabke.getEndRow();
 }
 if (everythingLooksGood)
@@ -99,50 +90,51 @@ public class CheckForMetadataProblems {
 else
   sawProblems = true;
   }
-  
-  public static void checkMetadataTableEntries(Opts opts, VolumeManager fs) 
throws Exception {
+
+  public static void checkMetadataAndRootTableEntries(String tableNameToCheck, 
Opts opts, VolumeManager fs) throws Exception {
+System.out.println("Checking table: " + tableNameToCheck);
 Map> tables = new 
HashMap>();
-
+
 Scanner scanner;
-
+
 if (opts.offline) {
   scanner = new 
OfflineMetadataScanner(ServerConfiguration.getSystemConfiguration(opts.getInstance()),
 

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

[ctubbsii]

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/29590f7c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/29590f7c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/29590f7c

Branch: refs/heads/master
Commit: 29590f7c17bd0b36c0239e58b31a941388a47673
Parents: c5f8065 818426c
Author: Christopher Tubbs 
Authored: Wed Feb 26 16:16:57 2014 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 26 16:16:57 2014 -0500

--
 .../server/util/CheckForMetadataProblems.java   | 110 +++-
 .../server/util/OfflineMetadataScanner.java | 281 ---
 2 files changed, 40 insertions(+), 351 deletions(-)
--

git commit: ACCUMULO-2355 Shell should not log UserInterruptedException

[ctubbsii]

Repository: accumulo
Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 818426c3a -> 96d866218


ACCUMULO-2355 Shell should not log UserInterruptedException

Signed-off-by: Christopher Tubbs 


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 96d86621837d648afb130fe259a6f6cca700accc
Parents: 818426c
Author: jpmcnamee 
Authored: Tue Feb 25 09:06:48 2014 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 26 16:44:42 2014 -0500

--
 core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/96d86621/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java 
b/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
index faded56..8ea82d4 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
@@ -693,6 +693,8 @@ public class Shell extends ShellOptions {
 }
 if (sc != null)
   sc.printHelp(this);
+  } catch (UserInterruptException e) {
+++exitCode;
   } catch (Exception e) {
 ++exitCode;
 printException(e);

[1/2] git commit: ACCUMULO-2355 Shell should not log UserInterruptedException

[ctubbsii]

Repository: accumulo
Updated Branches:
  refs/heads/master 6780a6970 -> 160aaf893


ACCUMULO-2355 Shell should not log UserInterruptedException

Signed-off-by: Christopher Tubbs 


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

Branch: refs/heads/master
Commit: 96d86621837d648afb130fe259a6f6cca700accc
Parents: 818426c
Author: jpmcnamee 
Authored: Tue Feb 25 09:06:48 2014 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 26 16:44:42 2014 -0500

--
 core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/96d86621/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java 
b/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
index faded56..8ea82d4 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java
@@ -693,6 +693,8 @@ public class Shell extends ShellOptions {
 }
 if (sc != null)
   sc.printHelp(this);
+  } catch (UserInterruptException e) {
+++exitCode;
   } catch (Exception e) {
 ++exitCode;
 printException(e);

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

[ctubbsii]

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/160aaf89
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/160aaf89
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/160aaf89

Branch: refs/heads/master
Commit: 160aaf8938cca324c1d31a867c34a536a2931c58
Parents: 6780a69 96d8662
Author: Christopher Tubbs 
Authored: Wed Feb 26 16:52:00 2014 -0500
Committer: Christopher Tubbs 
Committed: Wed Feb 26 16:52:00 2014 -0500

--
 core/src/main/java/org/apache/accumulo/core/util/shell/Shell.java | 2 ++
 1 file changed, 2 insertions(+)
--

git commit: ACCUMULO-2421 Add table name to error message

[ctubbsii]

Repository: accumulo
Updated Branches:
  refs/heads/1.6.0-SNAPSHOT b9bc5e259 -> bd970de81


ACCUMULO-2421 Add table name to error message


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: bd970de81567f4bcc363fe29bb109153d97a8947
Parents: b9bc5e2
Author: Christopher Tubbs 
Authored: Thu Feb 27 13:36:22 2014 -0500
Committer: Christopher Tubbs 
Committed: Thu Feb 27 13:48:52 2014 -0500

--
 .../apache/accumulo/core/client/impl/Tables.java  | 18 +++---
 1 file changed, 11 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/bd970de8/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java 
b/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
index 404aa32..5988bda 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
@@ -275,7 +275,7 @@ public class Tables {
 
   public static Pair qualify(String tableName, String 
defaultNamespace) {
 if (!tableName.matches(Tables.VALID_NAME_REGEX))
-  throw new IllegalArgumentException("Improper table name format");
+  throw new IllegalArgumentException("Invalid table name '" + tableName + 
"'");
 if (MetadataTable.OLD_NAME.equals(tableName))
   tableName = MetadataTable.NAME;
 if (tableName.contains(".")) {
@@ -287,22 +287,26 @@ public class Tables {
 
   /**
* Returns the namespace id for a given table ID.
-   * @param instance The Accumulo Instance
-   * @param tableId The tableId
+   * 
+   * @param instance
+   *  The Accumulo Instance
+   * @param tableId
+   *  The tableId
* @return The namespace id which this table resides in.
-   * @throws IllegalArgumentException if the table doesn't exist in ZooKeeper
+   * @throws IllegalArgumentException
+   *   if the table doesn't exist in ZooKeeper
*/
   public static String getNamespaceId(Instance instance, String tableId) 
throws IllegalArgumentException {
 ArgumentChecker.notNull(instance, tableId);
-
+
 ZooCache zc = getZooCache(instance);
 byte[] n = zc.get(ZooUtil.getRoot(instance) + Constants.ZTABLES + "/" + 
tableId + Constants.ZTABLE_NAMESPACE);
-
+
 // We might get null out of ZooCache if this tableID doesn't exist
 if (null == n) {
   throw new IllegalArgumentException("Table with id " + tableId + " does 
not exist");
 }
-
+
 return new String(n, Constants.UTF8);
   }
 

git commit: ACCUMULO-2468 Remove recently introduced warnings

[ctubbsii]

Repository: accumulo
Updated Branches:
  refs/heads/1.6.0-SNAPSHOT 34c8b7af8 -> c3837f424


ACCUMULO-2468 Remove recently introduced warnings


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: c3837f424c1fd011ba0cdf8dfd0162a1ad283121
Parents: 34c8b7a
Author: Christopher Tubbs 
Authored: Tue Mar 18 00:34:52 2014 -0400
Committer: Christopher Tubbs 
Committed: Tue Mar 18 00:34:52 2014 -0400

--
 .../java/org/apache/accumulo/core/data/ArrayByteSequenceTest.java  | 1 -
 .../src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c3837f42/core/src/test/java/org/apache/accumulo/core/data/ArrayByteSequenceTest.java
--
diff --git 
a/core/src/test/java/org/apache/accumulo/core/data/ArrayByteSequenceTest.java 
b/core/src/test/java/org/apache/accumulo/core/data/ArrayByteSequenceTest.java
index 70c40ed..4d61db5 100644
--- 
a/core/src/test/java/org/apache/accumulo/core/data/ArrayByteSequenceTest.java
+++ 
b/core/src/test/java/org/apache/accumulo/core/data/ArrayByteSequenceTest.java
@@ -20,7 +20,6 @@ import static org.junit.Assert.assertEquals;
 
 import java.nio.ByteBuffer;
 
-import org.apache.accumulo.core.Constants;
 import org.junit.Before;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/c3837f42/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
--
diff --git 
a/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java 
b/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
index ce4ad98..b32dd26 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
@@ -291,6 +291,7 @@ public class KeyExtentTest {
 return out;
   }
 
+  @SuppressWarnings("deprecation")
   @Test
   public void testKeyExtentsForSimpleRange() {
 Collection results;
@@ -307,6 +308,7 @@ public class KeyExtentTest {
 assertEquals(t, results.iterator().next());
   }
 
+  @SuppressWarnings("deprecation")
   @Test
   public void testKeyExtentsForRange() {
 KeyExtent b = nke("t", "b", null);

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

[ctubbsii]

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/0992c42c
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/0992c42c
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/0992c42c

Branch: refs/heads/master
Commit: 0992c42c52230adc44365f2a2ae0bd5076722bbb
Parents: b7fe94c c3837f4
Author: Christopher Tubbs 
Authored: Tue Mar 18 00:54:41 2014 -0400
Committer: Christopher Tubbs 
Committed: Tue Mar 18 00:54:41 2014 -0400

--
 .../java/org/apache/accumulo/core/data/ArrayByteSequenceTest.java  | 1 -
 .../src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)
--

[3/4] git commit: ACCUMULO-2490 Make Pair API more generics-friendly

[ctubbsii]

ACCUMULO-2490 Make Pair API more generics-friendly


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

Branch: refs/heads/master
Commit: 053e83fc4225969efda31ee4957651640cc7ac9e
Parents: 0992c42
Author: Christopher Tubbs 
Authored: Tue Mar 18 01:01:11 2014 -0400
Committer: Christopher Tubbs 
Committed: Tue Mar 18 01:01:11 2014 -0400

--
 core/src/main/java/org/apache/accumulo/core/util/Pair.java | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/053e83fc/core/src/main/java/org/apache/accumulo/core/util/Pair.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/util/Pair.java 
b/core/src/main/java/org/apache/accumulo/core/util/Pair.java
index 00eab0e..159a77b 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/Pair.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/Pair.java
@@ -72,16 +72,16 @@ public class Pair {
 return prefix + first + separator + second + suffix;
   }
 
-  public Entry toMapEntry() {
+  public Entry toMapEntry() {
 return new SimpleImmutableEntry(getFirst(), getSecond());
   }
 
-  public Pair swap() {
+  public Pair swap() {
 return new Pair(getSecond(), getFirst());
   }
 
-  public static  Pair fromEntry(Entry entry) {
-return new Pair(entry.getKey(), entry.getValue());
+  public static  Pair 
fromEntry(Entry entry) {
+return new Pair(entry.getKey(), entry.getValue());
   }
 
 }

[1/4] git commit: ACCUMULO-2468 Remove recently introduced warnings

[ctubbsii]

Repository: accumulo
Updated Branches:
  refs/heads/master b7fe94c02 -> 18fee706b


ACCUMULO-2468 Remove recently introduced warnings


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

Branch: refs/heads/master
Commit: c3837f424c1fd011ba0cdf8dfd0162a1ad283121
Parents: 34c8b7a
Author: Christopher Tubbs 
Authored: Tue Mar 18 00:34:52 2014 -0400
Committer: Christopher Tubbs 
Committed: Tue Mar 18 00:34:52 2014 -0400

--
 .../java/org/apache/accumulo/core/data/ArrayByteSequenceTest.java  | 1 -
 .../src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c3837f42/core/src/test/java/org/apache/accumulo/core/data/ArrayByteSequenceTest.java
--
diff --git 
a/core/src/test/java/org/apache/accumulo/core/data/ArrayByteSequenceTest.java 
b/core/src/test/java/org/apache/accumulo/core/data/ArrayByteSequenceTest.java
index 70c40ed..4d61db5 100644
--- 
a/core/src/test/java/org/apache/accumulo/core/data/ArrayByteSequenceTest.java
+++ 
b/core/src/test/java/org/apache/accumulo/core/data/ArrayByteSequenceTest.java
@@ -20,7 +20,6 @@ import static org.junit.Assert.assertEquals;
 
 import java.nio.ByteBuffer;
 
-import org.apache.accumulo.core.Constants;
 import org.junit.Before;
 import org.junit.Test;
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/c3837f42/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
--
diff --git 
a/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java 
b/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
index ce4ad98..b32dd26 100644
--- a/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
+++ b/core/src/test/java/org/apache/accumulo/core/data/KeyExtentTest.java
@@ -291,6 +291,7 @@ public class KeyExtentTest {
 return out;
   }
 
+  @SuppressWarnings("deprecation")
   @Test
   public void testKeyExtentsForSimpleRange() {
 Collection results;
@@ -307,6 +308,7 @@ public class KeyExtentTest {
 assertEquals(t, results.iterator().next());
   }
 
+  @SuppressWarnings("deprecation")
   @Test
   public void testKeyExtentsForRange() {
 KeyExtent b = nke("t", "b", null);

[4/4] git commit: ACCUMULO-2477, ACCUMULO-2187 Fix introduced warnings/formatting

[ctubbsii]

ACCUMULO-2477, ACCUMULO-2187 Fix introduced warnings/formatting


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

Branch: refs/heads/master
Commit: 18fee706ba213b2cd6b0aaa587f5da1bfe5aa118
Parents: 053e83f
Author: Christopher Tubbs 
Authored: Tue Mar 18 01:10:48 2014 -0400
Committer: Christopher Tubbs 
Committed: Tue Mar 18 01:10:48 2014 -0400

--
 .../org/apache/accumulo/core/data/KeyValue.java | 24 
 .../accumulo/core/util/shell/ShellUtil.java | 14 +++-
 .../org/apache/accumulo/tserver/Tablet.java | 20 +---
 3 files changed, 35 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/18fee706/core/src/main/java/org/apache/accumulo/core/data/KeyValue.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/data/KeyValue.java 
b/core/src/main/java/org/apache/accumulo/core/data/KeyValue.java
index 9a0bdbd..afe4411 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/KeyValue.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/KeyValue.java
@@ -23,27 +23,33 @@ import java.util.AbstractMap.SimpleImmutableEntry;
  * A key/value pair. The key and value may not be set after construction.
  */
 public class KeyValue extends SimpleImmutableEntry {
-  
+
+  private static final long serialVersionUID = 1L;
+
   /**
* Creates a new key/value pair.
-   *
-   * @param key key
-   * @param value bytes of value
+   * 
+   * @param key
+   *  key
+   * @param value
+   *  bytes of value
*/
   public KeyValue(Key key, byte[] value) {
 super(key, new Value(value, false));
   }
-  
+
   /**
* Creates a new key/value pair.
-   *
-   * @param key key
-   * @param value buffer containing bytes of value
+   * 
+   * @param key
+   *  key
+   * @param value
+   *  buffer containing bytes of value
*/
   public KeyValue(Key key, ByteBuffer value) {
 super(key, new Value(value));
   }
-  
+
   /**
* Creates a new key/value pair.
* 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/18fee706/core/src/main/java/org/apache/accumulo/core/util/shell/ShellUtil.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/util/shell/ShellUtil.java 
b/core/src/main/java/org/apache/accumulo/core/util/shell/ShellUtil.java
index 30b7824..4f255eb 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/shell/ShellUtil.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/shell/ShellUtil.java
@@ -30,14 +30,16 @@ import com.google.common.collect.Lists;
 public class ShellUtil {
 
   /**
-   * Scans the given file line-by-line (ignoring empty lines) and returns a 
list
-   * containing those lines. If decode is set to true, every line is decoded 
using
-   * {@link Base64.decodeBase64} before inserting in the list.
+   * Scans the given file line-by-line (ignoring empty lines) and returns a 
list containing those lines. If decode is set to true, every line is decoded 
using
+   * {@link Base64#decodeBase64(byte[])} from the UTF-8 bytes of that line 
before inserting in the list.
* 
-   * @param filename Path to the file that needs to be scanned
-   * @param decode Whether to decode lines in the file
+   * @param filename
+   *  Path to the file that needs to be scanned
+   * @param decode
+   *  Whether to decode lines in the file
* @return List of {@link Text} objects containing data in the given file
-   * @throws FileNotFoundException if the given file doesn't exist
+   * @throws FileNotFoundException
+   *   if the given file doesn't exist
*/
   public static List scanFile(String filename, boolean decode) throws 
FileNotFoundException {
 String line;

http://git-wip-us.apache.org/repos/asf/accumulo/blob/18fee706/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
--
diff --git 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
index 9ce24be..5a937bc 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/Tablet.java
@@ -823,7 +823,7 @@ public class Tablet {
   log.warn("Target map file already exist " + newDatafile);
   fs.deleteRecursively(newDatafile.path());
 }
-
+
 rename(fs, tmpDatafile.path(), newDatafile.pat

git commit: ACCUMULO-2490 Slight improvement to fromEntry w/test

[ctubbsii]

Repository: accumulo
Updated Branches:
  refs/heads/master 05e2b12a8 -> beb494478


ACCUMULO-2490 Slight improvement to fromEntry w/test


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

Branch: refs/heads/master
Commit: beb494478f64ad6ec02f975edc8fb680bf012d8e
Parents: 05e2b12
Author: Christopher Tubbs 
Authored: Tue Mar 18 13:15:02 2014 -0400
Committer: Christopher Tubbs 
Committed: Tue Mar 18 13:15:02 2014 -0400

--
 .../org/apache/accumulo/core/util/Pair.java |   4 +-
 .../org/apache/accumulo/core/util/PairTest.java | 114 +++
 2 files changed, 116 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/beb49447/core/src/main/java/org/apache/accumulo/core/util/Pair.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/util/Pair.java 
b/core/src/main/java/org/apache/accumulo/core/util/Pair.java
index 00eab0e..293d126 100644
--- a/core/src/main/java/org/apache/accumulo/core/util/Pair.java
+++ b/core/src/main/java/org/apache/accumulo/core/util/Pair.java
@@ -80,8 +80,8 @@ public class Pair {
 return new Pair(getSecond(), getFirst());
   }
 
-  public static  Pair fromEntry(Entry entry) {
-return new Pair(entry.getKey(), entry.getValue());
+  public static  Pair 
fromEntry(Entry entry) {
+return new Pair(entry.getKey(), entry.getValue());
   }
 
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/beb49447/core/src/test/java/org/apache/accumulo/core/util/PairTest.java
--
diff --git a/core/src/test/java/org/apache/accumulo/core/util/PairTest.java 
b/core/src/test/java/org/apache/accumulo/core/util/PairTest.java
new file mode 100644
index 000..04af1ba
--- /dev/null
+++ b/core/src/test/java/org/apache/accumulo/core/util/PairTest.java
@@ -0,0 +1,114 @@
+/*
+ * 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.core.util;
+
+import static org.junit.Assert.assertEquals;
+
+import java.util.AbstractMap.SimpleImmutableEntry;
+import java.util.Map.Entry;
+
+import org.junit.Test;
+
+public class PairTest {
+
+  /**
+   * Test method for {@link 
org.apache.accumulo.core.util.Pair#equals(java.lang.Object)}.
+   */
+  @Test
+  public void testEqualsObject() {
+Pair pair = new Pair(25, "twenty-five");
+Pair pair2 = new Pair(25, "twenty-five");
+assertEquals(pair, pair2);
+  }
+
+  /**
+   * Test method for {@link org.apache.accumulo.core.util.Pair#getFirst()}.
+   */
+  @Test
+  public void testGetFirst() {
+Pair pair = new Pair(25, "twenty-five");
+assertEquals((Integer) 25, pair.getFirst());
+  }
+
+  /**
+   * Test method for {@link org.apache.accumulo.core.util.Pair#getSecond()}.
+   */
+  @Test
+  public void testGetSecond() {
+Pair pair = new Pair(25, "twenty-five");
+assertEquals("twenty-five", pair.getSecond());
+  }
+
+  /**
+   * Test method for {@link org.apache.accumulo.core.util.Pair#toString()}.
+   */
+  @Test
+  public void testToString() {
+Pair pair = new Pair(25, "twenty-five");
+assertEquals("(25,twenty-five)", pair.toString());
+  }
+
+  /**
+   * Test method for {@link 
org.apache.accumulo.core.util.Pair#toString(java.lang.String, java.lang.String, 
java.lang.String)}.
+   */
+  @Test
+  public void testToStringStringStringString() {
+Pair pair = new Pair(25, "twenty-five");
+assertEquals("---25~~~twenty-five+++", pair.toString("---", "~~~", "+++"));
+  }
+
+  /**
+   * Test method for {@link org.apache.accumulo.core.util.Pair#toMapEntry()}.
+   */
+  @Test
+  public void testToMapEntry() {
+Pair pair = new Pair(10, "IO");
+
+Entry entry = pair.toMapEntry();
+assertEquals(pair.getFirst(), entry.getKey());
+assertEquals(pair.getSecond(), entry.getValue());
+  }
+
+  /**
+   * Test method for {@link org

svn commit: r1579722 - /accumulo/site/trunk/content/bylaws.mdtext

[ctubbsii]

Author: ctubbsii
Date: Thu Mar 20 19:40:05 2014
New Revision: 1579722

URL: http://svn.apache.org/r1579722
Log:
Use generic pronouns rather than gender-specific ones.

Modified:
accumulo/site/trunk/content/bylaws.mdtext

Modified: accumulo/site/trunk/content/bylaws.mdtext
URL: 
http://svn.apache.org/viewvc/accumulo/site/trunk/content/bylaws.mdtext?rev=1579722&r1=1579721&r2=1579722&view=diff
==
--- accumulo/site/trunk/content/bylaws.mdtext (original)
+++ accumulo/site/trunk/content/bylaws.mdtext Thu Mar 20 19:40:05 2014
@@ -42,9 +42,9 @@ All of the volunteers who are contributi
 
 ## Committers
 
-The project's committers are responsible for the project's technical 
management. Committers have write access to the project's code repositories and 
may cast binding votes on any technical discussion regarding Accumulo. 
Committer access is by invitation only and must be approved by consensus 
approval of the active PMC members. Upon acceptance of the invitation to become 
a committer, it is the accepting member’s responsibility to update his/her 
status on the Accumulo web page accordingly.
+The project's committers are responsible for the project's technical 
management. Committers have write access to the project's code repositories and 
may cast binding votes on any technical discussion regarding Accumulo. 
Committer access is by invitation only and must be approved by consensus 
approval of the active PMC members. Upon acceptance of the invitation to become 
a committer, it is the accepting member’s responsibility to update their 
status on the Accumulo web page accordingly.
 
-A committer is considered emeritus, meaning inactive, by his or her own 
declaration or by not reviewing patches or committing patches to the project 
for over six months. Emeritus members will be recognized by the PMC on the 
Accumulo web page, in honor of their past contributions. Emeritus members 
retain all voting and commit rights associated with their former designation 
and can move themselves out of emeritus status by sending an announcement of 
their return to the developer mailing list. It will be the returning member's 
responsibility to update his/her status on the web page accordingly.
+A committer is considered emeritus, meaning inactive, by their own declaration 
or by not reviewing patches or committing patches to the project for over six 
months. Emeritus members will be recognized by the PMC on the Accumulo web 
page, in honor of their past contributions. Emeritus members retain all voting 
and commit rights associated with their former designation and can move 
themselves out of emeritus status by sending an announcement of their return to 
the developer mailing list. It will be the returning member's responsibility to 
update their status on the web page accordingly.
 
 An emeritus committer’s commit access may be disabled as part of routine 
security. Access shall not be removed without notifying the committer, and 
access shall be maintained if the committer wishes to leave it active. A 
committer’s commit access shall be reactivated upon the committer’s request 
to the PMC.
 
@@ -78,9 +78,9 @@ The responsibilities of the PMC include:
 
 In particular, PMC members must understand both our project's criteria and ASF 
criteria for voting on a 
[release](http://www.apache.org/dev/release.html#management).
 
-Membership of the PMC is by invitation only and must be approved by a 
consensus approval of active PMC members. Upon acceptance of the invitation to 
become a PMC member, it is the accepting member’s responsibility to update 
his/her status on the Accumulo web page accordingly.
+Membership of the PMC is by invitation only and must be approved by a 
consensus approval of active PMC members. Upon acceptance of the invitation to 
become a PMC member, it is the accepting member’s responsibility to update 
their status on the Accumulo web page accordingly.
 
-A PMC member is considered emeritus, meaning inactive, by his or her own 
declaration or by not contributing in any form to the project for over six 
months. Emeritus members will be recognized by the PMC on the Accumulo web 
page, in honor of their past contributions. Emeritus members retain all voting 
and commit rights associated with their former designation and can move 
themselves out of emeritus status by sending an announcement of their return to 
the developer mailing list. It will be the returning member's responsibility to 
update his/her status on the web page accordingly.
+A PMC member is considered emeritus, meaning inactive, by their own 
declaration or by not contributing in any form to the project for over six 
months. Emeritus members will be recognized by the PMC on the Accumulo web 
page, in honor of their past contributions. Emeritus members retain all voting 
and commit rights associa

svn commit: r902580 - in /websites/production/accumulo/content: ./ 1.4/apidocs/ 1.5/apidocs/

[ctubbsii]

Author: ctubbsii
Date: Thu Mar 20 19:41:12 2014
New Revision: 902580

Log:
Use generic pronouns instead of gender-specific ones

Added:
websites/production/accumulo/content/
  - copied from r902579, websites/staging/accumulo/trunk/content/
websites/production/accumulo/content/1.4/apidocs/
  - copied from r902579, websites/production/accumulo/content/1.4/apidocs/
websites/production/accumulo/content/1.5/apidocs/
  - copied from r902579, websites/production/accumulo/content/1.5/apidocs/

git commit: ACCUMULO-2061 Remove useless javadoc (tag without description)

[ctubbsii]

Repository: accumulo
Updated Branches:
  refs/heads/1.6.0-SNAPSHOT a317ce0da -> 59db6fedd


ACCUMULO-2061 Remove useless javadoc (tag without description)


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

Branch: refs/heads/1.6.0-SNAPSHOT
Commit: 59db6fedd3aea9615be156d1f7a1be08e0de0a86
Parents: a317ce0
Author: Christopher Tubbs 
Authored: Mon Mar 24 14:23:13 2014 -0400
Committer: Christopher Tubbs 
Committed: Mon Mar 24 14:24:40 2014 -0400

--
 .../java/org/apache/accumulo/core/volume/VolumeConfiguration.java | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/59db6fed/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java 
b/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java
index e7a51d7..c901768 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java
@@ -85,9 +85,6 @@ public class VolumeConfiguration {
 
   /**
* Compute the URIs to be used by Accumulo
-   *
-   * @param conf
-   * @return
*/
   public static String[] getVolumeUris(AccumuloConfiguration conf) {
 String ns = conf.get(Property.INSTANCE_VOLUMES);

[1/8] git commit: ACCUMULO-2534 added license headers

[ctubbsii]

Repository: accumulo
Updated Branches:
  refs/heads/master 997f6fe19 -> 24386e2bf


ACCUMULO-2534 added license headers


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

Branch: refs/heads/master
Commit: e308c0ecaafbec095c0f858c6f2c3856032143a0
Parents: ca3f778
Author: Eric C. Newton 
Authored: Mon Mar 24 10:04:00 2014 -0400
Committer: Mike Drob 
Committed: Mon Mar 24 14:08:15 2014 -0400

--
 test/system/bench/README.md   | 16 
 test/system/continuous/README.md  | 17 +
 test/system/randomwalk/README.md  | 17 +
 test/system/scalability/README.md | 17 +
 test/system/test1/README.md   | 17 +
 test/system/test2/README.md   | 17 +
 test/system/test3/README.md   | 17 +
 test/system/test4/README.md   | 17 +
 8 files changed, 135 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e308c0ec/test/system/bench/README.md
--
diff --git a/test/system/bench/README.md b/test/system/bench/README.md
index 8bdf4d1..f4a67a8 100644
--- a/test/system/bench/README.md
+++ b/test/system/bench/README.md
@@ -1,3 +1,19 @@
+
 Benchmark Tests
 ===
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e308c0ec/test/system/continuous/README.md
--
diff --git a/test/system/continuous/README.md b/test/system/continuous/README.md
index 6cf5d81..cc078f3 100644
--- a/test/system/continuous/README.md
+++ b/test/system/continuous/README.md
@@ -1,3 +1,20 @@
+
+
 Continuous Query and Ingest
 ===
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e308c0ec/test/system/randomwalk/README.md
--
diff --git a/test/system/randomwalk/README.md b/test/system/randomwalk/README.md
index 77f766f..495c032 100644
--- a/test/system/randomwalk/README.md
+++ b/test/system/randomwalk/README.md
@@ -1,3 +1,20 @@
+
+
 Apache Accumulo Random Walk Tests
 =
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e308c0ec/test/system/scalability/README.md
--
diff --git a/test/system/scalability/README.md 
b/test/system/scalability/README.md
index d0a5772..93d083a 100644
--- a/test/system/scalability/README.md
+++ b/test/system/scalability/README.md
@@ -1,3 +1,20 @@
+
+
 Apache Accumulo Scalability Tests
 =
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e308c0ec/test/system/test1/README.md
--
diff --git a/test/system/test1/README.md b/test/system/test1/README.md
index ee2de5a..5e461d3 100644
--- a/test/system/test1/README.md
+++ b/test/system/test1/README.md
@@ -1,3 +1,20 @@
+
+
 Command to run from command line
 
 Can run this test with pre-existing splits; use the following command to 
create the table with

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e308c0ec/test/system/test2/README.md
--
diff --git a/test/system/test2/README.md b/test/system/test2/README.md
index 09cbc7a..53956fb 100644
--- a/test/system/test2/README.md
+++ b/test/system/test2/README.md
@@ -1,3 +1,20 @@
+
+
 Test Concurrent Read/Write
 ==
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e308c0ec/test/system/test3/README.md
--
diff --git a/test/system/test3/README.md b/test/system/test3/README.md
index 5aaff23..e63ae78 100644
--- a/test/system/test3/README.md
+++ b/test/system/test3/README.md
@@ -1,3 +1,20 @@
+
+
 Test Creating Big Non-Splittable Row
 
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e308c0ec/test/system/test4/README.md
--
diff --git a/test/system/test4/README.md b/test/system/test4/README.md
index 3f03fc3..95919af 100644
--- a/test/system/test4/README.md
+++ b/test/system/test4/README.md
@@ -1,3 +1,20 @@
+
+
 Test Bulk Importing Data
 
 

[5/8] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT

[ctubbsii]

Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT


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

Branch: refs/heads/master
Commit: 99791a66bba0b273e3ec6a64df6aba110e8800c9
Parents: c5d6c87 7b1a8e7
Author: Mike Drob 
Authored: Mon Mar 24 14:20:47 2014 -0400
Committer: Mike Drob 
Committed: Mon Mar 24 14:20:47 2014 -0400

--
 test/system/auto/README.md | 17 +
 1 file changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/99791a66/test/system/auto/README.md
--

[4/8] git commit: ACCUMULO-2169 Update license headers

[ctubbsii]

ACCUMULO-2169 Update license headers


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

Branch: refs/heads/master
Commit: 7b1a8e7251707d6f1dca8575771057384c34901f
Parents: e308c0e
Author: Mike Drob 
Authored: Mon Mar 24 14:18:33 2014 -0400
Committer: Mike Drob 
Committed: Mon Mar 24 14:20:14 2014 -0400

--
 test/system/auto/README.md | 17 +
 1 file changed, 17 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/7b1a8e72/test/system/auto/README.md
--
diff --git a/test/system/auto/README.md b/test/system/auto/README.md
index 0fb9531..a862d9c 100644
--- a/test/system/auto/README.md
+++ b/test/system/auto/README.md
@@ -1,3 +1,20 @@
+
+
 Apache Accumulo Functional Tests
 
 

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

[ctubbsii]

Merge branch '1.5.2-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/a317ce0d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/a317ce0d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/a317ce0d

Branch: refs/heads/master
Commit: a317ce0da69b59215563c535677c4484544d0297
Parents: efb65a3 99791a6
Author: Mike Drob 
Authored: Mon Mar 24 14:21:07 2014 -0400
Committer: Mike Drob 
Committed: Mon Mar 24 14:21:07 2014 -0400

--

--

[2/8] git commit: Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT

[ctubbsii]

Merge branch '1.4.5-SNAPSHOT' into 1.5.2-SNAPSHOT


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

Branch: refs/heads/master
Commit: c5d6c878c793e479758242cff5c504952f80ee1d
Parents: 0dc92ca e308c0e
Author: Mike Drob 
Authored: Mon Mar 24 14:09:28 2014 -0400
Committer: Mike Drob 
Committed: Mon Mar 24 14:09:28 2014 -0400

--
 test/system/bench/README.md   | 16 
 test/system/continuous/README.md  | 17 +
 test/system/randomwalk/README.md  | 17 +
 test/system/scalability/README.md | 17 +
 test/system/test1/README.md   | 17 +
 test/system/test2/README.md   | 17 +
 test/system/test3/README.md   | 17 +
 test/system/test4/README.md   | 17 +
 8 files changed, 135 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/c5d6c878/test/system/continuous/README.md
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/c5d6c878/test/system/scalability/README.md
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/c5d6c878/test/system/test1/README.md
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/c5d6c878/test/system/test2/README.md
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/c5d6c878/test/system/test4/README.md
--

[7/8] git commit: ACCUMULO-2061 Remove useless javadoc (tag without description)

[ctubbsii]

ACCUMULO-2061 Remove useless javadoc (tag without description)


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

Branch: refs/heads/master
Commit: 59db6fedd3aea9615be156d1f7a1be08e0de0a86
Parents: a317ce0
Author: Christopher Tubbs 
Authored: Mon Mar 24 14:23:13 2014 -0400
Committer: Christopher Tubbs 
Committed: Mon Mar 24 14:24:40 2014 -0400

--
 .../java/org/apache/accumulo/core/volume/VolumeConfiguration.java | 3 ---
 1 file changed, 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/59db6fed/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java 
b/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java
index e7a51d7..c901768 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/volume/VolumeConfiguration.java
@@ -85,9 +85,6 @@ public class VolumeConfiguration {
 
   /**
* Compute the URIs to be used by Accumulo
-   *
-   * @param conf
-   * @return
*/
   public static String[] getVolumeUris(AccumuloConfiguration conf) {
 String ns = conf.get(Property.INSTANCE_VOLUMES);

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

[ctubbsii]

Merge branch '1.5.2-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/efb65a3d
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/efb65a3d
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/efb65a3d

Branch: refs/heads/master
Commit: efb65a3d08d5188aa6a78e8e331450033d0c2013
Parents: 9677fd4 c5d6c87
Author: Mike Drob 
Authored: Mon Mar 24 14:09:42 2014 -0400
Committer: Mike Drob 
Committed: Mon Mar 24 14:09:42 2014 -0400

--

--

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

[ctubbsii]

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/24386e2b
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/24386e2b
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/24386e2b

Branch: refs/heads/master
Commit: 24386e2bff4c469153b4075bf21138d9398db8d9
Parents: 997f6fe 59db6fe
Author: Christopher Tubbs 
Authored: Mon Mar 24 14:52:11 2014 -0400
Committer: Christopher Tubbs 
Committed: Mon Mar 24 14:52:11 2014 -0400

--
 .../java/org/apache/accumulo/core/volume/VolumeConfiguration.java | 3 ---
 1 file changed, 3 deletions(-)
--

git commit: Fix recent warnings introduced by several tickets

[ctubbsii]

Repository: accumulo
Updated Branches:
  refs/heads/1.4.5-SNAPSHOT 88761e05b -> 4ee0f6494


Fix recent warnings introduced by several tickets

ACCUMULO-2005
ACCUMULO-2182
ACCUMULO-2224
ACCUMULO-2234
ACCUMULO-2539


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

Branch: refs/heads/1.4.5-SNAPSHOT
Commit: 4ee0f6494ea0d2265d930bce962ebcc3c7dbfe5c
Parents: 88761e0
Author: Christopher Tubbs 
Authored: Wed Mar 26 12:45:35 2014 -0400
Committer: Christopher Tubbs 
Committed: Wed Mar 26 12:47:05 2014 -0400

--
 .../org/apache/accumulo/core/client/impl/OfflineScanner.java| 2 --
 .../main/java/org/apache/accumulo/core/iterators/Combiner.java  | 4 ++--
 .../main/java/org/apache/accumulo/core/util/AddressUtil.java| 5 ++---
 .../java/org/apache/accumulo/core/util/AddressUtilTest.java | 2 +-
 .../org/apache/accumulo/server/test/functional/RunTests.java| 2 +-
 .../java/org/apache/accumulo/server/test/randomwalk/State.java  | 1 -
 6 files changed, 6 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4ee0f649/src/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
--
diff --git 
a/src/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
 
b/src/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
index 244bfef..cc83230 100644
--- 
a/src/core/src/main/java/org/apache/accumulo/core/client/impl/OfflineScanner.java
+++ 
b/src/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/4ee0f649/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
--
diff --git 
a/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java 
b/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
index 083e93e..e8e0d8c 100644
--- a/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
+++ b/src/core/src/main/java/org/apache/accumulo/core/iterators/Combiner.java
@@ -38,8 +38,8 @@ import org.apache.log4j.Logger;
 
 /**
  * A SortedKeyValueIterator that combines the Values for different versions 
(timestamp) of a Key within a row into a single Value. Combiner will replace 
one or
- * more versions of a Key and their Values with the most recent Key and a 
Value which is the result of the reduce method. An {@link 
IteratorSetting.Column}
- * which only specifies a column family will combine all Keys in that column 
family individually. Similarly, a {@link IteratorSetting.Column} which 
specifies a
+ * more versions of a Key and their Values with the most recent Key and a 
Value which is the result of the reduce method. An {@link Column}
+ * which only specifies a column family will combine all Keys in that column 
family individually. Similarly, a {@link Column} which specifies a
  * column family and column qualifier will combine all Keys in column family 
and qualifier individually. Combination is only ever performed on multiple 
versions
  * and not across column qualifiers or column visibilities.
  * 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4ee0f649/src/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java
--
diff --git 
a/src/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java 
b/src/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java
index 96c2e18..05b7198 100644
--- a/src/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java
+++ b/src/core/src/main/java/org/apache/accumulo/core/util/AddressUtil.java
@@ -16,14 +16,13 @@
  */
 package org.apache.accumulo.core.util;
 
-import java.net.InetAddress; // workaround to enable @see/@link hyperlink
+import java.net.InetAddress;
 import java.net.InetSocketAddress;
 import java.net.UnknownHostException;
 import java.security.Security;
 
 import org.apache.hadoop.io.Text;
 import org.apache.thrift.transport.TSocket;
-
 import org.apache.log4j.