date:20150430

[06/25] accumulo git commit: Merge branch '1.5' into 1.6

2015-04-30 Thread ctubbsii

Merge branch '1.5' into 1.6

Conflicts:

core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java

core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorSet.java
server/src/main/java/org/apache/accumulo/server/master/Master.java


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

Branch: refs/heads/master
Commit: b636ff2cc614f8112207d369acd38a83770397e3
Parents: 67c8b2b e395bc8
Author: Christopher Tubbs ctubb...@apache.org
Authored: Thu Apr 30 12:10:44 2015 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Thu Apr 30 12:10:44 2015 -0400

--
 .../core/iterators/AggregatingIterator.java   | 18 ++
 .../aggregation/conf/AggregatorConfiguration.java |  3 +--
 .../iterators/aggregation/conf/AggregatorSet.java |  7 +++
 .../util/shell/commands/AddSplitsCommand.java | 17 -
 .../core/iterators/AggregatingIteratorTest.java   |  6 --
 .../conf/AggregatorConfigurationTest.java | 13 -
 6 files changed, 38 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b636ff2c/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
--
diff --cc 
core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
index fd5525b,13b2710..eb45fac
--- 
a/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
@@@ -168,10 -168,8 +169,11 @@@ public class AggregatingIterator implem
  this.iterator = source;
  
  try {
 +  String context = null;
 +  if (null != env)
 +context = env.getConfig().get(Property.TABLE_CLASSPATH);
-   this.aggregators = new ColumnToClassMappingAggregator(options, 
Aggregator.class, context);
+   this.aggregators = new 
ColumnToClassMappingorg.apache.accumulo.core.iterators.aggregation.Aggregator(options,
 -  org.apache.accumulo.core.iterators.aggregation.Aggregator.class);
++  org.apache.accumulo.core.iterators.aggregation.Aggregator.class, 
context);
  } catch (ClassNotFoundException e) {
log.error(e.toString());
throw new IllegalArgumentException(e);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b636ff2c/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorSet.java
--
diff --cc 
core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorSet.java
index c874cc8,37798b0..d6545ac
--- 
a/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorSet.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorSet.java
@@@ -27,9 -25,9 +26,9 @@@ import org.apache.accumulo.core.iterato
   * @deprecated since 1.4
   */
  @Deprecated
- public class AggregatorSet extends ColumnToClassMappingAggregator {
+ public class AggregatorSet extends 
ColumnToClassMappingorg.apache.accumulo.core.iterators.aggregation.Aggregator 
{
 -  public AggregatorSet(MapString,String opts) throws 
InstantiationException, IllegalAccessException, ClassNotFoundException {
 +  public AggregatorSet(MapString,String opts) throws 
InstantiationException, IllegalAccessException, ClassNotFoundException, 
IOException {
- super(opts, Aggregator.class);
+ super(opts, 
org.apache.accumulo.core.iterators.aggregation.Aggregator.class);
}
  
public AggregatorSet() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b636ff2c/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java
--
diff --cc 
core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java
index efbbcbe,c88171a..18298dd
--- 
a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java
@@@ -45,14 -45,20 +45,21 @@@ public class AddSplitsCommand extends C
final String f = cl.getOptionValue(optSplitsFile.getOpt());
  
String line;
-   java.util.Scanner file = new java.util.Scanner(new File(f), 
UTF_8.name());
-   while (file.hasNextLine()) {
- line = file.nextLine();
- if (!line.isEmpty()) {
-   splits.add(decode ? new 
Text(Base64.decodeBase64(line.getBytes(UTF_8))) : new Text(line));
+

[15/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

2015-04-30 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
index 2ba7674..3384e00 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
@@ -48,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings(all) public class TabletClientService {
+@SuppressWarnings({unchecked, serial, rawtypes, unused}) public class 
TabletClientService {
 
   public interface Iface extends 
org.apache.accumulo.core.client.impl.thrift.ClientService.Iface {
 
@@ -4336,7 +4336,7 @@ import org.slf4j.LoggerFactory;
 public long readaheadThreshold; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   TINFO((short)11, tinfo),
   CREDENTIALS((short)1, credentials),
   EXTENT((short)2, extent),
@@ -6034,7 +6034,7 @@ import org.slf4j.LoggerFactory;
 public TooManyFilesException tmfe; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   SUCCESS((short)0, success),
   SEC((short)1, sec),
   NSTE((short)2, nste),
@@ -6695,7 +6695,7 @@ import org.slf4j.LoggerFactory;
 public long scanID; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   TINFO((short)2, tinfo),
   SCAN_ID((short)1, scanID);
 
@@ -7156,7 +7156,7 @@ import org.slf4j.LoggerFactory;
 public TooManyFilesException tmfe; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   SUCCESS((short)0, success),
   NSSI((short)1, nssi),
   NSTE((short)2, nste),
@@ -7817,7 +7817,7 @@ import org.slf4j.LoggerFactory;
 public long scanID; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   TINFO((short)2, tinfo),
   SCAN_ID((short)1, scanID);
 
@@ -8286,7 +8286,7 @@ import org.slf4j.LoggerFactory;
 public boolean waitForWrites; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   TINFO((short)8, tinfo),
   CREDENTIALS((short)1, credentials),
   BATCH((short)2, batch),
@@ -9681,7 +9681,7 @@ import org.slf4j.LoggerFactory;
 public org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException 
sec; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   SUCCESS((short)0, success),
   SEC((short)1, sec);
 
@@ -10142,7 +10142,7 @@ import org.slf4j.LoggerFactory;
 public long scanID; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   TINFO((short)2, tinfo),
   SCAN_ID((short)1, scanID);
 
@@ -10599,7 +10599,7 @@ import org.slf4j.LoggerFactory;
 public NoSuchScanIDException nssi; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them.

[08/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

2015-04-30 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java
index 8dd28cf..c4b3c07 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java
@@ -48,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings(all) public class Condition implements 
org.apache.thrift.TBaseCondition, Condition._Fields, java.io.Serializable, 
Cloneable, ComparableCondition {
+@SuppressWarnings({unchecked, serial, rawtypes, unused}) public class 
Condition implements org.apache.thrift.TBaseCondition, Condition._Fields, 
java.io.Serializable, Cloneable, ComparableCondition {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct(Condition);
 
   private static final org.apache.thrift.protocol.TField COLUMN_FIELD_DESC = 
new org.apache.thrift.protocol.TField(column, 
org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
   public ListIteratorSetting iterators; // optional
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  @SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 COLUMN((short)1, column),
 TIMESTAMP((short)2, timestamp),
 VALUE((short)3, value),

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java
index 55f0e62..515c416 100644
--- 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java
+++ 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java
@@ -27,7 +27,7 @@ import java.util.Map;
 import java.util.HashMap;
 import org.apache.thrift.TEnum;
 
-@SuppressWarnings(all) public enum ConditionalStatus implements 
org.apache.thrift.TEnum {
+@SuppressWarnings({unused}) public enum ConditionalStatus implements 
org.apache.thrift.TEnum {
   ACCEPTED(0),
   REJECTED(1),
   VIOLATED(2),

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java
index 71806fe..551e996 100644
--- 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java
+++ 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java
@@ -48,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings(all) public class ConditionalUpdates implements 
org.apache.thrift.TBaseConditionalUpdates, ConditionalUpdates._Fields, 
java.io.Serializable, Cloneable, ComparableConditionalUpdates {
+@SuppressWarnings({unchecked, serial, rawtypes, unused}) public class 
ConditionalUpdates implements org.apache.thrift.TBaseConditionalUpdates, 
ConditionalUpdates._Fields, java.io.Serializable, Cloneable, 
ComparableConditionalUpdates {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct(ConditionalUpdates);
 
   private static final org.apache.thrift.protocol.TField CONDITIONS_FIELD_DESC 
= new org.apache.thrift.protocol.TField(conditions, 
org.apache.thrift.protocol.TType.LIST, (short)2);
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
   public ListColumnUpdate updates; // required
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  @SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 CONDITIONS((short)2, conditions),
 UPDATES((short)3, updates);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java
 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java

[20/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

2015-04-30 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
index 2ba7674..3384e00 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
@@ -48,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings(all) public class TabletClientService {
+@SuppressWarnings({unchecked, serial, rawtypes, unused}) public class 
TabletClientService {
 
   public interface Iface extends 
org.apache.accumulo.core.client.impl.thrift.ClientService.Iface {
 
@@ -4336,7 +4336,7 @@ import org.slf4j.LoggerFactory;
 public long readaheadThreshold; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   TINFO((short)11, tinfo),
   CREDENTIALS((short)1, credentials),
   EXTENT((short)2, extent),
@@ -6034,7 +6034,7 @@ import org.slf4j.LoggerFactory;
 public TooManyFilesException tmfe; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   SUCCESS((short)0, success),
   SEC((short)1, sec),
   NSTE((short)2, nste),
@@ -6695,7 +6695,7 @@ import org.slf4j.LoggerFactory;
 public long scanID; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   TINFO((short)2, tinfo),
   SCAN_ID((short)1, scanID);
 
@@ -7156,7 +7156,7 @@ import org.slf4j.LoggerFactory;
 public TooManyFilesException tmfe; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   SUCCESS((short)0, success),
   NSSI((short)1, nssi),
   NSTE((short)2, nste),
@@ -7817,7 +7817,7 @@ import org.slf4j.LoggerFactory;
 public long scanID; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   TINFO((short)2, tinfo),
   SCAN_ID((short)1, scanID);
 
@@ -8286,7 +8286,7 @@ import org.slf4j.LoggerFactory;
 public boolean waitForWrites; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   TINFO((short)8, tinfo),
   CREDENTIALS((short)1, credentials),
   BATCH((short)2, batch),
@@ -9681,7 +9681,7 @@ import org.slf4j.LoggerFactory;
 public org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException 
sec; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   SUCCESS((short)0, success),
   SEC((short)1, sec);
 
@@ -10142,7 +10142,7 @@ import org.slf4j.LoggerFactory;
 public long scanID; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   TINFO((short)2, tinfo),
   SCAN_ID((short)1, scanID);
 
@@ -10599,7 +10599,7 @@ import org.slf4j.LoggerFactory;
 public NoSuchScanIDException nssi; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them.

[09/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

2015-04-30 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
index 3b23175..b22da8f 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
@@ -48,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings(all) public class AccumuloProxy {
+@SuppressWarnings({unchecked, serial, rawtypes, unused}) public class 
AccumuloProxy {
 
   public interface Iface {
 
@@ -12719,7 +12719,7 @@ import org.slf4j.LoggerFactory;
 public MapString,String loginProperties; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   PRINCIPAL((short)1, principal),
   LOGIN_PROPERTIES((short)2, loginProperties);
 
@@ -13225,7 +13225,7 @@ import org.slf4j.LoggerFactory;
 public AccumuloSecurityException ouch2; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   SUCCESS((short)0, success),
   OUCH2((short)1, ouch2);
 
@@ -13694,7 +13694,7 @@ import org.slf4j.LoggerFactory;
 public String constraintClassName; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   LOGIN((short)1, login),
   TABLE_NAME((short)2, tableName),
   CONSTRAINT_CLASS_NAME((short)3, constraintClassName);
@@ -14261,7 +14261,7 @@ import org.slf4j.LoggerFactory;
 public TableNotFoundException ouch3; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   SUCCESS((short)0, success),
   OUCH1((short)1, ouch1),
   OUCH2((short)2, ouch2),
@@ -14919,7 +14919,7 @@ import org.slf4j.LoggerFactory;
 public SetByteBuffer splits; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   LOGIN((short)1, login),
   TABLE_NAME((short)2, tableName),
   SPLITS((short)3, splits);
@@ -15533,7 +15533,7 @@ import org.slf4j.LoggerFactory;
 public TableNotFoundException ouch3; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   OUCH1((short)1, ouch1),
   OUCH2((short)2, ouch2),
   OUCH3((short)3, ouch3);
@@ -16095,7 +16095,7 @@ import org.slf4j.LoggerFactory;
 public SetIteratorScope scopes; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   LOGIN((short)1, login),
   TABLE_NAME((short)2, tableName),
   SETTING((short)3, setting),
@@ -16815,7 +16815,7 @@ import org.slf4j.LoggerFactory;
 public TableNotFoundException ouch3; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   OUCH1((short)1, ouch1),
   OUCH2((short)2, ouch2),
   OUCH3((short)3, ouch3);
@@ -17377,7 +17377,7 @@ import org.slf4j.LoggerFactory;
 public SetIteratorScope scopes; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-

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

2015-04-30 Thread ctubbsii

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

Branch: refs/heads/master
Commit: a03f14a5cafb0dd2929d84a92766d223a0429e51
Parents: ae4fd48 4d1acd1
Author: Christopher Tubbs ctubb...@apache.org
Authored: Thu Apr 30 13:43:16 2015 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Thu Apr 30 13:43:16 2015 -0400

--
 core/src/main/scripts/generate-thrift.sh | 6 +++---
 pom.xml  | 6 --
 2 files changed, 7 insertions(+), 5 deletions(-)
--


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

[10/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

2015-04-30 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
index 2ba7674..3384e00 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletClientService.java
@@ -48,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings(all) public class TabletClientService {
+@SuppressWarnings({unchecked, serial, rawtypes, unused}) public class 
TabletClientService {
 
   public interface Iface extends 
org.apache.accumulo.core.client.impl.thrift.ClientService.Iface {
 
@@ -4336,7 +4336,7 @@ import org.slf4j.LoggerFactory;
 public long readaheadThreshold; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   TINFO((short)11, tinfo),
   CREDENTIALS((short)1, credentials),
   EXTENT((short)2, extent),
@@ -6034,7 +6034,7 @@ import org.slf4j.LoggerFactory;
 public TooManyFilesException tmfe; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   SUCCESS((short)0, success),
   SEC((short)1, sec),
   NSTE((short)2, nste),
@@ -6695,7 +6695,7 @@ import org.slf4j.LoggerFactory;
 public long scanID; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   TINFO((short)2, tinfo),
   SCAN_ID((short)1, scanID);
 
@@ -7156,7 +7156,7 @@ import org.slf4j.LoggerFactory;
 public TooManyFilesException tmfe; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   SUCCESS((short)0, success),
   NSSI((short)1, nssi),
   NSTE((short)2, nste),
@@ -7817,7 +7817,7 @@ import org.slf4j.LoggerFactory;
 public long scanID; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   TINFO((short)2, tinfo),
   SCAN_ID((short)1, scanID);
 
@@ -8286,7 +8286,7 @@ import org.slf4j.LoggerFactory;
 public boolean waitForWrites; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   TINFO((short)8, tinfo),
   CREDENTIALS((short)1, credentials),
   BATCH((short)2, batch),
@@ -9681,7 +9681,7 @@ import org.slf4j.LoggerFactory;
 public org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException 
sec; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   SUCCESS((short)0, success),
   SEC((short)1, sec);
 
@@ -10142,7 +10142,7 @@ import org.slf4j.LoggerFactory;
 public long scanID; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   TINFO((short)2, tinfo),
   SCAN_ID((short)1, scanID);
 
@@ -10599,7 +10599,7 @@ import org.slf4j.LoggerFactory;
 public NoSuchScanIDException nssi; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them.

[03/25] accumulo git commit: ACCUMULO-3759 More Java 8 compiler warnings

2015-04-30 Thread ctubbsii

ACCUMULO-3759 More Java 8 compiler warnings

* Fix compiler warnings in Java 8 for 1.5 branch


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

Branch: refs/heads/1.6
Commit: e395bc8ced5d740fe4a6e5d3ebb169335f64c044
Parents: 5ac1b52
Author: Christopher Tubbs ctubb...@apache.org
Authored: Thu Apr 30 12:04:50 2015 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Thu Apr 30 12:04:50 2015 -0400

--
 .../core/iterators/AggregatingIterator.java   | 18 ++
 .../aggregation/conf/AggregatorConfiguration.java |  3 +--
 .../iterators/aggregation/conf/AggregatorSet.java |  7 +++
 .../util/shell/commands/AddSplitsCommand.java | 18 +-
 .../core/iterators/AggregatingIteratorTest.java   |  6 --
 .../conf/AggregatorConfigurationTest.java | 13 -
 .../org/apache/accumulo/server/master/Master.java | 16 
 .../classloader/vfs/AccumuloVFSClassLoader.java   |  6 +++---
 8 files changed, 50 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e395bc8c/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
 
b/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
index 28acc2b..13b2710 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
@@ -27,7 +27,6 @@ import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.PartialKey;
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.iterators.aggregation.Aggregator;
 import org.apache.accumulo.core.iterators.conf.ColumnToClassMapping;
 import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader;
 import org.apache.log4j.Logger;
@@ -42,7 +41,7 @@ import org.apache.log4j.Logger;
 public class AggregatingIterator implements SortedKeyValueIteratorKey,Value, 
OptionDescriber {
 
   private SortedKeyValueIteratorKey,Value iterator;
-  private ColumnToClassMappingAggregator aggregators;
+  private 
ColumnToClassMappingorg.apache.accumulo.core.iterators.aggregation.Aggregator 
aggregators;
 
   private Key workKey = new Key();
 
@@ -51,6 +50,7 @@ public class AggregatingIterator implements 
SortedKeyValueIteratorKey,Value, O
   // private boolean propogateDeletes;
   private static final Logger log = 
Logger.getLogger(AggregatingIterator.class);
 
+  @Override
   public AggregatingIterator deepCopy(IteratorEnvironment env) {
 return new AggregatingIterator(this, env);
   }
@@ -62,7 +62,7 @@ public class AggregatingIterator implements 
SortedKeyValueIteratorKey,Value, O
 
   public AggregatingIterator() {}
 
-  private void aggregateRowColumn(Aggregator aggr) throws IOException {
+  private void 
aggregateRowColumn(org.apache.accumulo.core.iterators.aggregation.Aggregator 
aggr) throws IOException {
 // this function assumes that first value is not delete
 
 if (iterator.getTopKey().isDeleted())
@@ -90,14 +90,15 @@ public class AggregatingIterator implements 
SortedKeyValueIteratorKey,Value, O
   private void findTop() throws IOException {
 // check if aggregation is needed
 if (iterator.hasTop()) {
-  Aggregator aggr = aggregators.getObject(iterator.getTopKey());
+  org.apache.accumulo.core.iterators.aggregation.Aggregator aggr = 
aggregators.getObject(iterator.getTopKey());
   if (aggr != null) {
 aggregateRowColumn(aggr);
   }
 }
   }
 
-  public AggregatingIterator(SortedKeyValueIteratorKey,Value iterator, 
ColumnToClassMappingAggregator aggregators) throws IOException {
+  public AggregatingIterator(SortedKeyValueIteratorKey,Value iterator,
+  
ColumnToClassMappingorg.apache.accumulo.core.iterators.aggregation.Aggregator 
aggregators) throws IOException {
 this.iterator = iterator;
 this.aggregators = aggregators;
   }
@@ -167,7 +168,8 @@ public class AggregatingIterator implements 
SortedKeyValueIteratorKey,Value, O
 this.iterator = source;
 
 try {
-  this.aggregators = new ColumnToClassMappingAggregator(options, 
Aggregator.class);
+  this.aggregators = new 
ColumnToClassMappingorg.apache.accumulo.core.iterators.aggregation.Aggregator(options,
+  org.apache.accumulo.core.iterators.aggregation.Aggregator.class);
 } catch (ClassNotFoundException e) {
   log.error(e.toString());

[07/25] accumulo git commit: Merge branch '1.5' into 1.6

2015-04-30 Thread ctubbsii

Merge branch '1.5' into 1.6

Conflicts:

core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java

core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorSet.java
server/src/main/java/org/apache/accumulo/server/master/Master.java


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

Branch: refs/heads/1.6
Commit: b636ff2cc614f8112207d369acd38a83770397e3
Parents: 67c8b2b e395bc8
Author: Christopher Tubbs ctubb...@apache.org
Authored: Thu Apr 30 12:10:44 2015 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Thu Apr 30 12:10:44 2015 -0400

--
 .../core/iterators/AggregatingIterator.java   | 18 ++
 .../aggregation/conf/AggregatorConfiguration.java |  3 +--
 .../iterators/aggregation/conf/AggregatorSet.java |  7 +++
 .../util/shell/commands/AddSplitsCommand.java | 17 -
 .../core/iterators/AggregatingIteratorTest.java   |  6 --
 .../conf/AggregatorConfigurationTest.java | 13 -
 6 files changed, 38 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b636ff2c/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
--
diff --cc 
core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
index fd5525b,13b2710..eb45fac
--- 
a/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
@@@ -168,10 -168,8 +169,11 @@@ public class AggregatingIterator implem
  this.iterator = source;
  
  try {
 +  String context = null;
 +  if (null != env)
 +context = env.getConfig().get(Property.TABLE_CLASSPATH);
-   this.aggregators = new ColumnToClassMappingAggregator(options, 
Aggregator.class, context);
+   this.aggregators = new 
ColumnToClassMappingorg.apache.accumulo.core.iterators.aggregation.Aggregator(options,
 -  org.apache.accumulo.core.iterators.aggregation.Aggregator.class);
++  org.apache.accumulo.core.iterators.aggregation.Aggregator.class, 
context);
  } catch (ClassNotFoundException e) {
log.error(e.toString());
throw new IllegalArgumentException(e);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b636ff2c/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorSet.java
--
diff --cc 
core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorSet.java
index c874cc8,37798b0..d6545ac
--- 
a/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorSet.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/iterators/aggregation/conf/AggregatorSet.java
@@@ -27,9 -25,9 +26,9 @@@ import org.apache.accumulo.core.iterato
   * @deprecated since 1.4
   */
  @Deprecated
- public class AggregatorSet extends ColumnToClassMappingAggregator {
+ public class AggregatorSet extends 
ColumnToClassMappingorg.apache.accumulo.core.iterators.aggregation.Aggregator 
{
 -  public AggregatorSet(MapString,String opts) throws 
InstantiationException, IllegalAccessException, ClassNotFoundException {
 +  public AggregatorSet(MapString,String opts) throws 
InstantiationException, IllegalAccessException, ClassNotFoundException, 
IOException {
- super(opts, Aggregator.class);
+ super(opts, 
org.apache.accumulo.core.iterators.aggregation.Aggregator.class);
}
  
public AggregatorSet() {

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b636ff2c/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java
--
diff --cc 
core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java
index efbbcbe,c88171a..18298dd
--- 
a/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/util/shell/commands/AddSplitsCommand.java
@@@ -45,14 -45,20 +45,21 @@@ public class AddSplitsCommand extends C
final String f = cl.getOptionValue(optSplitsFile.getOpt());
  
String line;
-   java.util.Scanner file = new java.util.Scanner(new File(f), 
UTF_8.name());
-   while (file.hasNextLine()) {
- line = file.nextLine();
- if (!line.isEmpty()) {
-   splits.add(decode ? new 
Text(Base64.decodeBase64(line.getBytes(UTF_8))) : new Text(line));
+

[19/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

2015-04-30 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
index 3b23175..b22da8f 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
@@ -48,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings(all) public class AccumuloProxy {
+@SuppressWarnings({unchecked, serial, rawtypes, unused}) public class 
AccumuloProxy {
 
   public interface Iface {
 
@@ -12719,7 +12719,7 @@ import org.slf4j.LoggerFactory;
 public MapString,String loginProperties; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   PRINCIPAL((short)1, principal),
   LOGIN_PROPERTIES((short)2, loginProperties);
 
@@ -13225,7 +13225,7 @@ import org.slf4j.LoggerFactory;
 public AccumuloSecurityException ouch2; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   SUCCESS((short)0, success),
   OUCH2((short)1, ouch2);
 
@@ -13694,7 +13694,7 @@ import org.slf4j.LoggerFactory;
 public String constraintClassName; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   LOGIN((short)1, login),
   TABLE_NAME((short)2, tableName),
   CONSTRAINT_CLASS_NAME((short)3, constraintClassName);
@@ -14261,7 +14261,7 @@ import org.slf4j.LoggerFactory;
 public TableNotFoundException ouch3; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   SUCCESS((short)0, success),
   OUCH1((short)1, ouch1),
   OUCH2((short)2, ouch2),
@@ -14919,7 +14919,7 @@ import org.slf4j.LoggerFactory;
 public SetByteBuffer splits; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   LOGIN((short)1, login),
   TABLE_NAME((short)2, tableName),
   SPLITS((short)3, splits);
@@ -15533,7 +15533,7 @@ import org.slf4j.LoggerFactory;
 public TableNotFoundException ouch3; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   OUCH1((short)1, ouch1),
   OUCH2((short)2, ouch2),
   OUCH3((short)3, ouch3);
@@ -16095,7 +16095,7 @@ import org.slf4j.LoggerFactory;
 public SetIteratorScope scopes; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   LOGIN((short)1, login),
   TABLE_NAME((short)2, tableName),
   SETTING((short)3, setting),
@@ -16815,7 +16815,7 @@ import org.slf4j.LoggerFactory;
 public TableNotFoundException ouch3; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   OUCH1((short)1, ouch1),
   OUCH2((short)2, ouch2),
   OUCH3((short)3, ouch3);
@@ -17377,7 +17377,7 @@ import org.slf4j.LoggerFactory;
 public SetIteratorScope scopes; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-

[01/25] accumulo git commit: ACCUMULO-3759 More Java 8 compiler warnings

2015-04-30 Thread ctubbsii

Repository: accumulo
Updated Branches:
  refs/heads/1.5 5ac1b52ef - e395bc8ce
  refs/heads/1.6 67c8b2b67 - bbcc6da44
  refs/heads/1.7 ef2e31af3 - 4d1acd14a
  refs/heads/master ae4fd486d - a03f14a5c


ACCUMULO-3759 More Java 8 compiler warnings

* Fix compiler warnings in Java 8 for 1.5 branch


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

Branch: refs/heads/1.5
Commit: e395bc8ced5d740fe4a6e5d3ebb169335f64c044
Parents: 5ac1b52
Author: Christopher Tubbs ctubb...@apache.org
Authored: Thu Apr 30 12:04:50 2015 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Thu Apr 30 12:04:50 2015 -0400

--
 .../core/iterators/AggregatingIterator.java   | 18 ++
 .../aggregation/conf/AggregatorConfiguration.java |  3 +--
 .../iterators/aggregation/conf/AggregatorSet.java |  7 +++
 .../util/shell/commands/AddSplitsCommand.java | 18 +-
 .../core/iterators/AggregatingIteratorTest.java   |  6 --
 .../conf/AggregatorConfigurationTest.java | 13 -
 .../org/apache/accumulo/server/master/Master.java | 16 
 .../classloader/vfs/AccumuloVFSClassLoader.java   |  6 +++---
 8 files changed, 50 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e395bc8c/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
 
b/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
index 28acc2b..13b2710 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
@@ -27,7 +27,6 @@ import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.PartialKey;
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.iterators.aggregation.Aggregator;
 import org.apache.accumulo.core.iterators.conf.ColumnToClassMapping;
 import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader;
 import org.apache.log4j.Logger;
@@ -42,7 +41,7 @@ import org.apache.log4j.Logger;
 public class AggregatingIterator implements SortedKeyValueIteratorKey,Value, 
OptionDescriber {
 
   private SortedKeyValueIteratorKey,Value iterator;
-  private ColumnToClassMappingAggregator aggregators;
+  private 
ColumnToClassMappingorg.apache.accumulo.core.iterators.aggregation.Aggregator 
aggregators;
 
   private Key workKey = new Key();
 
@@ -51,6 +50,7 @@ public class AggregatingIterator implements 
SortedKeyValueIteratorKey,Value, O
   // private boolean propogateDeletes;
   private static final Logger log = 
Logger.getLogger(AggregatingIterator.class);
 
+  @Override
   public AggregatingIterator deepCopy(IteratorEnvironment env) {
 return new AggregatingIterator(this, env);
   }
@@ -62,7 +62,7 @@ public class AggregatingIterator implements 
SortedKeyValueIteratorKey,Value, O
 
   public AggregatingIterator() {}
 
-  private void aggregateRowColumn(Aggregator aggr) throws IOException {
+  private void 
aggregateRowColumn(org.apache.accumulo.core.iterators.aggregation.Aggregator 
aggr) throws IOException {
 // this function assumes that first value is not delete
 
 if (iterator.getTopKey().isDeleted())
@@ -90,14 +90,15 @@ public class AggregatingIterator implements 
SortedKeyValueIteratorKey,Value, O
   private void findTop() throws IOException {
 // check if aggregation is needed
 if (iterator.hasTop()) {
-  Aggregator aggr = aggregators.getObject(iterator.getTopKey());
+  org.apache.accumulo.core.iterators.aggregation.Aggregator aggr = 
aggregators.getObject(iterator.getTopKey());
   if (aggr != null) {
 aggregateRowColumn(aggr);
   }
 }
   }
 
-  public AggregatingIterator(SortedKeyValueIteratorKey,Value iterator, 
ColumnToClassMappingAggregator aggregators) throws IOException {
+  public AggregatingIterator(SortedKeyValueIteratorKey,Value iterator,
+  
ColumnToClassMappingorg.apache.accumulo.core.iterators.aggregation.Aggregator 
aggregators) throws IOException {
 this.iterator = iterator;
 this.aggregators = aggregators;
   }
@@ -167,7 +168,8 @@ public class AggregatingIterator implements 
SortedKeyValueIteratorKey,Value, O
 this.iterator = source;
 
 try {
-  this.aggregators = new ColumnToClassMappingAggregator(options, 
Aggregator.class);
+  this.aggregators = new

[14/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

2015-04-30 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
index 3b23175..b22da8f 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloProxy.java
@@ -48,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings(all) public class AccumuloProxy {
+@SuppressWarnings({unchecked, serial, rawtypes, unused}) public class 
AccumuloProxy {
 
   public interface Iface {
 
@@ -12719,7 +12719,7 @@ import org.slf4j.LoggerFactory;
 public MapString,String loginProperties; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   PRINCIPAL((short)1, principal),
   LOGIN_PROPERTIES((short)2, loginProperties);
 
@@ -13225,7 +13225,7 @@ import org.slf4j.LoggerFactory;
 public AccumuloSecurityException ouch2; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   SUCCESS((short)0, success),
   OUCH2((short)1, ouch2);
 
@@ -13694,7 +13694,7 @@ import org.slf4j.LoggerFactory;
 public String constraintClassName; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   LOGIN((short)1, login),
   TABLE_NAME((short)2, tableName),
   CONSTRAINT_CLASS_NAME((short)3, constraintClassName);
@@ -14261,7 +14261,7 @@ import org.slf4j.LoggerFactory;
 public TableNotFoundException ouch3; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   SUCCESS((short)0, success),
   OUCH1((short)1, ouch1),
   OUCH2((short)2, ouch2),
@@ -14919,7 +14919,7 @@ import org.slf4j.LoggerFactory;
 public SetByteBuffer splits; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   LOGIN((short)1, login),
   TABLE_NAME((short)2, tableName),
   SPLITS((short)3, splits);
@@ -15533,7 +15533,7 @@ import org.slf4j.LoggerFactory;
 public TableNotFoundException ouch3; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   OUCH1((short)1, ouch1),
   OUCH2((short)2, ouch2),
   OUCH3((short)3, ouch3);
@@ -16095,7 +16095,7 @@ import org.slf4j.LoggerFactory;
 public SetIteratorScope scopes; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   LOGIN((short)1, login),
   TABLE_NAME((short)2, tableName),
   SETTING((short)3, setting),
@@ -16815,7 +16815,7 @@ import org.slf4j.LoggerFactory;
 public TableNotFoundException ouch3; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   OUCH1((short)1, ouch1),
   OUCH2((short)2, ouch2),
   OUCH3((short)3, ouch3);
@@ -17377,7 +17377,7 @@ import org.slf4j.LoggerFactory;
 public SetIteratorScope scopes; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-

[11/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

2015-04-30 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java 
b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
index 9d7ba57..042093a 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
@@ -48,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings(all) public class GCMonitorService {
+@SuppressWarnings({unchecked, serial, rawtypes, unused}) public class 
GCMonitorService {
 
   public interface Iface {
 
@@ -295,7 +295,7 @@ import org.slf4j.LoggerFactory;
 public org.apache.accumulo.core.security.thrift.TCredentials credentials; 
// required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   TINFO((short)2, tinfo),
   CREDENTIALS((short)1, credentials);
 
@@ -759,7 +759,7 @@ import org.slf4j.LoggerFactory;
 public org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException 
sec; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   SUCCESS((short)0, success),
   SEC((short)1, sec);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java 
b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java
index 7c90b7a..9d6ade6 100644
--- a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java
+++ b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java
@@ -48,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings(all) public class GCStatus implements 
org.apache.thrift.TBaseGCStatus, GCStatus._Fields, java.io.Serializable, 
Cloneable, ComparableGCStatus {
+@SuppressWarnings({unchecked, serial, rawtypes, unused}) public class 
GCStatus implements org.apache.thrift.TBaseGCStatus, GCStatus._Fields, 
java.io.Serializable, Cloneable, ComparableGCStatus {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct(GCStatus);
 
   private static final org.apache.thrift.protocol.TField LAST_FIELD_DESC = new 
org.apache.thrift.protocol.TField(last, 
org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
   public GcCycleStats currentLog; // required
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  @SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 LAST((short)1, last),
 LAST_LOG((short)2, lastLog),
 CURRENT((short)3, current),

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java 
b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java
index a76c14c..83dc826 100644
--- a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java
+++ b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java
@@ -48,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings(all) public class GcCycleStats implements 
org.apache.thrift.TBaseGcCycleStats, GcCycleStats._Fields, 
java.io.Serializable, Cloneable, ComparableGcCycleStats {
+@SuppressWarnings({unchecked, serial, rawtypes, unused}) public class 
GcCycleStats implements org.apache.thrift.TBaseGcCycleStats, 
GcCycleStats._Fields, java.io.Serializable, Cloneable, 
ComparableGcCycleStats {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct(GcCycleStats);
 
   private static final org.apache.thrift.protocol.TField STARTED_FIELD_DESC = 
new org.apache.thrift.protocol.TField(started, 
org.apache.thrift.protocol.TType.I64, (short)1);
@@ -72,7 +72,7

[04/25] accumulo git commit: ACCUMULO-3759 More Java 8 compiler warnings

2015-04-30 Thread ctubbsii

ACCUMULO-3759 More Java 8 compiler warnings

* Fix compiler warnings in Java 8 for 1.5 branch


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

Branch: refs/heads/1.7
Commit: e395bc8ced5d740fe4a6e5d3ebb169335f64c044
Parents: 5ac1b52
Author: Christopher Tubbs ctubb...@apache.org
Authored: Thu Apr 30 12:04:50 2015 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Thu Apr 30 12:04:50 2015 -0400

--
 .../core/iterators/AggregatingIterator.java   | 18 ++
 .../aggregation/conf/AggregatorConfiguration.java |  3 +--
 .../iterators/aggregation/conf/AggregatorSet.java |  7 +++
 .../util/shell/commands/AddSplitsCommand.java | 18 +-
 .../core/iterators/AggregatingIteratorTest.java   |  6 --
 .../conf/AggregatorConfigurationTest.java | 13 -
 .../org/apache/accumulo/server/master/Master.java | 16 
 .../classloader/vfs/AccumuloVFSClassLoader.java   |  6 +++---
 8 files changed, 50 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e395bc8c/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
 
b/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
index 28acc2b..13b2710 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
@@ -27,7 +27,6 @@ import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.PartialKey;
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.iterators.aggregation.Aggregator;
 import org.apache.accumulo.core.iterators.conf.ColumnToClassMapping;
 import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader;
 import org.apache.log4j.Logger;
@@ -42,7 +41,7 @@ import org.apache.log4j.Logger;
 public class AggregatingIterator implements SortedKeyValueIteratorKey,Value, 
OptionDescriber {
 
   private SortedKeyValueIteratorKey,Value iterator;
-  private ColumnToClassMappingAggregator aggregators;
+  private 
ColumnToClassMappingorg.apache.accumulo.core.iterators.aggregation.Aggregator 
aggregators;
 
   private Key workKey = new Key();
 
@@ -51,6 +50,7 @@ public class AggregatingIterator implements 
SortedKeyValueIteratorKey,Value, O
   // private boolean propogateDeletes;
   private static final Logger log = 
Logger.getLogger(AggregatingIterator.class);
 
+  @Override
   public AggregatingIterator deepCopy(IteratorEnvironment env) {
 return new AggregatingIterator(this, env);
   }
@@ -62,7 +62,7 @@ public class AggregatingIterator implements 
SortedKeyValueIteratorKey,Value, O
 
   public AggregatingIterator() {}
 
-  private void aggregateRowColumn(Aggregator aggr) throws IOException {
+  private void 
aggregateRowColumn(org.apache.accumulo.core.iterators.aggregation.Aggregator 
aggr) throws IOException {
 // this function assumes that first value is not delete
 
 if (iterator.getTopKey().isDeleted())
@@ -90,14 +90,15 @@ public class AggregatingIterator implements 
SortedKeyValueIteratorKey,Value, O
   private void findTop() throws IOException {
 // check if aggregation is needed
 if (iterator.hasTop()) {
-  Aggregator aggr = aggregators.getObject(iterator.getTopKey());
+  org.apache.accumulo.core.iterators.aggregation.Aggregator aggr = 
aggregators.getObject(iterator.getTopKey());
   if (aggr != null) {
 aggregateRowColumn(aggr);
   }
 }
   }
 
-  public AggregatingIterator(SortedKeyValueIteratorKey,Value iterator, 
ColumnToClassMappingAggregator aggregators) throws IOException {
+  public AggregatingIterator(SortedKeyValueIteratorKey,Value iterator,
+  
ColumnToClassMappingorg.apache.accumulo.core.iterators.aggregation.Aggregator 
aggregators) throws IOException {
 this.iterator = iterator;
 this.aggregators = aggregators;
   }
@@ -167,7 +168,8 @@ public class AggregatingIterator implements 
SortedKeyValueIteratorKey,Value, O
 this.iterator = source;
 
 try {
-  this.aggregators = new ColumnToClassMappingAggregator(options, 
Aggregator.class);
+  this.aggregators = new 
ColumnToClassMappingorg.apache.accumulo.core.iterators.aggregation.Aggregator(options,
+  org.apache.accumulo.core.iterators.aggregation.Aggregator.class);
 } catch (ClassNotFoundException e) {
   log.error(e.toString());

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

2015-04-30 Thread ctubbsii

Merge branch '1.6' into 1.7

Conflicts:

core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
core/src/main/scripts/generate-thrift.sh

core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java
pom.xml
server/tracer/src/main/scripts/generate-thrift.sh

shell/src/main/java/org/apache/accumulo/shell/commands/AddSplitsCommand.java
trace/src/main/java/org/apache/accumulo/trace/thrift/TInfo.java


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

Branch: refs/heads/1.7
Commit: 4d1acd14a1e864188e28a90e4c84f0389b052da4
Parents: ef2e31a bbcc6da
Author: Christopher Tubbs ctubb...@apache.org
Authored: Thu Apr 30 13:42:38 2015 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Thu Apr 30 13:42:38 2015 -0400

--
 core/src/main/scripts/generate-thrift.sh | 6 +++---
 pom.xml  | 6 --
 2 files changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4d1acd14/core/src/main/scripts/generate-thrift.sh
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4d1acd14/pom.xml
--
diff --cc pom.xml
index f680f84,9249a5b..c74ad2a
--- a/pom.xml
+++ b/pom.xml
@@@ -119,15 -118,15 +119,17 @@@
  accumulo.release.version${project.version}/accumulo.release.version
  !-- bouncycastle version for test dependencies --
  bouncycastle.version1.50/bouncycastle.version
+ !-- findbugs-maven-plugin won't work on jdk8 or later; set to 3.0.0 or 
newer --
 -findbugs.version2.5.5/findbugs.version
++findbugs.version3.0.0/findbugs.version
  !-- surefire/failsafe plugin option --
  forkCount1/forkCount
 -!-- overwritten in profiles hadoop-1 or hadoop-2 --
 +!-- overwritten in hadoop profiles --
  hadoop.version2.2.0/hadoop.version
 +htrace.version3.1.0-incubating/htrace.version
  httpclient.version3.1/httpclient.version
 -java.ver1.6/java.ver
 -jetty.version8.1.15.v20140411/jetty.version
 +jetty.version9.1.5.v20140505/jetty.version
 +maven.compiler.source1.7/maven.compiler.source
 +maven.compiler.target1.7/maven.compiler.target
  !-- the maven-release-plugin makes this recommendation, due to plugin 
bugs --
  maven.min-version3.0.4/maven.min-version
  !-- surefire/failsafe plugin option --

[16/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

2015-04-30 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java 
b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
index 9d7ba57..042093a 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCMonitorService.java
@@ -48,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings(all) public class GCMonitorService {
+@SuppressWarnings({unchecked, serial, rawtypes, unused}) public class 
GCMonitorService {
 
   public interface Iface {
 
@@ -295,7 +295,7 @@ import org.slf4j.LoggerFactory;
 public org.apache.accumulo.core.security.thrift.TCredentials credentials; 
// required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   TINFO((short)2, tinfo),
   CREDENTIALS((short)1, credentials);
 
@@ -759,7 +759,7 @@ import org.slf4j.LoggerFactory;
 public org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException 
sec; // required
 
 /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-@SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+public enum _Fields implements org.apache.thrift.TFieldIdEnum {
   SUCCESS((short)0, success),
   SEC((short)1, sec);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java 
b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java
index 7c90b7a..9d6ade6 100644
--- a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java
+++ b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GCStatus.java
@@ -48,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings(all) public class GCStatus implements 
org.apache.thrift.TBaseGCStatus, GCStatus._Fields, java.io.Serializable, 
Cloneable, ComparableGCStatus {
+@SuppressWarnings({unchecked, serial, rawtypes, unused}) public class 
GCStatus implements org.apache.thrift.TBaseGCStatus, GCStatus._Fields, 
java.io.Serializable, Cloneable, ComparableGCStatus {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct(GCStatus);
 
   private static final org.apache.thrift.protocol.TField LAST_FIELD_DESC = new 
org.apache.thrift.protocol.TField(last, 
org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
   public GcCycleStats currentLog; // required
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  @SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 LAST((short)1, last),
 LAST_LOG((short)2, lastLog),
 CURRENT((short)3, current),

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java 
b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java
index a76c14c..83dc826 100644
--- a/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java
+++ b/core/src/main/java/org/apache/accumulo/core/gc/thrift/GcCycleStats.java
@@ -48,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings(all) public class GcCycleStats implements 
org.apache.thrift.TBaseGcCycleStats, GcCycleStats._Fields, 
java.io.Serializable, Cloneable, ComparableGcCycleStats {
+@SuppressWarnings({unchecked, serial, rawtypes, unused}) public class 
GcCycleStats implements org.apache.thrift.TBaseGcCycleStats, 
GcCycleStats._Fields, java.io.Serializable, Cloneable, 
ComparableGcCycleStats {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct(GcCycleStats);
 
   private static final org.apache.thrift.protocol.TField STARTED_FIELD_DESC = 
new org.apache.thrift.protocol.TField(started, 
org.apache.thrift.protocol.TType.I64, (short)1);
@@ -72,7 +72,7

[13/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

2015-04-30 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java
index 8dd28cf..c4b3c07 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java
@@ -48,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings(all) public class Condition implements 
org.apache.thrift.TBaseCondition, Condition._Fields, java.io.Serializable, 
Cloneable, ComparableCondition {
+@SuppressWarnings({unchecked, serial, rawtypes, unused}) public class 
Condition implements org.apache.thrift.TBaseCondition, Condition._Fields, 
java.io.Serializable, Cloneable, ComparableCondition {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct(Condition);
 
   private static final org.apache.thrift.protocol.TField COLUMN_FIELD_DESC = 
new org.apache.thrift.protocol.TField(column, 
org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
   public ListIteratorSetting iterators; // optional
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  @SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 COLUMN((short)1, column),
 TIMESTAMP((short)2, timestamp),
 VALUE((short)3, value),

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java
index 55f0e62..515c416 100644
--- 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java
+++ 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java
@@ -27,7 +27,7 @@ import java.util.Map;
 import java.util.HashMap;
 import org.apache.thrift.TEnum;
 
-@SuppressWarnings(all) public enum ConditionalStatus implements 
org.apache.thrift.TEnum {
+@SuppressWarnings({unused}) public enum ConditionalStatus implements 
org.apache.thrift.TEnum {
   ACCEPTED(0),
   REJECTED(1),
   VIOLATED(2),

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java
index 71806fe..551e996 100644
--- 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java
+++ 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java
@@ -48,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings(all) public class ConditionalUpdates implements 
org.apache.thrift.TBaseConditionalUpdates, ConditionalUpdates._Fields, 
java.io.Serializable, Cloneable, ComparableConditionalUpdates {
+@SuppressWarnings({unchecked, serial, rawtypes, unused}) public class 
ConditionalUpdates implements org.apache.thrift.TBaseConditionalUpdates, 
ConditionalUpdates._Fields, java.io.Serializable, Cloneable, 
ComparableConditionalUpdates {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct(ConditionalUpdates);
 
   private static final org.apache.thrift.protocol.TField CONDITIONS_FIELD_DESC 
= new org.apache.thrift.protocol.TField(conditions, 
org.apache.thrift.protocol.TType.LIST, (short)2);
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
   public ListColumnUpdate updates; // required
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  @SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 CONDITIONS((short)2, conditions),
 UPDATES((short)3, updates);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java
 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java

[17/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

2015-04-30 Thread ctubbsii

ACCUMULO-3759 More build warnings on Java 8

* Clean up build output while generating example configs
* Fix javac warnings from thrift
* Enable specifying different findbugs version to build on jdk8


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

Branch: refs/heads/master
Commit: bbcc6da446b737507dfd9c486b5673055fbdf0ab
Parents: b636ff2
Author: Christopher Tubbs ctubb...@apache.org
Authored: Thu Apr 30 13:00:18 2015 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Thu Apr 30 13:29:30 2015 -0400

--
 .../main/scripts/generate-example-configs.sh|   7 +-
 .../core/client/impl/thrift/ClientService.java  | 122 
 .../client/impl/thrift/ConfigurationType.java   |   2 +-
 .../client/impl/thrift/SecurityErrorCode.java   |   2 +-
 .../core/client/impl/thrift/TDiskUsage.java |   4 +-
 .../core/client/impl/thrift/TableOperation.java |   2 +-
 .../thrift/TableOperationExceptionType.java |   2 +-
 .../impl/thrift/ThriftSecurityException.java|   4 +-
 .../thrift/ThriftTableOperationException.java   |   4 +-
 .../core/client/impl/thrift/ThriftTest.java |  14 +-
 .../lib/impl/DistributedCacheHelper.java|   7 +-
 .../core/data/thrift/InitialMultiScan.java  |   4 +-
 .../accumulo/core/data/thrift/InitialScan.java  |   4 +-
 .../accumulo/core/data/thrift/IterInfo.java |   4 +-
 .../accumulo/core/data/thrift/MapFileInfo.java  |   4 +-
 .../core/data/thrift/MultiScanResult.java   |   4 +-
 .../accumulo/core/data/thrift/ScanResult.java   |   4 +-
 .../accumulo/core/data/thrift/TCMResult.java|   4 +-
 .../accumulo/core/data/thrift/TCMStatus.java|   2 +-
 .../accumulo/core/data/thrift/TColumn.java  |   4 +-
 .../accumulo/core/data/thrift/TCondition.java   |   4 +-
 .../core/data/thrift/TConditionalMutation.java  |   4 +-
 .../core/data/thrift/TConditionalSession.java   |   4 +-
 .../thrift/TConstraintViolationSummary.java |   4 +-
 .../apache/accumulo/core/data/thrift/TKey.java  |   4 +-
 .../accumulo/core/data/thrift/TKeyExtent.java   |   4 +-
 .../accumulo/core/data/thrift/TKeyValue.java|   4 +-
 .../accumulo/core/data/thrift/TMutation.java|   4 +-
 .../accumulo/core/data/thrift/TRange.java   |   4 +-
 .../accumulo/core/data/thrift/UpdateErrors.java |   4 +-
 .../core/gc/thrift/GCMonitorService.java|   6 +-
 .../accumulo/core/gc/thrift/GCStatus.java   |   4 +-
 .../accumulo/core/gc/thrift/GcCycleStats.java   |   4 +-
 .../accumulo/core/master/thrift/Compacting.java |   4 +-
 .../accumulo/core/master/thrift/DeadServer.java |   4 +-
 .../core/master/thrift/FateOperation.java   |   2 +-
 .../core/master/thrift/FateService.java |  18 +-
 .../core/master/thrift/MasterClientService.java |  54 ++--
 .../core/master/thrift/MasterGoalState.java |   2 +-
 .../core/master/thrift/MasterMonitorInfo.java   |   4 +-
 .../core/master/thrift/MasterState.java |   2 +-
 .../core/master/thrift/RecoveryException.java   |   4 +-
 .../core/master/thrift/RecoveryStatus.java  |   4 +-
 .../accumulo/core/master/thrift/TableInfo.java  |   4 +-
 .../core/master/thrift/TabletLoadState.java |   2 +-
 .../core/master/thrift/TabletServerStatus.java  |   4 +-
 .../core/master/thrift/TabletSplit.java |   4 +-
 .../core/security/thrift/TCredentials.java  |   4 +-
 .../core/tabletserver/thrift/ActionStats.java   |   4 +-
 .../tabletserver/thrift/ActiveCompaction.java   |   4 +-
 .../core/tabletserver/thrift/ActiveScan.java|   4 +-
 .../tabletserver/thrift/CompactionReason.java   |   2 +-
 .../tabletserver/thrift/CompactionType.java |   2 +-
 .../thrift/ConstraintViolationException.java|   4 +-
 .../tabletserver/thrift/IteratorConfig.java |   4 +-
 .../thrift/NoSuchScanIDException.java   |   4 +-
 .../thrift/NotServingTabletException.java   |   4 +-
 .../core/tabletserver/thrift/ScanState.java |   2 +-
 .../core/tabletserver/thrift/ScanType.java  |   2 +-
 .../tabletserver/thrift/TIteratorSetting.java   |   4 +-
 .../thrift/TabletClientService.java | 100 +++---
 .../core/tabletserver/thrift/TabletStats.java   |   4 +-
 .../thrift/TooManyFilesException.java   |   4 +-
 core/src/main/scripts/generate-thrift.sh|  50 +--
 pom.xml |   6 +-
 .../proxy/thrift/AccumuloException.java |   4 +-
 .../accumulo/proxy/thrift/AccumuloProxy.java| 308 +--
 .../proxy/thrift/AccumuloSecurityException.java |   4 +-
 .../accumulo/proxy/thrift/ActiveCompaction.java |   4 +-
 .../accumulo/proxy/thrift/ActiveScan.java   |   4 +-
 .../accumulo/proxy/thrift/BatchScanOptions.java |   4 +-

[22/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

2015-04-30 Thread ctubbsii

ACCUMULO-3759 More build warnings on Java 8

* Clean up build output while generating example configs
* Fix javac warnings from thrift
* Enable specifying different findbugs version to build on jdk8


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

Branch: refs/heads/1.6
Commit: bbcc6da446b737507dfd9c486b5673055fbdf0ab
Parents: b636ff2
Author: Christopher Tubbs ctubb...@apache.org
Authored: Thu Apr 30 13:00:18 2015 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Thu Apr 30 13:29:30 2015 -0400

--
 .../main/scripts/generate-example-configs.sh|   7 +-
 .../core/client/impl/thrift/ClientService.java  | 122 
 .../client/impl/thrift/ConfigurationType.java   |   2 +-
 .../client/impl/thrift/SecurityErrorCode.java   |   2 +-
 .../core/client/impl/thrift/TDiskUsage.java |   4 +-
 .../core/client/impl/thrift/TableOperation.java |   2 +-
 .../thrift/TableOperationExceptionType.java |   2 +-
 .../impl/thrift/ThriftSecurityException.java|   4 +-
 .../thrift/ThriftTableOperationException.java   |   4 +-
 .../core/client/impl/thrift/ThriftTest.java |  14 +-
 .../lib/impl/DistributedCacheHelper.java|   7 +-
 .../core/data/thrift/InitialMultiScan.java  |   4 +-
 .../accumulo/core/data/thrift/InitialScan.java  |   4 +-
 .../accumulo/core/data/thrift/IterInfo.java |   4 +-
 .../accumulo/core/data/thrift/MapFileInfo.java  |   4 +-
 .../core/data/thrift/MultiScanResult.java   |   4 +-
 .../accumulo/core/data/thrift/ScanResult.java   |   4 +-
 .../accumulo/core/data/thrift/TCMResult.java|   4 +-
 .../accumulo/core/data/thrift/TCMStatus.java|   2 +-
 .../accumulo/core/data/thrift/TColumn.java  |   4 +-
 .../accumulo/core/data/thrift/TCondition.java   |   4 +-
 .../core/data/thrift/TConditionalMutation.java  |   4 +-
 .../core/data/thrift/TConditionalSession.java   |   4 +-
 .../thrift/TConstraintViolationSummary.java |   4 +-
 .../apache/accumulo/core/data/thrift/TKey.java  |   4 +-
 .../accumulo/core/data/thrift/TKeyExtent.java   |   4 +-
 .../accumulo/core/data/thrift/TKeyValue.java|   4 +-
 .../accumulo/core/data/thrift/TMutation.java|   4 +-
 .../accumulo/core/data/thrift/TRange.java   |   4 +-
 .../accumulo/core/data/thrift/UpdateErrors.java |   4 +-
 .../core/gc/thrift/GCMonitorService.java|   6 +-
 .../accumulo/core/gc/thrift/GCStatus.java   |   4 +-
 .../accumulo/core/gc/thrift/GcCycleStats.java   |   4 +-
 .../accumulo/core/master/thrift/Compacting.java |   4 +-
 .../accumulo/core/master/thrift/DeadServer.java |   4 +-
 .../core/master/thrift/FateOperation.java   |   2 +-
 .../core/master/thrift/FateService.java |  18 +-
 .../core/master/thrift/MasterClientService.java |  54 ++--
 .../core/master/thrift/MasterGoalState.java |   2 +-
 .../core/master/thrift/MasterMonitorInfo.java   |   4 +-
 .../core/master/thrift/MasterState.java |   2 +-
 .../core/master/thrift/RecoveryException.java   |   4 +-
 .../core/master/thrift/RecoveryStatus.java  |   4 +-
 .../accumulo/core/master/thrift/TableInfo.java  |   4 +-
 .../core/master/thrift/TabletLoadState.java |   2 +-
 .../core/master/thrift/TabletServerStatus.java  |   4 +-
 .../core/master/thrift/TabletSplit.java |   4 +-
 .../core/security/thrift/TCredentials.java  |   4 +-
 .../core/tabletserver/thrift/ActionStats.java   |   4 +-
 .../tabletserver/thrift/ActiveCompaction.java   |   4 +-
 .../core/tabletserver/thrift/ActiveScan.java|   4 +-
 .../tabletserver/thrift/CompactionReason.java   |   2 +-
 .../tabletserver/thrift/CompactionType.java |   2 +-
 .../thrift/ConstraintViolationException.java|   4 +-
 .../tabletserver/thrift/IteratorConfig.java |   4 +-
 .../thrift/NoSuchScanIDException.java   |   4 +-
 .../thrift/NotServingTabletException.java   |   4 +-
 .../core/tabletserver/thrift/ScanState.java |   2 +-
 .../core/tabletserver/thrift/ScanType.java  |   2 +-
 .../tabletserver/thrift/TIteratorSetting.java   |   4 +-
 .../thrift/TabletClientService.java | 100 +++---
 .../core/tabletserver/thrift/TabletStats.java   |   4 +-
 .../thrift/TooManyFilesException.java   |   4 +-
 core/src/main/scripts/generate-thrift.sh|  50 +--
 pom.xml |   6 +-
 .../proxy/thrift/AccumuloException.java |   4 +-
 .../accumulo/proxy/thrift/AccumuloProxy.java| 308 +--
 .../proxy/thrift/AccumuloSecurityException.java |   4 +-
 .../accumulo/proxy/thrift/ActiveCompaction.java |   4 +-
 .../accumulo/proxy/thrift/ActiveScan.java   |   4 +-
 .../accumulo/proxy/thrift/BatchScanOptions.java |   4 +-

[18/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

2015-04-30 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java
index 8dd28cf..c4b3c07 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Condition.java
@@ -48,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings(all) public class Condition implements 
org.apache.thrift.TBaseCondition, Condition._Fields, java.io.Serializable, 
Cloneable, ComparableCondition {
+@SuppressWarnings({unchecked, serial, rawtypes, unused}) public class 
Condition implements org.apache.thrift.TBaseCondition, Condition._Fields, 
java.io.Serializable, Cloneable, ComparableCondition {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct(Condition);
 
   private static final org.apache.thrift.protocol.TField COLUMN_FIELD_DESC = 
new org.apache.thrift.protocol.TField(column, 
org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -68,7 +68,7 @@ import org.slf4j.LoggerFactory;
   public ListIteratorSetting iterators; // optional
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  @SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 COLUMN((short)1, column),
 TIMESTAMP((short)2, timestamp),
 VALUE((short)3, value),

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java
index 55f0e62..515c416 100644
--- 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java
+++ 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalStatus.java
@@ -27,7 +27,7 @@ import java.util.Map;
 import java.util.HashMap;
 import org.apache.thrift.TEnum;
 
-@SuppressWarnings(all) public enum ConditionalStatus implements 
org.apache.thrift.TEnum {
+@SuppressWarnings({unused}) public enum ConditionalStatus implements 
org.apache.thrift.TEnum {
   ACCEPTED(0),
   REJECTED(1),
   VIOLATED(2),

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java
index 71806fe..551e996 100644
--- 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java
+++ 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalUpdates.java
@@ -48,7 +48,7 @@ import java.util.Arrays;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings(all) public class ConditionalUpdates implements 
org.apache.thrift.TBaseConditionalUpdates, ConditionalUpdates._Fields, 
java.io.Serializable, Cloneable, ComparableConditionalUpdates {
+@SuppressWarnings({unchecked, serial, rawtypes, unused}) public class 
ConditionalUpdates implements org.apache.thrift.TBaseConditionalUpdates, 
ConditionalUpdates._Fields, java.io.Serializable, Cloneable, 
ComparableConditionalUpdates {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct(ConditionalUpdates);
 
   private static final org.apache.thrift.protocol.TField CONDITIONS_FIELD_DESC 
= new org.apache.thrift.protocol.TField(conditions, 
org.apache.thrift.protocol.TType.LIST, (short)2);
@@ -64,7 +64,7 @@ import org.slf4j.LoggerFactory;
   public ListColumnUpdate updates; // required
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
-  @SuppressWarnings(all) public enum _Fields implements 
org.apache.thrift.TFieldIdEnum {
+  public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 CONDITIONS((short)2, conditions),
 UPDATES((short)3, updates);
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/bbcc6da4/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java
 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java

[02/25] accumulo git commit: ACCUMULO-3759 More Java 8 compiler warnings

2015-04-30 Thread ctubbsii

ACCUMULO-3759 More Java 8 compiler warnings

* Fix compiler warnings in Java 8 for 1.5 branch


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

Branch: refs/heads/master
Commit: e395bc8ced5d740fe4a6e5d3ebb169335f64c044
Parents: 5ac1b52
Author: Christopher Tubbs ctubb...@apache.org
Authored: Thu Apr 30 12:04:50 2015 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Thu Apr 30 12:04:50 2015 -0400

--
 .../core/iterators/AggregatingIterator.java   | 18 ++
 .../aggregation/conf/AggregatorConfiguration.java |  3 +--
 .../iterators/aggregation/conf/AggregatorSet.java |  7 +++
 .../util/shell/commands/AddSplitsCommand.java | 18 +-
 .../core/iterators/AggregatingIteratorTest.java   |  6 --
 .../conf/AggregatorConfigurationTest.java | 13 -
 .../org/apache/accumulo/server/master/Master.java | 16 
 .../classloader/vfs/AccumuloVFSClassLoader.java   |  6 +++---
 8 files changed, 50 insertions(+), 37 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e395bc8c/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
 
b/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
index 28acc2b..13b2710 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/iterators/AggregatingIterator.java
@@ -27,7 +27,6 @@ import org.apache.accumulo.core.data.Key;
 import org.apache.accumulo.core.data.PartialKey;
 import org.apache.accumulo.core.data.Range;
 import org.apache.accumulo.core.data.Value;
-import org.apache.accumulo.core.iterators.aggregation.Aggregator;
 import org.apache.accumulo.core.iterators.conf.ColumnToClassMapping;
 import org.apache.accumulo.start.classloader.vfs.AccumuloVFSClassLoader;
 import org.apache.log4j.Logger;
@@ -42,7 +41,7 @@ import org.apache.log4j.Logger;
 public class AggregatingIterator implements SortedKeyValueIteratorKey,Value, 
OptionDescriber {
 
   private SortedKeyValueIteratorKey,Value iterator;
-  private ColumnToClassMappingAggregator aggregators;
+  private 
ColumnToClassMappingorg.apache.accumulo.core.iterators.aggregation.Aggregator 
aggregators;
 
   private Key workKey = new Key();
 
@@ -51,6 +50,7 @@ public class AggregatingIterator implements 
SortedKeyValueIteratorKey,Value, O
   // private boolean propogateDeletes;
   private static final Logger log = 
Logger.getLogger(AggregatingIterator.class);
 
+  @Override
   public AggregatingIterator deepCopy(IteratorEnvironment env) {
 return new AggregatingIterator(this, env);
   }
@@ -62,7 +62,7 @@ public class AggregatingIterator implements 
SortedKeyValueIteratorKey,Value, O
 
   public AggregatingIterator() {}
 
-  private void aggregateRowColumn(Aggregator aggr) throws IOException {
+  private void 
aggregateRowColumn(org.apache.accumulo.core.iterators.aggregation.Aggregator 
aggr) throws IOException {
 // this function assumes that first value is not delete
 
 if (iterator.getTopKey().isDeleted())
@@ -90,14 +90,15 @@ public class AggregatingIterator implements 
SortedKeyValueIteratorKey,Value, O
   private void findTop() throws IOException {
 // check if aggregation is needed
 if (iterator.hasTop()) {
-  Aggregator aggr = aggregators.getObject(iterator.getTopKey());
+  org.apache.accumulo.core.iterators.aggregation.Aggregator aggr = 
aggregators.getObject(iterator.getTopKey());
   if (aggr != null) {
 aggregateRowColumn(aggr);
   }
 }
   }
 
-  public AggregatingIterator(SortedKeyValueIteratorKey,Value iterator, 
ColumnToClassMappingAggregator aggregators) throws IOException {
+  public AggregatingIterator(SortedKeyValueIteratorKey,Value iterator,
+  
ColumnToClassMappingorg.apache.accumulo.core.iterators.aggregation.Aggregator 
aggregators) throws IOException {
 this.iterator = iterator;
 this.aggregators = aggregators;
   }
@@ -167,7 +168,8 @@ public class AggregatingIterator implements 
SortedKeyValueIteratorKey,Value, O
 this.iterator = source;
 
 try {
-  this.aggregators = new ColumnToClassMappingAggregator(options, 
Aggregator.class);
+  this.aggregators = new 
ColumnToClassMappingorg.apache.accumulo.core.iterators.aggregation.Aggregator(options,
+  org.apache.accumulo.core.iterators.aggregation.Aggregator.class);
 } catch (ClassNotFoundException e) {
   log.error(e.toString());

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

2015-04-30 Thread ctubbsii

Merge branch '1.6' into 1.7

Conflicts:

core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
core/src/main/scripts/generate-thrift.sh

core/src/test/java/org/apache/accumulo/core/iterators/AggregatingIteratorTest.java
pom.xml
server/tracer/src/main/scripts/generate-thrift.sh

shell/src/main/java/org/apache/accumulo/shell/commands/AddSplitsCommand.java
trace/src/main/java/org/apache/accumulo/trace/thrift/TInfo.java


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

Branch: refs/heads/master
Commit: 4d1acd14a1e864188e28a90e4c84f0389b052da4
Parents: ef2e31a bbcc6da
Author: Christopher Tubbs ctubb...@apache.org
Authored: Thu Apr 30 13:42:38 2015 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Thu Apr 30 13:42:38 2015 -0400

--
 core/src/main/scripts/generate-thrift.sh | 6 +++---
 pom.xml  | 6 --
 2 files changed, 7 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4d1acd14/core/src/main/scripts/generate-thrift.sh
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/4d1acd14/pom.xml
--
diff --cc pom.xml
index f680f84,9249a5b..c74ad2a
--- a/pom.xml
+++ b/pom.xml
@@@ -119,15 -118,15 +119,17 @@@
  accumulo.release.version${project.version}/accumulo.release.version
  !-- bouncycastle version for test dependencies --
  bouncycastle.version1.50/bouncycastle.version
+ !-- findbugs-maven-plugin won't work on jdk8 or later; set to 3.0.0 or 
newer --
 -findbugs.version2.5.5/findbugs.version
++findbugs.version3.0.0/findbugs.version
  !-- surefire/failsafe plugin option --
  forkCount1/forkCount
 -!-- overwritten in profiles hadoop-1 or hadoop-2 --
 +!-- overwritten in hadoop profiles --
  hadoop.version2.2.0/hadoop.version
 +htrace.version3.1.0-incubating/htrace.version
  httpclient.version3.1/httpclient.version
 -java.ver1.6/java.ver
 -jetty.version8.1.15.v20140411/jetty.version
 +jetty.version9.1.5.v20140505/jetty.version
 +maven.compiler.source1.7/maven.compiler.source
 +maven.compiler.target1.7/maven.compiler.target
  !-- the maven-release-plugin makes this recommendation, due to plugin 
bugs --
  maven.min-version3.0.4/maven.min-version
  !-- surefire/failsafe plugin option --

[3/5] accumulo git commit: ACCUMULO-3124 Document size and number of user-provided properties

2015-04-30 Thread elserj

ACCUMULO-3124 Document size and number of user-provided properties

Include warnings for both custom tags and iterator options


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

Branch: refs/heads/master
Commit: fae7a8224e5f259881ca744ce1aaeb062276127a
Parents: 2b48d1c
Author: Josh Elser els...@apache.org
Authored: Fri May 1 00:12:22 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Fri May 1 00:12:22 2015 -0400

--
 .../org/apache/accumulo/core/conf/config-header.txt | 9 +
 docs/src/main/asciidoc/chapters/administration.txt  | 7 +++
 2 files changed, 16 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/fae7a822/core/src/main/resources/org/apache/accumulo/core/conf/config-header.txt
--
diff --git 
a/core/src/main/resources/org/apache/accumulo/core/conf/config-header.txt 
b/core/src/main/resources/org/apache/accumulo/core/conf/config-header.txt
index d278882..be1958f 100644
--- a/core/src/main/resources/org/apache/accumulo/core/conf/config-header.txt
+++ b/core/src/main/resources/org/apache/accumulo/core/conf/config-header.txt
@@ -52,6 +52,15 @@ All properties have a default value in the source code.  
This value has the lowe
 
 While the default value is usually optimal, there are cases where a change can 
increase query and ingest performance.
 
+ ZooKeeper Property Considerations
+
+Any properties that are stored in ZooKeeper should consider the limitations of 
ZooKeeper itself with respect to the
+number of nodes and the size of the node data. Custom table properties and 
options for Iterators configured on tables
+are two areas in which there aren't any failsafes built into the API that can 
prevent the user from making this mistake.
+
+While these properties have the ability to add some much needed dynamic 
configuration tools, use cases which might fall
+into these warnings should be reconsidered.
+
 === Configuration in the Shell
 
 The `config` command in the shell allows you to view the current system 
configuration.  You can also use the `-t` option to view a table's 
configuration as below:

http://git-wip-us.apache.org/repos/asf/accumulo/blob/fae7a822/docs/src/main/asciidoc/chapters/administration.txt
--
diff --git a/docs/src/main/asciidoc/chapters/administration.txt 
b/docs/src/main/asciidoc/chapters/administration.txt
index 520a07c..857d948 100644
--- a/docs/src/main/asciidoc/chapters/administration.txt
+++ b/docs/src/main/asciidoc/chapters/administration.txt
@@ -296,6 +296,13 @@ applications to set application-level metadata about a 
table.  These tags can be
 anything from a table description, administrator notes, date created, etc.
 This is done by naming and setting a property with a prefix +table.custom.*+.
 
+Currently, table properties are stored in ZooKeeper. This means that the number
+and size of custom properties should be restricted on the order of 10's of 
properties
+at most without any properties exceeding 1MB in size. ZooKeeper's performance 
can be
+very sensitive to an excessive number of nodes and the sizes of the nodes. 
Applications
+which leverage the user of custom properties should take these warnings into
+consideration. There is no enforcement of these warnings via the API.
+
 === Initialization
 
 Accumulo must be initialized to create the structures it uses internally to 
locate

[2/5] accumulo git commit: ACCUMULO-3767 current log might be null

2015-04-30 Thread elserj

ACCUMULO-3767 current log might be null

A server might not have a current log. Account
for that, specifically for getActiveLogs().


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

Branch: refs/heads/master
Commit: 2b48d1cc48e8c494f1f537790d71a8ab716a21f4
Parents: 4d1acd1
Author: Josh Elser els...@apache.org
Authored: Thu Apr 30 23:38:08 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu Apr 30 23:38:08 2015 -0400

--
 .../main/java/org/apache/accumulo/tserver/TabletServer.java  | 4 
 .../org/apache/accumulo/tserver/log/TabletServerLogger.java  | 8 
 2 files changed, 12 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/2b48d1cc/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
--
diff --git 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index aeb73b4..96f33aa 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -1716,6 +1716,10 @@ public class TabletServer extends AccumuloServerContext 
implements Runnable {
 @Override
 public ListString getActiveLogs(TInfo tinfo, TCredentials credentials) 
throws TException {
   String log = logger.getLogFile();
+  // Might be null if there no active logger
+  if (null == log) {
+return Collections.emptyList();
+  }
   return Collections.singletonList(log);
 }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/2b48d1cc/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
--
diff --git 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
index bc77ffb..a2ab551 100644
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
@@ -180,9 +180,17 @@ public class TabletServerLogger {
 return result.get();
   }
 
+  /**
+   * Get the current WAL file
+   *
+   * @return The name of the current log, or null if there is no current log.
+   */
   public String getLogFile() {
 logIdLock.readLock().lock();
 try {
+  if (null == currentLog) {
+return null;
+  }
   return currentLog.getFileName();
 } finally {
   logIdLock.readLock().unlock();

[1/5] accumulo git commit: ACCUMULO-3767 current log might be null

2015-04-30 Thread elserj

Repository: accumulo
Updated Branches:
  refs/heads/1.7 4d1acd14a - fae7a8224
  refs/heads/master a03f14a5c - e25146d0d


ACCUMULO-3767 current log might be null

A server might not have a current log. Account
for that, specifically for getActiveLogs().


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

Branch: refs/heads/1.7
Commit: 2b48d1cc48e8c494f1f537790d71a8ab716a21f4
Parents: 4d1acd1
Author: Josh Elser els...@apache.org
Authored: Thu Apr 30 23:38:08 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Thu Apr 30 23:38:08 2015 -0400

--
 .../main/java/org/apache/accumulo/tserver/TabletServer.java  | 4 
 .../org/apache/accumulo/tserver/log/TabletServerLogger.java  | 8 
 2 files changed, 12 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/2b48d1cc/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
--
diff --git 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index aeb73b4..96f33aa 100644
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@ -1716,6 +1716,10 @@ public class TabletServer extends AccumuloServerContext 
implements Runnable {
 @Override
 public ListString getActiveLogs(TInfo tinfo, TCredentials credentials) 
throws TException {
   String log = logger.getLogFile();
+  // Might be null if there no active logger
+  if (null == log) {
+return Collections.emptyList();
+  }
   return Collections.singletonList(log);
 }
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/2b48d1cc/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
--
diff --git 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
index bc77ffb..a2ab551 100644
--- 
a/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
+++ 
b/server/tserver/src/main/java/org/apache/accumulo/tserver/log/TabletServerLogger.java
@@ -180,9 +180,17 @@ public class TabletServerLogger {
 return result.get();
   }
 
+  /**
+   * Get the current WAL file
+   *
+   * @return The name of the current log, or null if there is no current log.
+   */
   public String getLogFile() {
 logIdLock.readLock().lock();
 try {
+  if (null == currentLog) {
+return null;
+  }
   return currentLog.getFileName();
 } finally {
   logIdLock.readLock().unlock();

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

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

Branch: refs/heads/master
Commit: e25146d0d65ba112ce7008a9f01ec9f850cebd6c
Parents: a03f14a fae7a82
Author: Josh Elser els...@apache.org
Authored: Fri May 1 01:14:41 2015 -0400
Committer: Josh Elser els...@apache.org
Committed: Fri May 1 01:14:41 2015 -0400

--
 .../org/apache/accumulo/core/conf/config-header.txt | 9 +
 docs/src/main/asciidoc/chapters/administration.txt  | 7 +++
 .../main/java/org/apache/accumulo/tserver/TabletServer.java | 4 
 .../org/apache/accumulo/tserver/log/TabletServerLogger.java | 8 
 4 files changed, 28 insertions(+)
--

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

2015-04-30 Thread ctubbsii

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

Branch: refs/heads/master
Commit: ae4fd486d75a5d80501f18132a97ebf25f852fcf
Parents: bcc79d0 ef2e31a
Author: Christopher Tubbs ctubb...@apache.org
Authored: Thu Apr 30 11:27:41 2015 -0400
Committer: Christopher Tubbs ctubb...@apache.org
Committed: Thu Apr 30 11:27:41 2015 -0400

--
 .../java/org/apache/accumulo/server/util/RestoreZookeeper.java | 2 ++
 1 file changed, 2 insertions(+)
--

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

2015-04-30 Thread ctubbsii

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

Branch: refs/heads/master
Commit: ef2e31af3d6503e31e79610cd49de9ce0190f6f6
Parents: c55fe3e 67c8b2b
Author: Dave Marion dlmar...@hotmail.com
Authored: Wed Apr 29 18:08:36 2015 -0400
Committer: Dave Marion dlmar...@hotmail.com
Committed: Wed Apr 29 18:08:36 2015 -0400

--
 .../java/org/apache/accumulo/server/util/RestoreZookeeper.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ef2e31af/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
--

[1/3] accumulo git commit: ACCUMULO-3762: Add case for ephemeral nodes

2015-04-30 Thread ctubbsii

Repository: accumulo
Updated Branches:
  refs/heads/master bcc79d006 - ae4fd486d


ACCUMULO-3762: Add case for ephemeral nodes


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

Branch: refs/heads/master
Commit: 67c8b2b677b7e29eeb761954ba16d111b4939562
Parents: bc87145
Author: Dave Marion dlmar...@hotmail.com
Authored: Wed Apr 29 18:07:47 2015 -0400
Committer: Dave Marion dlmar...@hotmail.com
Committed: Wed Apr 29 18:07:47 2015 -0400

--
 .../java/org/apache/accumulo/server/util/RestoreZookeeper.java | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/67c8b2b6/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
--
diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
 
b/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
index 3dd639e..3c51727 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/util/RestoreZookeeper.java
@@ -71,6 +71,8 @@ public class RestoreZookeeper {
 else
   cwd.push(root);
 create(root, , UTF_8.name());
+  } else if (ephemeral.equals(name)) {
+cwd.push();
   }
 }

[06/25] accumulo git commit: Merge branch '1.5' into 1.6

[15/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

[08/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

[20/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

[09/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

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

[10/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

[03/25] accumulo git commit: ACCUMULO-3759 More Java 8 compiler warnings

[07/25] accumulo git commit: Merge branch '1.5' into 1.6

[19/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

[01/25] accumulo git commit: ACCUMULO-3759 More Java 8 compiler warnings

[14/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

[11/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

[04/25] accumulo git commit: ACCUMULO-3759 More Java 8 compiler warnings

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

[16/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

[13/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

[17/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

[22/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

[18/25] accumulo git commit: ACCUMULO-3759 More build warnings on Java 8

[02/25] accumulo git commit: ACCUMULO-3759 More Java 8 compiler warnings

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

[3/5] accumulo git commit: ACCUMULO-3124 Document size and number of user-provided properties

[2/5] accumulo git commit: ACCUMULO-3767 current log might be null

[1/5] accumulo git commit: ACCUMULO-3767 current log might be null

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

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

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

[1/3] accumulo git commit: ACCUMULO-3762: Add case for ephemeral nodes

29 matches

Site Navigation

Mail list logo

Footer information