svn commit: r1688848 - /accumulo/site/trunk/content/release_notes/1.6.3.mdtext

2015-07-02 Thread ecn 
Author: ecn
Date: Thu Jul  2 15:25:55 2015
New Revision: 1688848

URL: http://svn.apache.org/r1688848
Log:
CMS commit to accumulo by ecn

Modified:
accumulo/site/trunk/content/release_notes/1.6.3.mdtext

Modified: accumulo/site/trunk/content/release_notes/1.6.3.mdtext
URL: 
http://svn.apache.org/viewvc/accumulo/site/trunk/content/release_notes/1.6.3.mdtext?rev=1688848r1=1688847r2=1688848view=diff
==
--- accumulo/site/trunk/content/release_notes/1.6.3.mdtext (original)
+++ accumulo/site/trunk/content/release_notes/1.6.3.mdtext Thu Jul  2 15:25:55 
2015
@@ -69,6 +69,9 @@ longer necessary as this bug was fixed b
  * [ACCUMULO-3890][ACCUMULO-3890] Fixed a performance issue with 
CredentialProvider. Information
stored in the CredentialProvider was not cached which resulted in 
repeatedly reading the
file from HDFS which can degrade HDFS performance.
+ * [ACCUMULO-3747][ACCUMULO-3747] Thrashing tablet servers would be removed 
from the Monitor's Dead Server list.
+ * [ACCUMULO-3696][ACCUMULO-3696] Tracing could queue too many traces
+ * [ACCUMULO-3597][ACCUMULO-3597] Problems processing routing messages would 
prevent critical messages from being processed.
 
 ## Known Issues

svn commit: r956694 - in /websites/staging/accumulo/trunk/content: ./ release_notes/1.6.3.html

2015-07-02 Thread buildbot 
Author: buildbot
Date: Thu Jul  2 15:26:12 2015
New Revision: 956694

Log:
Staging update by buildbot for accumulo

Modified:
websites/staging/accumulo/trunk/content/   (props changed)
websites/staging/accumulo/trunk/content/release_notes/1.6.3.html

Propchange: websites/staging/accumulo/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu Jul  2 15:26:12 2015
@@ -1 +1 @@
-1688761
+1688848

Modified: websites/staging/accumulo/trunk/content/release_notes/1.6.3.html
==
--- websites/staging/accumulo/trunk/content/release_notes/1.6.3.html (original)
+++ websites/staging/accumulo/trunk/content/release_notes/1.6.3.html Thu Jul  2 
15:26:12 2015
@@ -262,6 +262,9 @@ longer necessary as this bug was fixed b
 lia 
href=https://issues.apache.org/jira/browse/ACCUMULO-3890;ACCUMULO-3890/a 
Fixed a performance issue with CredentialProvider. Information
stored in the CredentialProvider was not cached which resulted in 
repeatedly reading the
file from HDFS which can degrade HDFS performance./li
+li[ACCUMULO-3747][ACCUMULO-3747] Thrashing tablet servers would be removed 
from the Monitor's Dead Server list./li
+li[ACCUMULO-3696][ACCUMULO-3696] Tracing could queue too many traces/li
+lia 
href=https://issues.apache.org/jira/browse/ACCUMULO-3597;ACCUMULO-3597/a 
Problems processing routing messages would prevent critical messages from being 
processed./li
 /ul
 h2 id=known-issuesKnown Issues/h2
 pDuring testing a 
href=https://issues.apache.org/jira/browse/HDFS-8406;HDFS-8406/a was 
encountered which is summarized by write-ahead log recovery

svn commit: r1688853 - /accumulo/site/trunk/content/release_notes/1.6.3.mdtext

2015-07-02 Thread kturner 
Author: kturner
Date: Thu Jul  2 16:11:47 2015
New Revision: 1688853

URL: http://svn.apache.org/r1688853
Log:
Added a known issue and info about ITs to release notes 

Modified:
accumulo/site/trunk/content/release_notes/1.6.3.mdtext

Modified: accumulo/site/trunk/content/release_notes/1.6.3.mdtext
URL: 
http://svn.apache.org/viewvc/accumulo/site/trunk/content/release_notes/1.6.3.mdtext?rev=1688853r1=1688852r2=1688853view=diff
==
--- accumulo/site/trunk/content/release_notes/1.6.3.mdtext (original)
+++ accumulo/site/trunk/content/release_notes/1.6.3.mdtext Thu Jul  2 16:11:47 
2015
@@ -56,8 +56,10 @@ longer necessary as this bug was fixed b
 
  * [ACCUMULO-3589][ACCUMULO-3589] `du` in Shell does not check table existence.
  * [ACCUMULO-3692][ACCUMULO-3692] Offline'ing a table disabled subsequent 
balancing.
+ * [ACCUMULO-3696][ACCUMULO-3696] Tracing could queue too many traces
  * [ACCUMULO-3718][ACCUMULO-3718] Fixed a bug that prevented a Mutation from
being created in Scala.
+ * [ACCUMULO-3747][ACCUMULO-3747] Thrashing tablet servers would be removed 
from the Monitor's Dead Server list.
  * [ACCUMULO-3750][ACCUMULO-3750] Fixed an issue where the Master would 
perpetually
fail when there was a bad `instance.secret` setting.
  * [ACCUMULO-3784][ACCUMULO-3784] Fixed a bug in `getauths` Shell command 
where it
@@ -69,9 +71,6 @@ longer necessary as this bug was fixed b
  * [ACCUMULO-3890][ACCUMULO-3890] Fixed a performance issue with 
CredentialProvider. Information
stored in the CredentialProvider was not cached which resulted in 
repeatedly reading the
file from HDFS which can degrade HDFS performance.
- * [ACCUMULO-3747][ACCUMULO-3747] Thrashing tablet servers would be removed 
from the Monitor's Dead Server list.
- * [ACCUMULO-3696][ACCUMULO-3696] Tracing could queue too many traces
- * [ACCUMULO-3597][ACCUMULO-3597] Problems processing routing messages would 
prevent critical messages from being processed.
 
 ## Known Issues
 
@@ -84,6 +83,11 @@ this issue, the following steps can be d
  3. Delete the walog whose lease can not be recovered.
  4. Move TMP_WALOG to the filename of the walog deleted in the previous step.
 
+Using the `fetchColumns()` method on a scanner in conjunction with custom 
iterators that 
+add column families in their `seek()` method can lead to unexpected behavior.  
See 
+[ACCUMULO-3905][ACCUMULO-3905] for more details.  In that issue javadoc 
updates were made,
+but the updates did not make it into 1.6.3. 
+
 ## Testing
 
 Each unit and functional test only runs on a single node, while the RandomWalk
@@ -102,7 +106,7 @@ HDFS High-Availability instances, forcin
   /tr
   tr
 tdAmazon Linux 2014.09/td
-td2.6/td
+td2.6.0/td
 td20/td
 td3.4.5/td
 tdNo/td
@@ -110,7 +114,7 @@ HDFS High-Availability instances, forcin
   /tr
   tr
 tdAmazon Linux 2014.09/td
-td2.6/td
+td2.6.0/td
 td20/td
 td3.4.5/td
 tdNo/td
@@ -124,7 +128,14 @@ HDFS High-Availability instances, forcin
 tdNo/td
 tdContinuous Ingest and Verify (6B entries)/td
   /tr
-
+  tr
+tdCentos 6.6/tdt
+td2.2.0/td
+td6/td
+td3.4.5/td
+tdNo/td
+tdAll integration test passed.  Some needed to be run a 2nd time./td
+  /tr
 /table
 
 [1]: https://issues.apache.org/jira/browse/HDFS-8406
@@ -136,12 +147,15 @@ HDFS High-Availability instances, forcin
 [ACCUMULO-3589]: https://issues.apache.org/jira/browse/ACCUMULO-3589
 [ACCUMULO-3597]: https://issues.apache.org/jira/browse/ACCUMULO-3597
 [ACCUMULO-3692]: https://issues.apache.org/jira/browse/ACCUMULO-3692
+[ACCUMULO-3696]: https://issues.apache.org/jira/browse/ACCUMULO-3696
 [ACCUMULO-3709]: https://issues.apache.org/jira/browse/ACCUMULO-3709
 [ACCUMULO-3718]: https://issues.apache.org/jira/browse/ACCUMULO-3718
 [ACCUMULO-3745]: https://issues.apache.org/jira/browse/ACCUMULO-3745
+[ACCUMULO-3747]: https://issues.apache.org/jira/browse/ACCUMULO-3747
 [ACCUMULO-3750]: https://issues.apache.org/jira/browse/ACCUMULO-3750
 [ACCUMULO-3784]: https://issues.apache.org/jira/browse/ACCUMULO-3784
 [ACCUMULO-3796]: https://issues.apache.org/jira/browse/ACCUMULO-3796
 [ACCUMULO-3859]: https://issues.apache.org/jira/browse/ACCUMULO-3859
 [ACCUMULO-3880]: https://issues.apache.org/jira/browse/ACCUMULO-3880
 [ACCUMULO-3890]: https://issues.apache.org/jira/browse/ACCUMULO-3890
+[ACCUMULO-3905]: https://issues.apache.org/jira/browse/ACCUMULO-3905

svn commit: r956699 - in /websites/staging/accumulo/trunk/content: ./ release_notes/1.6.3.html

2015-07-02 Thread buildbot 
Author: buildbot
Date: Thu Jul  2 16:11:55 2015
New Revision: 956699

Log:
Staging update by buildbot for accumulo

Modified:
websites/staging/accumulo/trunk/content/   (props changed)
websites/staging/accumulo/trunk/content/release_notes/1.6.3.html

Propchange: websites/staging/accumulo/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu Jul  2 16:11:55 2015
@@ -1 +1 @@
-1688848
+1688853

Modified: websites/staging/accumulo/trunk/content/release_notes/1.6.3.html
==
--- websites/staging/accumulo/trunk/content/release_notes/1.6.3.html (original)
+++ websites/staging/accumulo/trunk/content/release_notes/1.6.3.html Thu Jul  2 
16:11:55 2015
@@ -249,8 +249,10 @@ longer necessary as this bug was fixed b
 ul
 lia 
href=https://issues.apache.org/jira/browse/ACCUMULO-3589;ACCUMULO-3589/a 
codedu/code in Shell does not check table existence./li
 lia 
href=https://issues.apache.org/jira/browse/ACCUMULO-3692;ACCUMULO-3692/a 
Offline'ing a table disabled subsequent balancing./li
+lia 
href=https://issues.apache.org/jira/browse/ACCUMULO-3696;ACCUMULO-3696/a 
Tracing could queue too many traces/li
 lia 
href=https://issues.apache.org/jira/browse/ACCUMULO-3718;ACCUMULO-3718/a 
Fixed a bug that prevented a Mutation from
being created in Scala./li
+lia 
href=https://issues.apache.org/jira/browse/ACCUMULO-3747;ACCUMULO-3747/a 
Thrashing tablet servers would be removed from the Monitor's Dead Server 
list./li
 lia 
href=https://issues.apache.org/jira/browse/ACCUMULO-3750;ACCUMULO-3750/a 
Fixed an issue where the Master would perpetually
fail when there was a bad codeinstance.secret/code setting./li
 lia 
href=https://issues.apache.org/jira/browse/ACCUMULO-3784;ACCUMULO-3784/a 
Fixed a bug in codegetauths/code Shell command where it
@@ -262,9 +264,6 @@ longer necessary as this bug was fixed b
 lia 
href=https://issues.apache.org/jira/browse/ACCUMULO-3890;ACCUMULO-3890/a 
Fixed a performance issue with CredentialProvider. Information
stored in the CredentialProvider was not cached which resulted in 
repeatedly reading the
file from HDFS which can degrade HDFS performance./li
-li[ACCUMULO-3747][ACCUMULO-3747] Thrashing tablet servers would be removed 
from the Monitor's Dead Server list./li
-li[ACCUMULO-3696][ACCUMULO-3696] Tracing could queue too many traces/li
-lia 
href=https://issues.apache.org/jira/browse/ACCUMULO-3597;ACCUMULO-3597/a 
Problems processing routing messages would prevent critical messages from being 
processed./li
 /ul
 h2 id=known-issuesKnown Issues/h2
 pDuring testing a 
href=https://issues.apache.org/jira/browse/HDFS-8406;HDFS-8406/a was 
encountered which is summarized by write-ahead log recovery
@@ -276,6 +275,10 @@ this issue, the following steps can be d
 liDelete the walog whose lease can not be recovered./li
 liMove TMP_WALOG to the filename of the walog deleted in the previous 
step./li
 /ol
+pUsing the codefetchColumns()/code method on a scanner in conjunction 
with custom iterators that 
+add column families in their codeseek()/code method can lead to unexpected 
behavior.  See 
+a 
href=https://issues.apache.org/jira/browse/ACCUMULO-3905;ACCUMULO-3905/a 
for more details.  In that issue javadoc updates were made,
+but the updates did not make it into 1.6.3. /p
 h2 id=testingTesting/h2
 pEach unit and functional test only runs on a single node, while the 
RandomWalk
 and Continuous Ingest tests run on any number of nodes. emAgitation/em 
refers to
@@ -292,7 +295,7 @@ HDFS High-Availability instances, forcin
   /tr
   tr
 tdAmazon Linux 2014.09/td
-td2.6/td
+td2.6.0/td
 td20/td
 td3.4.5/td
 tdNo/td
@@ -300,7 +303,7 @@ HDFS High-Availability instances, forcin
   /tr
   tr
 tdAmazon Linux 2014.09/td
-td2.6/td
+td2.6.0/td
 td20/td
 td3.4.5/td
 tdNo/td
@@ -314,7 +317,14 @@ HDFS High-Availability instances, forcin
 tdNo/td
 tdContinuous Ingest and Verify (6B entries)/td
   /tr
-
+  tr
+tdCentos 6.6/tdt
+td2.2.0/td
+td6/td
+td3.4.5/td
+tdNo/td
+tdAll integration test passed.  Some needed to be run a 2nd time./td
+  /tr
 /table
   /div

[2/2] accumulo git commit: ACCUMULO-3927 Commit checkstyle changes

2015-07-02 Thread elserj 
ACCUMULO-3927 Commit checkstyle changes


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

Branch: refs/heads/master
Commit: eb1ba18607e1afd3d15a7ba86f968fe47e53d7b8
Parents: bb031b3
Author: Josh Elser els...@apache.org
Authored: Thu Jul 2 13:27:27 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu Jul 2 13:27:27 2015 -0400

--
 .../org/apache/accumulo/tserver/tablet/SplitInfo.java|  6 +++---
 .../java/org/apache/accumulo/tserver/tablet/Tablet.java  | 11 ++-
 .../main/java/org/apache/accumulo/test/ManySplitIT.java  |  5 ++---
 3 files changed, 11 insertions(+), 11 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/eb1ba186/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/SplitInfo.java
--
diff --git 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/SplitInfo.java
 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/SplitInfo.java
index 64b6a11..3cae52c 100644
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/SplitInfo.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/SplitInfo.java
@@ -41,10 +41,10 @@ final public class SplitInfo {
   private final long initFlushID;
   private final long initCompactID;
   private final TServerInstance lastLocation;
-  private final MapLong, ? extends CollectionFileRef bulkImported;
+  private final MapLong,? extends CollectionFileRef bulkImported;
 
   SplitInfo(String d, SortedMapFileRef,DataFileValue dfv, String time, long 
initFlushID, long initCompactID, TServerInstance lastLocation,
-  MapLong, ? extends CollectionFileRef bulkImported) {
+  MapLong,? extends CollectionFileRef bulkImported) {
 this.dir = d;
 this.datafiles = dfv;
 this.time = time;
@@ -78,7 +78,7 @@ final public class SplitInfo {
 return lastLocation;
   }
 
-  public MapLong, ? extends CollectionFileRef getBulkImported() {
+  public MapLong,? extends CollectionFileRef getBulkImported() {
 return bulkImported;
   }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/eb1ba186/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
--
diff --git 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
index c0fb918..a40c95d 100644
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/tablet/Tablet.java
@@ -322,7 +322,7 @@ public class Tablet implements TabletCommitter {
   }
 
   private Tablet(TabletServer tabletServer, Text location, KeyExtent extent, 
TabletResourceManager trm, SortedMapFileRef,DataFileValue datafiles,
-  String time, long initFlushID, long initCompactID, TServerInstance 
lastLocation, MapLong, ? extends CollectionFileRef bulkImported) throws 
IOException {
+  String time, long initFlushID, long initCompactID, TServerInstance 
lastLocation, MapLong,? extends CollectionFileRef bulkImported) throws 
IOException {
 this(tabletServer, extent, location, trm, NO_LOG_ENTRIES, datafiles, time, 
lastLocation, new HashSetFileRef(), initFlushID, initCompactID, bulkImported);
   }
 
@@ -445,7 +445,7 @@ public class Tablet implements TabletCommitter {
 return null;
   }
 
-  private static MapLong, ListFileRef 
lookupBulkImported(SortedMapKey,Value tabletsKeyValues, VolumeManager fs) {
+  private static MapLong,ListFileRef 
lookupBulkImported(SortedMapKey,Value tabletsKeyValues, VolumeManager fs) {
 MapLong,ListFileRef result = new HashMap();
 for (EntryKey,Value entry : tabletsKeyValues.entrySet()) {
   if 
(entry.getKey().getColumnFamily().compareTo(BulkFileColumnFamily.NAME) == 0) {
@@ -473,7 +473,8 @@ public class Tablet implements TabletCommitter {
*/
   private Tablet(final TabletServer tabletServer, final KeyExtent extent, 
final Text location, final TabletResourceManager trm,
   final ListLogEntry rawLogEntries, final 
SortedMapFileRef,DataFileValue rawDatafiles, String time, final 
TServerInstance lastLocation,
-  final SetFileRef scanFiles, final long initFlushID, final long 
initCompactID, final MapLong, ? extends CollectionFileRef bulkImported) 
throws IOException {
+  final SetFileRef scanFiles, final long initFlushID, final long 
initCompactID, final MapLong,? extends CollectionFileRef bulkImported)
+  throws IOException {
 
 TableConfiguration tblConf =

[1/2] accumulo git commit: ACCUMULO-3925 Wrap expected exceptions in a special class for better handling

2015-07-02 Thread elserj 
Repository: accumulo
Updated Branches:
  refs/heads/master 560b3a5d1 - eb1ba1860


ACCUMULO-3925 Wrap expected exceptions in a special class for better handling

Since the FATE runner is the one which logs errors when an operation
throws an exception, we need to pass extra state up to the runner to
discern between unexpected failure and expected failure. We do this
by wrapping the original exception.


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

Branch: refs/heads/master
Commit: bb031b34f880b50ab5c796b0b5ec3515434efeb1
Parents: 560b3a5
Author: Josh Elser els...@apache.org
Authored: Mon Jun 29 13:24:31 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu Jul 2 12:38:07 2015 -0400

--
 ...AcceptableThriftTableOperationException.java | 34 
 .../accumulo/fate/AcceptableException.java  | 29 +
 .../java/org/apache/accumulo/fate/Fate.java |  9 +-
 .../accumulo/master/FateServiceHandler.java |  6 ++--
 .../accumulo/master/tableOps/BulkImport.java| 20 ++--
 .../master/tableOps/ClonePermissions.java   |  4 +--
 .../accumulo/master/tableOps/CloneTable.java|  7 ++--
 .../accumulo/master/tableOps/CompactRange.java  | 10 +++---
 .../master/tableOps/CompactionDriver.java   |  8 ++---
 .../tableOps/ImportPopulateZookeeper.java   |  6 ++--
 .../accumulo/master/tableOps/ImportTable.java   | 12 +++
 .../accumulo/master/tableOps/LoadFiles.java |  4 +--
 .../master/tableOps/MapImportFileNames.java |  4 +--
 .../master/tableOps/MoveExportedFiles.java  |  6 ++--
 .../master/tableOps/PopulateMetadataTable.java  |  8 ++---
 .../master/tableOps/RenameNamespace.java|  4 +--
 .../accumulo/master/tableOps/RenameTable.java   |  6 ++--
 .../accumulo/master/tableOps/TableRangeOp.java  |  6 ++--
 .../apache/accumulo/master/tableOps/Utils.java  | 19 +--
 .../master/tableOps/WriteExportFiles.java   |  8 ++---
 20 files changed, 142 insertions(+), 68 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/bb031b34/core/src/main/java/org/apache/accumulo/core/client/impl/AcceptableThriftTableOperationException.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/AcceptableThriftTableOperationException.java
 
b/core/src/main/java/org/apache/accumulo/core/client/impl/AcceptableThriftTableOperationException.java
new file mode 100644
index 000..98c1bf5
--- /dev/null
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/AcceptableThriftTableOperationException.java
@@ -0,0 +1,34 @@
+/*
+ * 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.impl;
+
+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.ThriftTableOperationException;
+import org.apache.accumulo.fate.AcceptableException;
+
+/**
+ * Concrete implementation of {@link AcceptableException} for table operations.
+ */
+public class AcceptableThriftTableOperationException extends 
ThriftTableOperationException implements AcceptableException {
+
+  private static final long serialVersionUID = 1L;
+
+  public AcceptableThriftTableOperationException(String tableId, String 
tableName, TableOperation op, TableOperationExceptionType type, String 
description) {
+super(tableId, tableName, op, type, description);
+  }
+}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bb031b34/fate/src/main/java/org/apache/accumulo/fate/AcceptableException.java
--
diff --git 
a/fate/src/main/java/org/apache/accumulo/fate/AcceptableException.java

[2/2] accumulo git commit: Merge branch '1.6' into 1.7

2015-07-02 Thread kturner 
Merge branch '1.6' into 1.7


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

Branch: refs/heads/1.7
Commit: 00d83914e789d3431bf54be8f4c8c34c3e458cd4
Parents: a3722ca 985c906
Author: Keith Turner ke...@deenlo.com
Authored: Thu Jul 2 13:55:43 2015 -0400
Committer: Keith Turner ke...@deenlo.com
Committed: Thu Jul 2 13:55:43 2015 -0400

--
 .../accumulo/core/client/ScannerBase.java   | 20 
 1 file changed, 20 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/00d83914/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
--
diff --cc core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
index 92ab551,7eccdcf..b5692d2
--- a/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
@@@ -65,12 -63,14 +65,17 @@@ public interface ScannerBase extends It
void updateScanIteratorOption(String iteratorName, String key, String 
value);
  
/**
+* p
 * Adds a column family to the list of columns that will be fetched by this 
scanner. By default when no columns have been added the scanner fetches all
 -   * columns.
 +   * columns. To fetch multiple column families call this function multiple 
times.
 +   *
 +   * p
 +   * This can help limit which locality groups are read on the server side.
 *
+* p
+* When used in conjunction with custom iterators, the set of column 
families fetched is passed to the top iterator's seek method. Custom iterators 
may change
+* this set of column families when calling seek on their source.
+*
 * @param col
 *  the column family to be fetched
 */

accumulo git commit: ACCUMULO-3905 Added warning to fetchColumns javadoc

2015-07-02 Thread kturner 
Repository: accumulo
Updated Branches:
  refs/heads/1.6 32baa4ab3 - 985c90680


ACCUMULO-3905 Added warning to fetchColumns javadoc


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

Branch: refs/heads/1.6
Commit: 985c90680eb43a9f2d99359b47a2178249627ebc
Parents: 32baa4a
Author: Keith Turner ke...@deenlo.com
Authored: Thu Jul 2 13:52:39 2015 -0400
Committer: Keith Turner ke...@deenlo.com
Committed: Thu Jul 2 13:52:39 2015 -0400

--
 .../accumulo/core/client/ScannerBase.java   | 21 
 1 file changed, 21 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/985c9068/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java 
b/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
index 82a3299..7eccdcf 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
@@ -63,18 +63,38 @@ public interface ScannerBase extends 
IterableEntryKey,Value {
   void updateScanIteratorOption(String iteratorName, String key, String value);
 
   /**
+   * p
* Adds a column family to the list of columns that will be fetched by this 
scanner. By default when no columns have been added the scanner fetches all
* columns.
*
+   * p
+   * When used in conjunction with custom iterators, the set of column 
families fetched is passed to the top iterator's seek method. Custom iterators 
may change
+   * this set of column families when calling seek on their source.
+   *
* @param col
*  the column family to be fetched
*/
   void fetchColumnFamily(Text col);
 
   /**
+   * p
* Adds a column to the list of columns that will be fetched by this 
scanner. The column is identified by family and qualifier. By default when no 
columns
* have been added the scanner fetches all columns.
*
+   * p
+   * bWARNING/b. Using this method with custom iterators may have 
unexpected results. Iterators have control over which column families are 
fetched. However
+   * iterators have no control over which column qualifiers are fetched. When 
this method is called it activates a system iterator that only allows the
+   * requested family/qualifier pairs through. This low level filtering 
prevents custom iterators from requesting additional column families when 
calling seek.
+   *
+   * p
+   * For an example, assume fetchColumns(A, Q1) and fetchColumns(B,Q1) is 
called on a scanner and a custom iterator is configured. The families (A,B) 
will be
+   * passed to the seek method of the custom iterator. If the custom iterator 
seeks its source iterator using the families (A,B,C), it will never see any data
+   * from C because the system iterator filtering A:Q1 and B:Q1 will prevent 
the C family from getting through. ACCUMULO-3905 also has an example of the 
type of
+   * problem this method can cause.
+   *
+   * p
+   * tl;dr If using a custom iterator with a seek method that adds column 
families, then may want to avoid using this method.
+   *
* @param colFam
*  the column family of the column to be fetched
* @param colQual
@@ -100,6 +120,7 @@ public interface ScannerBase extends 
IterableEntryKey,Value {
*
* @return an iterator over Key,Value pairs which meet the restrictions set 
on the scanner
*/
+  @Override
   IteratorEntryKey,Value iterator();
 
   /**

[1/2] accumulo git commit: ACCUMULO-3905 Added warning to fetchColumns javadoc

2015-07-02 Thread kturner 
Repository: accumulo
Updated Branches:
  refs/heads/1.7 a3722ca7a - 00d83914e


ACCUMULO-3905 Added warning to fetchColumns javadoc


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

Branch: refs/heads/1.7
Commit: 985c90680eb43a9f2d99359b47a2178249627ebc
Parents: 32baa4a
Author: Keith Turner ke...@deenlo.com
Authored: Thu Jul 2 13:52:39 2015 -0400
Committer: Keith Turner ke...@deenlo.com
Committed: Thu Jul 2 13:52:39 2015 -0400

--
 .../accumulo/core/client/ScannerBase.java   | 21 
 1 file changed, 21 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/985c9068/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java 
b/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
index 82a3299..7eccdcf 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
@@ -63,18 +63,38 @@ public interface ScannerBase extends 
IterableEntryKey,Value {
   void updateScanIteratorOption(String iteratorName, String key, String value);
 
   /**
+   * p
* Adds a column family to the list of columns that will be fetched by this 
scanner. By default when no columns have been added the scanner fetches all
* columns.
*
+   * p
+   * When used in conjunction with custom iterators, the set of column 
families fetched is passed to the top iterator's seek method. Custom iterators 
may change
+   * this set of column families when calling seek on their source.
+   *
* @param col
*  the column family to be fetched
*/
   void fetchColumnFamily(Text col);
 
   /**
+   * p
* Adds a column to the list of columns that will be fetched by this 
scanner. The column is identified by family and qualifier. By default when no 
columns
* have been added the scanner fetches all columns.
*
+   * p
+   * bWARNING/b. Using this method with custom iterators may have 
unexpected results. Iterators have control over which column families are 
fetched. However
+   * iterators have no control over which column qualifiers are fetched. When 
this method is called it activates a system iterator that only allows the
+   * requested family/qualifier pairs through. This low level filtering 
prevents custom iterators from requesting additional column families when 
calling seek.
+   *
+   * p
+   * For an example, assume fetchColumns(A, Q1) and fetchColumns(B,Q1) is 
called on a scanner and a custom iterator is configured. The families (A,B) 
will be
+   * passed to the seek method of the custom iterator. If the custom iterator 
seeks its source iterator using the families (A,B,C), it will never see any data
+   * from C because the system iterator filtering A:Q1 and B:Q1 will prevent 
the C family from getting through. ACCUMULO-3905 also has an example of the 
type of
+   * problem this method can cause.
+   *
+   * p
+   * tl;dr If using a custom iterator with a seek method that adds column 
families, then may want to avoid using this method.
+   *
* @param colFam
*  the column family of the column to be fetched
* @param colQual
@@ -100,6 +120,7 @@ public interface ScannerBase extends 
IterableEntryKey,Value {
*
* @return an iterator over Key,Value pairs which meet the restrictions set 
on the scanner
*/
+  @Override
   IteratorEntryKey,Value iterator();
 
   /**

[2/3] accumulo git commit: Merge branch '1.6' into 1.7

2015-07-02 Thread kturner 
Merge branch '1.6' into 1.7


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

Branch: refs/heads/master
Commit: 00d83914e789d3431bf54be8f4c8c34c3e458cd4
Parents: a3722ca 985c906
Author: Keith Turner ke...@deenlo.com
Authored: Thu Jul 2 13:55:43 2015 -0400
Committer: Keith Turner ke...@deenlo.com
Committed: Thu Jul 2 13:55:43 2015 -0400

--
 .../accumulo/core/client/ScannerBase.java   | 20 
 1 file changed, 20 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/00d83914/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
--
diff --cc core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
index 92ab551,7eccdcf..b5692d2
--- a/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
@@@ -65,12 -63,14 +65,17 @@@ public interface ScannerBase extends It
void updateScanIteratorOption(String iteratorName, String key, String 
value);
  
/**
+* p
 * Adds a column family to the list of columns that will be fetched by this 
scanner. By default when no columns have been added the scanner fetches all
 -   * columns.
 +   * columns. To fetch multiple column families call this function multiple 
times.
 +   *
 +   * p
 +   * This can help limit which locality groups are read on the server side.
 *
+* p
+* When used in conjunction with custom iterators, the set of column 
families fetched is passed to the top iterator's seek method. Custom iterators 
may change
+* this set of column families when calling seek on their source.
+*
 * @param col
 *  the column family to be fetched
 */

[1/3] accumulo git commit: ACCUMULO-3905 Added warning to fetchColumns javadoc

2015-07-02 Thread kturner 
Repository: accumulo
Updated Branches:
  refs/heads/master eb1ba1860 - 618003dde


ACCUMULO-3905 Added warning to fetchColumns javadoc


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

Branch: refs/heads/master
Commit: 985c90680eb43a9f2d99359b47a2178249627ebc
Parents: 32baa4a
Author: Keith Turner ke...@deenlo.com
Authored: Thu Jul 2 13:52:39 2015 -0400
Committer: Keith Turner ke...@deenlo.com
Committed: Thu Jul 2 13:52:39 2015 -0400

--
 .../accumulo/core/client/ScannerBase.java   | 21 
 1 file changed, 21 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/985c9068/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java 
b/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
index 82a3299..7eccdcf 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
@@ -63,18 +63,38 @@ public interface ScannerBase extends 
IterableEntryKey,Value {
   void updateScanIteratorOption(String iteratorName, String key, String value);
 
   /**
+   * p
* Adds a column family to the list of columns that will be fetched by this 
scanner. By default when no columns have been added the scanner fetches all
* columns.
*
+   * p
+   * When used in conjunction with custom iterators, the set of column 
families fetched is passed to the top iterator's seek method. Custom iterators 
may change
+   * this set of column families when calling seek on their source.
+   *
* @param col
*  the column family to be fetched
*/
   void fetchColumnFamily(Text col);
 
   /**
+   * p
* Adds a column to the list of columns that will be fetched by this 
scanner. The column is identified by family and qualifier. By default when no 
columns
* have been added the scanner fetches all columns.
*
+   * p
+   * bWARNING/b. Using this method with custom iterators may have 
unexpected results. Iterators have control over which column families are 
fetched. However
+   * iterators have no control over which column qualifiers are fetched. When 
this method is called it activates a system iterator that only allows the
+   * requested family/qualifier pairs through. This low level filtering 
prevents custom iterators from requesting additional column families when 
calling seek.
+   *
+   * p
+   * For an example, assume fetchColumns(A, Q1) and fetchColumns(B,Q1) is 
called on a scanner and a custom iterator is configured. The families (A,B) 
will be
+   * passed to the seek method of the custom iterator. If the custom iterator 
seeks its source iterator using the families (A,B,C), it will never see any data
+   * from C because the system iterator filtering A:Q1 and B:Q1 will prevent 
the C family from getting through. ACCUMULO-3905 also has an example of the 
type of
+   * problem this method can cause.
+   *
+   * p
+   * tl;dr If using a custom iterator with a seek method that adds column 
families, then may want to avoid using this method.
+   *
* @param colFam
*  the column family of the column to be fetched
* @param colQual
@@ -100,6 +120,7 @@ public interface ScannerBase extends 
IterableEntryKey,Value {
*
* @return an iterator over Key,Value pairs which meet the restrictions set 
on the scanner
*/
+  @Override
   IteratorEntryKey,Value iterator();
 
   /**

[3/3] accumulo git commit: Merge branch '1.7'

2015-07-02 Thread kturner 
Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 618003ddebcac170b384c947ba7d185deb37b52f
Parents: eb1ba18 00d8391
Author: Keith Turner ke...@deenlo.com
Authored: Thu Jul 2 13:58:09 2015 -0400
Committer: Keith Turner ke...@deenlo.com
Committed: Thu Jul 2 13:58:09 2015 -0400

--
 .../accumulo/core/client/ScannerBase.java   | 20 
 1 file changed, 20 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/618003dd/core/src/main/java/org/apache/accumulo/core/client/ScannerBase.java
--

[6/8] accumulo git commit: ACCUMULO-3928 Use slf4j's fancy variable replacement

2015-07-02 Thread elserj 
ACCUMULO-3928 Use slf4j's fancy variable replacement


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

Branch: refs/heads/master
Commit: ba300baaa4826d21d784d727ba115388013d9fc8
Parents: 6243e6e
Author: Josh Elser els...@apache.org
Authored: Thu Jul 2 15:49:09 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu Jul 2 15:49:09 2015 -0400

--
 .../server/tabletserver/LargestFirstMemoryManager.java | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ba300baa/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
--
diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
 
b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
index 865e775..d73c46e 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
@@ -174,7 +174,7 @@ public class LargestFirstMemoryManager implements 
MemoryManager {
 for (TabletState ts : tablets) {
   // Make sure that the table still exists
   if (!tableExists(instance, ts.getExtent().getTableId().toString())) {
-log.info(Ignoring extent for deleted table:  + ts.getExtent());
+log.trace(Ignoring extent for deleted table: {}, ts.getExtent());
 continue;
   }
 
@@ -193,9 +193,7 @@ public class LargestFirstMemoryManager implements 
MemoryManager {
 } catch (IllegalArgumentException e) {
   Throwable cause = e.getCause();
   if (null != cause  cause instanceof TableNotFoundException) {
-if (log.isTraceEnabled()) {
-  log.trace(Ignoring extent for deleted table:  + 
ts.getExtent());
-}
+log.trace(Ignoring extent for deleted table: {}, ts.getExtent());
 
 // The table might have been deleted during the iteration of the 
tablets
 // We just want to eat this exception, do nothing with this 
tablet, and continue

[5/8] accumulo git commit: Merge branch '1.6' into 1.7

2015-07-02 Thread elserj 
Merge branch '1.6' into 1.7

Conflicts:

server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java


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

Branch: refs/heads/master
Commit: 6243e6ee0027abd775d4c82692f7787b1b537c2b
Parents: 00d8391 2fa41d0
Author: Josh Elser els...@apache.org
Authored: Thu Jul 2 15:47:48 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu Jul 2 15:47:48 2015 -0400

--
 .../tabletserver/LargestFirstMemoryManager.java | 24 +---
 1 file changed, 21 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6243e6ee/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
--
diff --cc 
server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
index a39c8b6,260685e..865e775
--- 
a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
@@@ -22,14 -22,12 +22,15 @@@ import java.util.List
  import java.util.Map.Entry;
  import java.util.TreeMap;
  
 +import org.apache.accumulo.core.client.Instance;
+ import org.apache.accumulo.core.client.TableNotFoundException;
 +import org.apache.accumulo.core.client.impl.Tables;
  import org.apache.accumulo.core.conf.Property;
 -import org.apache.accumulo.core.data.KeyExtent;
 +import org.apache.accumulo.core.data.impl.KeyExtent;
  import org.apache.accumulo.server.conf.ServerConfiguration;
  import org.apache.hadoop.io.Text;
 -import org.apache.log4j.Logger;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
  
  /**
   * The LargestFirstMemoryManager attempts to keep memory between 80% and 90% 
full. It adapts over time the point at which it should start a compaction based 
on

[4/8] accumulo git commit: Merge branch '1.6' into 1.7

2015-07-02 Thread elserj 
Merge branch '1.6' into 1.7

Conflicts:

server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java


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

Branch: refs/heads/1.7
Commit: 6243e6ee0027abd775d4c82692f7787b1b537c2b
Parents: 00d8391 2fa41d0
Author: Josh Elser els...@apache.org
Authored: Thu Jul 2 15:47:48 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu Jul 2 15:47:48 2015 -0400

--
 .../tabletserver/LargestFirstMemoryManager.java | 24 +---
 1 file changed, 21 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/6243e6ee/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
--
diff --cc 
server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
index a39c8b6,260685e..865e775
--- 
a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
@@@ -22,14 -22,12 +22,15 @@@ import java.util.List
  import java.util.Map.Entry;
  import java.util.TreeMap;
  
 +import org.apache.accumulo.core.client.Instance;
+ import org.apache.accumulo.core.client.TableNotFoundException;
 +import org.apache.accumulo.core.client.impl.Tables;
  import org.apache.accumulo.core.conf.Property;
 -import org.apache.accumulo.core.data.KeyExtent;
 +import org.apache.accumulo.core.data.impl.KeyExtent;
  import org.apache.accumulo.server.conf.ServerConfiguration;
  import org.apache.hadoop.io.Text;
 -import org.apache.log4j.Logger;
 +import org.slf4j.Logger;
 +import org.slf4j.LoggerFactory;
  
  /**
   * The LargestFirstMemoryManager attempts to keep memory between 80% and 90% 
full. It adapts over time the point at which it should start a compaction based 
on

[8/8] accumulo git commit: Merge branch '1.7'

2015-07-02 Thread elserj 
Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 978e6210e5acbb27d89b64c35cbc58f57873ca1d
Parents: 618003d ba300ba
Author: Josh Elser els...@apache.org
Authored: Thu Jul 2 16:07:31 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu Jul 2 16:07:31 2015 -0400

--
 .../tabletserver/LargestFirstMemoryManager.java | 24 
 1 file changed, 20 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/978e6210/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
--

[7/8] accumulo git commit: ACCUMULO-3928 Use slf4j's fancy variable replacement

2015-07-02 Thread elserj 
ACCUMULO-3928 Use slf4j's fancy variable replacement


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

Branch: refs/heads/1.7
Commit: ba300baaa4826d21d784d727ba115388013d9fc8
Parents: 6243e6e
Author: Josh Elser els...@apache.org
Authored: Thu Jul 2 15:49:09 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu Jul 2 15:49:09 2015 -0400

--
 .../server/tabletserver/LargestFirstMemoryManager.java | 6 ++
 1 file changed, 2 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ba300baa/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
--
diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
 
b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
index 865e775..d73c46e 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
@@ -174,7 +174,7 @@ public class LargestFirstMemoryManager implements 
MemoryManager {
 for (TabletState ts : tablets) {
   // Make sure that the table still exists
   if (!tableExists(instance, ts.getExtent().getTableId().toString())) {
-log.info(Ignoring extent for deleted table:  + ts.getExtent());
+log.trace(Ignoring extent for deleted table: {}, ts.getExtent());
 continue;
   }
 
@@ -193,9 +193,7 @@ public class LargestFirstMemoryManager implements 
MemoryManager {
 } catch (IllegalArgumentException e) {
   Throwable cause = e.getCause();
   if (null != cause  cause instanceof TableNotFoundException) {
-if (log.isTraceEnabled()) {
-  log.trace(Ignoring extent for deleted table:  + 
ts.getExtent());
-}
+log.trace(Ignoring extent for deleted table: {}, ts.getExtent());
 
 // The table might have been deleted during the iteration of the 
tablets
 // We just want to eat this exception, do nothing with this 
tablet, and continue

[3/8] accumulo git commit: ACCUMULO-3928 getMinCIdleThreshold might throw an exception if the table is deleted.

2015-07-02 Thread elserj 
ACCUMULO-3928 getMinCIdleThreshold might throw an exception if the table is 
deleted.


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

Branch: refs/heads/master
Commit: 2fa41d0099de0cff0722dff8e1f0340cd63777b3
Parents: 985c906
Author: Josh Elser els...@apache.org
Authored: Thu Jul 2 14:05:44 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu Jul 2 15:26:38 2015 -0400

--
 .../tabletserver/LargestFirstMemoryManager.java | 24 +---
 1 file changed, 21 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/2fa41d00/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
--
diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
 
b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
index 1281c33..260685e 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/tabletserver/LargestFirstMemoryManager.java
@@ -22,6 +22,7 @@ import java.util.List;
 import java.util.Map.Entry;
 import java.util.TreeMap;
 
+import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.conf.Property;
 import org.apache.accumulo.core.data.KeyExtent;
 import org.apache.accumulo.server.conf.ServerConfiguration;
@@ -170,10 +171,27 @@ public class LargestFirstMemoryManager implements 
MemoryManager {
   ingestMemory += memTabletSize;
   if (minorCompactingSize == 0  memTabletSize  0) {
 TabletInfo tabletInfo = new TabletInfo(ts.getExtent(), memTabletSize, 
idleTime, timeMemoryLoad);
-largestMemTablets.put(timeMemoryLoad, tabletInfo);
-if (idleTime  getMinCIdleThreshold(ts.getExtent())) {
-  largestIdleMemTablets.put(timeMemoryLoad, tabletInfo);
+try {
+  // If the table was deleted, getMinCIdleThreshold will throw an 
exception
+  if (idleTime  getMinCIdleThreshold(ts.getExtent())) {
+largestIdleMemTablets.put(timeMemoryLoad, tabletInfo);
+  }
+} catch (IllegalArgumentException e) {
+  Throwable cause = e.getCause();
+  if (null != cause  cause instanceof TableNotFoundException) {
+if (log.isTraceEnabled()) {
+  log.trace(Ignoring extent for deleted table:  + 
ts.getExtent());
+}
+
+// The table might have been deleted during the iteration of the 
tablets
+// We just want to eat this exception, do nothing with this 
tablet, and continue
+continue;
+  }
+
+  throw e;
 }
+// Only place the tablet into largestMemTablets map when the table 
still exists
+largestMemTablets.put(timeMemoryLoad, tabletInfo);
   }
 
   compactionMemory += minorCompactingSize;

svn commit: r1688910 - /accumulo/site/trunk/content/release_notes/1.6.3.mdtext

2015-07-02 Thread kturner 
Author: kturner
Date: Thu Jul  2 21:06:20 2015
New Revision: 1688910

URL: http://svn.apache.org/r1688910
Log:
Remove draft marking from 1.6.3 release notes

Modified:
accumulo/site/trunk/content/release_notes/1.6.3.mdtext

Modified: accumulo/site/trunk/content/release_notes/1.6.3.mdtext
URL: 
http://svn.apache.org/viewvc/accumulo/site/trunk/content/release_notes/1.6.3.mdtext?rev=1688910r1=1688909r2=1688910view=diff
==
--- accumulo/site/trunk/content/release_notes/1.6.3.mdtext (original)
+++ accumulo/site/trunk/content/release_notes/1.6.3.mdtext Thu Jul  2 21:06:20 
2015
@@ -16,8 +16,6 @@ Notice:Licensed to the Apache Softwa
specific language governing permissions and limitations
under the License.
 
-#DRAFT DRAFT DRAFT
-
 Apache Accumulo 1.6.3 is a maintenance release on the 1.6 version branch.
 This release contains changes from over 63 issues, comprised of bug-fixes,
 performance improvements and better test cases.

svn commit: r956726 - in /websites/staging/accumulo/trunk/content: ./ release_notes/1.6.3.html

2015-07-02 Thread buildbot 
Author: buildbot
Date: Thu Jul  2 21:06:32 2015
New Revision: 956726

Log:
Staging update by buildbot for accumulo

Modified:
websites/staging/accumulo/trunk/content/   (props changed)
websites/staging/accumulo/trunk/content/release_notes/1.6.3.html

Propchange: websites/staging/accumulo/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu Jul  2 21:06:32 2015
@@ -1 +1 @@
-1688853
+1688910

Modified: websites/staging/accumulo/trunk/content/release_notes/1.6.3.html
==
--- websites/staging/accumulo/trunk/content/release_notes/1.6.3.html (original)
+++ websites/staging/accumulo/trunk/content/release_notes/1.6.3.html Thu Jul  2 
21:06:32 2015
@@ -214,8 +214,7 @@ Latest 1.5 release: strong1.5.3/stron
 
 h1 class=title/h1
 
-h1 id=draft-draft-draftDRAFT DRAFT DRAFT/h1
-pApache Accumulo 1.6.3 is a maintenance release on the 1.6 version branch.
+pApache Accumulo 1.6.3 is a maintenance release on the 1.6 version 
branch.
 This release contains changes from over 63 issues, comprised of bug-fixes,
 performance improvements and better test cases. /p
 pUsers of 1.6.0, 1.6.1, and 1.6.2 are strongly encouraged to update as soon 
as

svn commit: r1688912 - /accumulo/site/trunk/content/release_notes/1.6.3.mdtext

2015-07-02 Thread kturner 
Author: kturner
Date: Thu Jul  2 21:08:08 2015
New Revision: 1688912

URL: http://svn.apache.org/r1688912
Log:
Set title for 1.6.3 Release notes

Modified:
accumulo/site/trunk/content/release_notes/1.6.3.mdtext

Modified: accumulo/site/trunk/content/release_notes/1.6.3.mdtext
URL: 
http://svn.apache.org/viewvc/accumulo/site/trunk/content/release_notes/1.6.3.mdtext?rev=1688912r1=1688911r2=1688912view=diff
==
--- accumulo/site/trunk/content/release_notes/1.6.3.mdtext (original)
+++ accumulo/site/trunk/content/release_notes/1.6.3.mdtext Thu Jul  2 21:08:08 
2015
@@ -1,4 +1,4 @@
-Title:
+Title: Apache Accumulo 1.6.3 Release Notes
 Notice: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

svn commit: r956727 - in /websites/staging/accumulo/trunk/content: ./ release_notes/1.6.3.html

2015-07-02 Thread buildbot 
Author: buildbot
Date: Thu Jul  2 21:08:14 2015
New Revision: 956727

Log:
Staging update by buildbot for accumulo

Modified:
websites/staging/accumulo/trunk/content/   (props changed)
websites/staging/accumulo/trunk/content/release_notes/1.6.3.html

Propchange: websites/staging/accumulo/trunk/content/
--
--- cms:source-revision (original)
+++ cms:source-revision Thu Jul  2 21:08:14 2015
@@ -1 +1 @@
-1688910
+1688912

Modified: websites/staging/accumulo/trunk/content/release_notes/1.6.3.html
==
--- websites/staging/accumulo/trunk/content/release_notes/1.6.3.html (original)
+++ websites/staging/accumulo/trunk/content/release_notes/1.6.3.html Thu Jul  2 
21:08:14 2015
@@ -34,7 +34,7 @@
   script src=/js/dataTables.bootstrap.js/script
   link href=/css/accumulo.css rel=stylesheet type=text/css
   link 
href=//netdna.bootstrapcdn.com/font-awesome/4.0.3/css/font-awesome.css 
rel=stylesheet
-  title/title
+  titleApache Accumulo 1.6.3 Release Notes/title
   
 script
   (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
@@ -212,7 +212,7 @@ Latest 1.5 release: strong1.5.3/stron
 
   div id=content
 
-h1 class=title/h1
+h1 class=titleApache Accumulo 1.6.3 Release Notes/h1
 
 pApache Accumulo 1.6.3 is a maintenance release on the 1.6 version 
branch.
 This release contains changes from over 63 issues, comprised of bug-fixes,

[4/6] accumulo git commit: Merge branch '1.6' into 1.7

2015-07-02 Thread elserj 
Merge branch '1.6' into 1.7

Conflicts:
shell/src/main/java/org/apache/accumulo/shell/mock/MockShell.java


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

Branch: refs/heads/master
Commit: acef2e5d4a72c0dcd372ce0d35da4fc307b74496
Parents: ba300ba 62e3b0f
Author: Josh Elser els...@apache.org
Authored: Thu Jul 2 17:57:11 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu Jul 2 18:17:02 2015 -0400

--
 .../java/org/apache/accumulo/shell/mock/MockShell.java   | 11 +++
 1 file changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/acef2e5d/shell/src/main/java/org/apache/accumulo/shell/mock/MockShell.java
--
diff --cc shell/src/main/java/org/apache/accumulo/shell/mock/MockShell.java
index c11aed5,000..609f23f
mode 100644,00..100644
--- a/shell/src/main/java/org/apache/accumulo/shell/mock/MockShell.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/mock/MockShell.java
@@@ -1,146 -1,0 +1,157 @@@
 +/*
 + * 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.shell.mock;
 +
 +import static java.nio.charset.StandardCharsets.UTF_8;
 +
 +import java.io.ByteArrayInputStream;
 +import java.io.IOException;
 +import java.io.InputStream;
 +import java.io.OutputStream;
 +
 +import jline.console.ConsoleReader;
 +
++import org.apache.accumulo.core.client.AccumuloException;
++import org.apache.accumulo.core.client.AccumuloSecurityException;
++import org.apache.accumulo.core.client.TableNotFoundException;
 +import org.apache.accumulo.core.client.mock.MockInstance;
 +import org.apache.accumulo.shell.Shell;
 +import org.apache.accumulo.shell.ShellOptionsJC;
++import org.apache.commons.cli.CommandLine;
++import org.apache.commons.vfs2.FileSystemException;
 +
 +/**
 + * An Accumulo Shell implementation that allows a developer to attach an 
InputStream and Writer to the Shell for testing purposes.
 + */
 +public class MockShell extends Shell {
 +  private static final String NEWLINE = \n;
 +
 +  protected InputStream in;
 +  protected OutputStream out;
 +
 +  public MockShell(InputStream in, OutputStream out) throws IOException {
 +super();
 +this.in = in;
 +this.out = out;
 +  }
 +
 +  @Override
 +  public boolean config(String... args) {
 +// If configuring the shell failed, fail quickly
 +if (!super.config(args)) {
 +  return false;
 +}
 +
 +// Update the ConsoleReader with the input and output redirected
 +try {
 +  this.reader = new ConsoleReader(in, out);
 +} catch (Exception e) {
 +  printException(e);
 +  return false;
 +}
 +
 +// Don't need this for testing purposes
 +this.reader.setHistoryEnabled(false);
 +this.reader.setPaginationEnabled(false);
 +
 +// Make the parsing from the client easier;
 +this.verbose = false;
 +return true;
 +  }
 +
 +  @Override
 +  protected void setInstance(ShellOptionsJC options) {
 +// We always want a MockInstance for this test
 +instance = new MockInstance();
 +  }
 +
 +  @Override
 +  public int start() throws IOException {
 +String input;
 +if (isVerbose())
 +  printInfo();
 +
 +if (execFile != null) {
 +  java.util.Scanner scanner = new java.util.Scanner(execFile, 
UTF_8.name());
 +  try {
 +while (scanner.hasNextLine()  !hasExited()) {
 +  execCommand(scanner.nextLine(), true, isVerbose());
 +}
 +  } finally {
 +scanner.close();
 +  }
 +} else if (execCommand != null) {
 +  for (String command : execCommand.split(\n)) {
 +execCommand(command, true, isVerbose());
 +  }
 +  return exitCode;
 +}
 +
 +while (true) {
 +  if (hasExited())
 +return exitCode;
 +
 +  reader.setPrompt(getDefaultPrompt());
 +  input =

[1/6] accumulo git commit: ACCUMULO-3930 Prevent MockShell from trying to load from system-installed accumulo-site.xml

2015-07-02 Thread elserj 
Repository: accumulo
Updated Branches:
  refs/heads/1.6 2fa41d009 - 62e3b0f85
  refs/heads/1.7 ba300baaa - acef2e5d4
  refs/heads/master 978e6210e - 1dd6b704a


ACCUMULO-3930 Prevent MockShell from trying to load from system-installed 
accumulo-site.xml


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

Branch: refs/heads/1.6
Commit: 62e3b0f8579ebfc9a4c6b0122d8bca8d6305b9b9
Parents: 2fa41d0
Author: Josh Elser els...@apache.org
Authored: Thu Jul 2 17:54:32 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu Jul 2 17:55:20 2015 -0400

--
 .../org/apache/accumulo/core/client/mock/MockShell.java | 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/62e3b0f8/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java 
b/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
index b6c532a..e4680bd 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
@@ -26,10 +26,14 @@ import java.io.Writer;
 
 import jline.console.ConsoleReader;
 
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.util.shell.Shell;
 import org.apache.accumulo.core.util.shell.ShellOptionsJC;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.io.output.WriterOutputStream;
+import org.apache.commons.vfs2.FileSystemException;
 
 /**
  * An Accumulo Shell implementation that allows a developer to attach an 
InputStream and Writer to the Shell for testing purposes.
@@ -164,6 +168,11 @@ public class MockShell extends Shell {
 this.writer = out;
   }
 
+  @Override
+  public ClassLoader getClassLoader(final CommandLine cl, final Shell 
shellState) throws AccumuloException, TableNotFoundException, 
AccumuloSecurityException, IOException, FileSystemException {
+return MockShell.class.getClassLoader();
+  }
+
   /**
* Convenience method to create the byte-array to hand to the console
*

[2/6] accumulo git commit: ACCUMULO-3930 Prevent MockShell from trying to load from system-installed accumulo-site.xml

2015-07-02 Thread elserj 
ACCUMULO-3930 Prevent MockShell from trying to load from system-installed 
accumulo-site.xml


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

Branch: refs/heads/1.7
Commit: 62e3b0f8579ebfc9a4c6b0122d8bca8d6305b9b9
Parents: 2fa41d0
Author: Josh Elser els...@apache.org
Authored: Thu Jul 2 17:54:32 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu Jul 2 17:55:20 2015 -0400

--
 .../org/apache/accumulo/core/client/mock/MockShell.java | 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/62e3b0f8/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java 
b/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
index b6c532a..e4680bd 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
@@ -26,10 +26,14 @@ import java.io.Writer;
 
 import jline.console.ConsoleReader;
 
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.util.shell.Shell;
 import org.apache.accumulo.core.util.shell.ShellOptionsJC;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.io.output.WriterOutputStream;
+import org.apache.commons.vfs2.FileSystemException;
 
 /**
  * An Accumulo Shell implementation that allows a developer to attach an 
InputStream and Writer to the Shell for testing purposes.
@@ -164,6 +168,11 @@ public class MockShell extends Shell {
 this.writer = out;
   }
 
+  @Override
+  public ClassLoader getClassLoader(final CommandLine cl, final Shell 
shellState) throws AccumuloException, TableNotFoundException, 
AccumuloSecurityException, IOException, FileSystemException {
+return MockShell.class.getClassLoader();
+  }
+
   /**
* Convenience method to create the byte-array to hand to the console
*

[5/6] accumulo git commit: Merge branch '1.6' into 1.7

2015-07-02 Thread elserj 
Merge branch '1.6' into 1.7

Conflicts:
shell/src/main/java/org/apache/accumulo/shell/mock/MockShell.java


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

Branch: refs/heads/1.7
Commit: acef2e5d4a72c0dcd372ce0d35da4fc307b74496
Parents: ba300ba 62e3b0f
Author: Josh Elser els...@apache.org
Authored: Thu Jul 2 17:57:11 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu Jul 2 18:17:02 2015 -0400

--
 .../java/org/apache/accumulo/shell/mock/MockShell.java   | 11 +++
 1 file changed, 11 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/acef2e5d/shell/src/main/java/org/apache/accumulo/shell/mock/MockShell.java
--
diff --cc shell/src/main/java/org/apache/accumulo/shell/mock/MockShell.java
index c11aed5,000..609f23f
mode 100644,00..100644
--- a/shell/src/main/java/org/apache/accumulo/shell/mock/MockShell.java
+++ b/shell/src/main/java/org/apache/accumulo/shell/mock/MockShell.java
@@@ -1,146 -1,0 +1,157 @@@
 +/*
 + * 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.shell.mock;
 +
 +import static java.nio.charset.StandardCharsets.UTF_8;
 +
 +import java.io.ByteArrayInputStream;
 +import java.io.IOException;
 +import java.io.InputStream;
 +import java.io.OutputStream;
 +
 +import jline.console.ConsoleReader;
 +
++import org.apache.accumulo.core.client.AccumuloException;
++import org.apache.accumulo.core.client.AccumuloSecurityException;
++import org.apache.accumulo.core.client.TableNotFoundException;
 +import org.apache.accumulo.core.client.mock.MockInstance;
 +import org.apache.accumulo.shell.Shell;
 +import org.apache.accumulo.shell.ShellOptionsJC;
++import org.apache.commons.cli.CommandLine;
++import org.apache.commons.vfs2.FileSystemException;
 +
 +/**
 + * An Accumulo Shell implementation that allows a developer to attach an 
InputStream and Writer to the Shell for testing purposes.
 + */
 +public class MockShell extends Shell {
 +  private static final String NEWLINE = \n;
 +
 +  protected InputStream in;
 +  protected OutputStream out;
 +
 +  public MockShell(InputStream in, OutputStream out) throws IOException {
 +super();
 +this.in = in;
 +this.out = out;
 +  }
 +
 +  @Override
 +  public boolean config(String... args) {
 +// If configuring the shell failed, fail quickly
 +if (!super.config(args)) {
 +  return false;
 +}
 +
 +// Update the ConsoleReader with the input and output redirected
 +try {
 +  this.reader = new ConsoleReader(in, out);
 +} catch (Exception e) {
 +  printException(e);
 +  return false;
 +}
 +
 +// Don't need this for testing purposes
 +this.reader.setHistoryEnabled(false);
 +this.reader.setPaginationEnabled(false);
 +
 +// Make the parsing from the client easier;
 +this.verbose = false;
 +return true;
 +  }
 +
 +  @Override
 +  protected void setInstance(ShellOptionsJC options) {
 +// We always want a MockInstance for this test
 +instance = new MockInstance();
 +  }
 +
 +  @Override
 +  public int start() throws IOException {
 +String input;
 +if (isVerbose())
 +  printInfo();
 +
 +if (execFile != null) {
 +  java.util.Scanner scanner = new java.util.Scanner(execFile, 
UTF_8.name());
 +  try {
 +while (scanner.hasNextLine()  !hasExited()) {
 +  execCommand(scanner.nextLine(), true, isVerbose());
 +}
 +  } finally {
 +scanner.close();
 +  }
 +} else if (execCommand != null) {
 +  for (String command : execCommand.split(\n)) {
 +execCommand(command, true, isVerbose());
 +  }
 +  return exitCode;
 +}
 +
 +while (true) {
 +  if (hasExited())
 +return exitCode;
 +
 +  reader.setPrompt(getDefaultPrompt());
 +  input =

[6/6] accumulo git commit: Merge branch '1.7'

2015-07-02 Thread elserj 
Merge branch '1.7'


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

Branch: refs/heads/master
Commit: 1dd6b704ab415dc6c02c69a72803645eb7d5c404
Parents: 978e621 acef2e5
Author: Josh Elser els...@apache.org
Authored: Thu Jul 2 18:17:08 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu Jul 2 18:17:08 2015 -0400

--
 .../java/org/apache/accumulo/shell/mock/MockShell.java   | 11 +++
 1 file changed, 11 insertions(+)
--

[3/6] accumulo git commit: ACCUMULO-3930 Prevent MockShell from trying to load from system-installed accumulo-site.xml

2015-07-02 Thread elserj 
ACCUMULO-3930 Prevent MockShell from trying to load from system-installed 
accumulo-site.xml


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

Branch: refs/heads/master
Commit: 62e3b0f8579ebfc9a4c6b0122d8bca8d6305b9b9
Parents: 2fa41d0
Author: Josh Elser els...@apache.org
Authored: Thu Jul 2 17:54:32 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu Jul 2 17:55:20 2015 -0400

--
 .../org/apache/accumulo/core/client/mock/MockShell.java | 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/62e3b0f8/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java 
b/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
index b6c532a..e4680bd 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/mock/MockShell.java
@@ -26,10 +26,14 @@ import java.io.Writer;
 
 import jline.console.ConsoleReader;
 
+import org.apache.accumulo.core.client.AccumuloException;
+import org.apache.accumulo.core.client.AccumuloSecurityException;
+import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.accumulo.core.util.shell.Shell;
 import org.apache.accumulo.core.util.shell.ShellOptionsJC;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.io.output.WriterOutputStream;
+import org.apache.commons.vfs2.FileSystemException;
 
 /**
  * An Accumulo Shell implementation that allows a developer to attach an 
InputStream and Writer to the Shell for testing purposes.
@@ -164,6 +168,11 @@ public class MockShell extends Shell {
 this.writer = out;
   }
 
+  @Override
+  public ClassLoader getClassLoader(final CommandLine cl, final Shell 
shellState) throws AccumuloException, TableNotFoundException, 
AccumuloSecurityException, IOException, FileSystemException {
+return MockShell.class.getClassLoader();
+  }
+
   /**
* Convenience method to create the byte-array to hand to the console
*