date:20151216

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

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

Branch: refs/heads/master
Commit: f51e6b0c2d8e643344f91ce5d4386a60e9c82324
Parents: 904e957 4f02a65
Author: Christopher Tubbs 
Authored: Wed Dec 16 14:20:25 2015 -0500
Committer: Christopher Tubbs 
Committed: Wed Dec 16 14:20:25 2015 -0500

--
 pom.xml | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f51e6b0c/pom.xml
--
diff --cc pom.xml
index 8b0c656,8b4e129..c446c19
--- a/pom.xml
+++ b/pom.xml
@@@ -642,8 -608,7 +642,7 @@@

  ${project.reporting.outputEncoding}
  true
- docs
 -${java.ver}
 +${maven.compiler.target}
  -J-Xmx512m

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

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

Branch: refs/heads/1.7
Commit: f51e6b0c2d8e643344f91ce5d4386a60e9c82324
Parents: 904e957 4f02a65
Author: Christopher Tubbs 
Authored: Wed Dec 16 14:20:25 2015 -0500
Committer: Christopher Tubbs 
Committed: Wed Dec 16 14:20:25 2015 -0500

--
 pom.xml | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f51e6b0c/pom.xml
--
diff --cc pom.xml
index 8b0c656,8b4e129..c446c19
--- a/pom.xml
+++ b/pom.xml
@@@ -642,8 -608,7 +642,7 @@@

  ${project.reporting.outputEncoding}
  true
- docs
 -${java.ver}
 +${maven.compiler.target}
  -J-Xmx512m

[1/3] accumulo git commit: ACCUMULO-4076 Leave javadocs in default location

2015-12-16 Thread ctubbsii

Repository: accumulo
Updated Branches:
  refs/heads/1.6 ef8c1ca1e -> 4f02a65d5
  refs/heads/1.7 904e957c4 -> f51e6b0c2


ACCUMULO-4076 Leave javadocs in default location


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

Branch: refs/heads/1.6
Commit: 4f02a65d54ac52f97b365d012e30dfc9dbeff1c7
Parents: ef8c1ca
Author: Christopher Tubbs 
Authored: Wed Dec 16 14:06:55 2015 -0500
Committer: Christopher Tubbs 
Committed: Wed Dec 16 14:06:55 2015 -0500

--
 pom.xml | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f02a65d/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 0d2db6e..8b4e129 100644
--- a/pom.xml
+++ b/pom.xml
@@ -608,7 +608,6 @@
   
 ${project.reporting.outputEncoding}
 true
-docs
 ${java.ver}
 -J-Xmx512m

[1/3] accumulo git commit: ACCUMULO-4076 Leave javadocs in default location

2015-12-16 Thread ctubbsii

Repository: accumulo
Updated Branches:
  refs/heads/master c7b27e0ae -> 67560a618


ACCUMULO-4076 Leave javadocs in default location


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

Branch: refs/heads/master
Commit: 4f02a65d54ac52f97b365d012e30dfc9dbeff1c7
Parents: ef8c1ca
Author: Christopher Tubbs 
Authored: Wed Dec 16 14:06:55 2015 -0500
Committer: Christopher Tubbs 
Committed: Wed Dec 16 14:06:55 2015 -0500

--
 pom.xml | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f02a65d/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 0d2db6e..8b4e129 100644
--- a/pom.xml
+++ b/pom.xml
@@ -608,7 +608,6 @@
   
 ${project.reporting.outputEncoding}
 true
-docs
 ${java.ver}
 -J-Xmx512m

[2/3] accumulo git commit: ACCUMULO-4076 Leave javadocs in default location

2015-12-16 Thread ctubbsii

ACCUMULO-4076 Leave javadocs in default location


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

Branch: refs/heads/1.7
Commit: 4f02a65d54ac52f97b365d012e30dfc9dbeff1c7
Parents: ef8c1ca
Author: Christopher Tubbs 
Authored: Wed Dec 16 14:06:55 2015 -0500
Committer: Christopher Tubbs 
Committed: Wed Dec 16 14:06:55 2015 -0500

--
 pom.xml | 1 -
 1 file changed, 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/4f02a65d/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 0d2db6e..8b4e129 100644
--- a/pom.xml
+++ b/pom.xml
@@ -608,7 +608,6 @@
   
 ${project.reporting.outputEncoding}
 true
-docs
 ${java.ver}
 -J-Xmx512m

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

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

Branch: refs/heads/master
Commit: 67560a618bc9f43dca8f8e12de287ca9c40a92c5
Parents: c7b27e0 f51e6b0
Author: Christopher Tubbs 
Authored: Wed Dec 16 14:27:03 2015 -0500
Committer: Christopher Tubbs 
Committed: Wed Dec 16 14:27:03 2015 -0500

--
 pom.xml | 1 -
 1 file changed, 1 deletion(-)
--


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

[01/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

2015-12-16 Thread ecn

Repository: accumulo
Updated Branches:
  refs/heads/master 67560a618 -> 794ec90d5


http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/python/constants.py
--
diff --git a/proxy/src/main/python/constants.py 
b/proxy/src/main/python/constants.py
index aea4826..8139236 100644
--- a/proxy/src/main/python/constants.py
+++ b/proxy/src/main/python/constants.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Autogenerated by Thrift Compiler (0.9.1)
+# Autogenerated by Thrift Compiler (0.9.3)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/python/ttypes.py
--
diff --git a/proxy/src/main/python/ttypes.py b/proxy/src/main/python/ttypes.py
index 9444f71..c224c50 100644
--- a/proxy/src/main/python/ttypes.py
+++ b/proxy/src/main/python/ttypes.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Autogenerated by Thrift Compiler (0.9.1)
+# Autogenerated by Thrift Compiler (0.9.3)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -303,27 +303,27 @@ class Key:
 break
   if fid == 1:
 if ftype == TType.STRING:
-  self.row = iprot.readString();
+  self.row = iprot.readString()
 else:
   iprot.skip(ftype)
   elif fid == 2:
 if ftype == TType.STRING:
-  self.colFamily = iprot.readString();
+  self.colFamily = iprot.readString()
 else:
   iprot.skip(ftype)
   elif fid == 3:
 if ftype == TType.STRING:
-  self.colQualifier = iprot.readString();
+  self.colQualifier = iprot.readString()
 else:
   iprot.skip(ftype)
   elif fid == 4:
 if ftype == TType.STRING:
-  self.colVisibility = iprot.readString();
+  self.colVisibility = iprot.readString()
 else:
   iprot.skip(ftype)
   elif fid == 5:
 if ftype == TType.I64:
-  self.timestamp = iprot.readI64();
+  self.timestamp = iprot.readI64()
 else:
   iprot.skip(ftype)
   else:
@@ -363,6 +363,15 @@ class Key:
 return
 
 
+  def __hash__(self):
+value = 17
+value = (value * 31) ^ hash(self.row)
+value = (value * 31) ^ hash(self.colFamily)
+value = (value * 31) ^ hash(self.colQualifier)
+value = (value * 31) ^ hash(self.colVisibility)
+value = (value * 31) ^ hash(self.timestamp)
+return value
+
   def __repr__(self):
 L = ['%s=%r' % (key, value)
   for key, value in self.__dict__.iteritems()]
@@ -414,32 +423,32 @@ class ColumnUpdate:
 break
   if fid == 1:
 if ftype == TType.STRING:
-  self.colFamily = iprot.readString();
+  self.colFamily = iprot.readString()
 else:
   iprot.skip(ftype)
   elif fid == 2:
 if ftype == TType.STRING:
-  self.colQualifier = iprot.readString();
+  self.colQualifier = iprot.readString()
 else:
   iprot.skip(ftype)
   elif fid == 3:
 if ftype == TType.STRING:
-  self.colVisibility = iprot.readString();
+  self.colVisibility = iprot.readString()
 else:
   iprot.skip(ftype)
   elif fid == 4:
 if ftype == TType.I64:
-  self.timestamp = iprot.readI64();
+  self.timestamp = iprot.readI64()
 else:
   iprot.skip(ftype)
   elif fid == 5:
 if ftype == TType.STRING:
-  self.value = iprot.readString();
+  self.value = iprot.readString()
 else:
   iprot.skip(ftype)
   elif fid == 6:
 if ftype == TType.BOOL:
-  self.deleteCell = iprot.readBool();
+  self.deleteCell = iprot.readBool()
 else:
   iprot.skip(ftype)
   else:
@@ -483,6 +492,16 @@ class ColumnUpdate:
 return
 
 
+  def __hash__(self):
+value = 17
+value = (value * 31) ^ hash(self.colFamily)
+value = (value * 31) ^ hash(self.colQualifier)
+value = (value * 31) ^ hash(self.colVisibility)
+value = (value * 31) ^ hash(self.timestamp)
+value = (value * 31) ^ hash(self.value)
+value = (value * 31) ^ hash(self.deleteCell)
+return value
+
   def __repr__(self):
 L = ['%s=%r' % (key, value)
   for key, value in self.__dict__.iteritems()]
@@ -525,14 +544,14 @@ class DiskUsage:
   self.tables = []
   (_etype3, _size0) = iprot.readListBegin()
   for _i4 in xrange(_size0):
-_elem5 = iprot.readString();
+_elem5 = iprot.readString()
 self.tables.append(_elem5)
   iprot.readListEnd()
 else:
   iprot.skip(ftype)
   elif fi

[14/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

2015-12-16 Thread ecn

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
 
b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
index bf9befb..1b8ed46 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterMonitorInfo.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class 
MasterMonitorInfo implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, 
Comparable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2015-12-16")
+public class MasterMonitorInfo implements 
org.apache.thrift.TBase, 
java.io.Serializable, Cloneable, Comparable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("MasterMonitorInfo");
 
   private static final org.apache.thrift.protocol.TField TABLE_MAP_FIELD_DESC 
= new org.apache.thrift.protocol.TField("tableMap", 
org.apache.thrift.protocol.TType.MAP, (short)1);
@@ -722,7 +725,7 @@ import org.slf4j.LoggerFactory;
   return getGoalState();
 
 case UNASSIGNED_TABLETS:
-  return Integer.valueOf(getUnassignedTablets());
+  return getUnassignedTablets();
 
 case SERVERS_SHUTTING_DOWN:
   return getServersShuttingDown();
@@ -865,7 +868,54 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-return 0;
+List list = new ArrayList();
+
+boolean present_tableMap = true && (isSetTableMap());
+list.add(present_tableMap);
+if (present_tableMap)
+  list.add(tableMap);
+
+boolean present_tServerInfo = true && (isSetTServerInfo());
+list.add(present_tServerInfo);
+if (present_tServerInfo)
+  list.add(tServerInfo);
+
+boolean present_badTServers = true && (isSetBadTServers());
+list.add(present_badTServers);
+if (present_badTServers)
+  list.add(badTServers);
+
+boolean present_state = true && (isSetState());
+list.add(present_state);
+if (present_state)
+  list.add(state.getValue());
+
+boolean present_goalState = true && (isSetGoalState());
+list.add(present_goalState);
+if (present_goalState)
+  list.add(goalState.getValue());
+
+boolean present_unassignedTablets = true;
+list.add(present_unassignedTablets);
+if (present_unassignedTablets)
+  list.add(unassignedTablets);
+
+boolean present_serversShuttingDown = true && (isSetServersShuttingDown());
+list.add(present_serversShuttingDown);
+if (present_serversShuttingDown)
+  list.add(serversShuttingDown);
+
+boolean present_deadTabletServers = true && (isSetDeadTabletServers());
+list.add(present_deadTabletServers);
+if (present_deadTabletServers)
+  list.add(deadTabletServers);
+
+boolean present_bulkImports = true && (isSetBulkImports());
+list.add(present_bulkImports);
+if (present_bulkImports)
+  list.add(bulkImports);
+
+return list.hashCode();
   }
 
   @Override
@@ -1103,14 +1153,14 @@ import org.slf4j.LoggerFactory;
   {
 org.apache.thrift.protocol.TMap _map26 = iprot.readMapBegin();
 struct.tableMap = new HashMap(2*_map26.size);
-for (int _i27 = 0; _i27 < _map26.size; ++_i27)
+String _key27;
+TableInfo _val28;
+for (int _i29 = 0; _i29 < _map26.size; ++_i29)
 {
-  String _key28;
-  TableInfo _val29;
-  _key28 = iprot.readString();
-  _val29 = new TableInfo();
-  _val29.read(iprot);
-  struct.tableMap.put(_key28, _val29);
+  _key27 = iprot.readString();
+  _val28 = new TableInfo();
+  _val28.read(iprot);
+  struct.tableMap.put(_key27, _val28);
 }
 iprot.readMapEnd();
   }
@@ -1124,12 +1174,12 @@ import org.slf4j.LoggerFactory;
   {
 org.apache.thrift.protocol.TList _list30 = 
iprot.readListBegin();
 struct.tServerInfo = new 
ArrayList(_list30.size

[09/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

2015-12-16 Thread ecn

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/cpp/AccumuloProxy.h
--
diff --git a/proxy/src/main/cpp/AccumuloProxy.h 
b/proxy/src/main/cpp/AccumuloProxy.h
index 269884f..a14fda9 100644
--- a/proxy/src/main/cpp/AccumuloProxy.h
+++ b/proxy/src/main/cpp/AccumuloProxy.h
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,10 +24,16 @@
 #define AccumuloProxy_H
 
 #include 
+#include 
 #include "proxy_types.h"
 
 namespace accumulo {
 
+#ifdef _WIN32
+  #pragma warning( push )
+  #pragma warning (disable : 4250 ) //inheriting methods via dominance 
+#endif
+
 class AccumuloProxyIf {
  public:
   virtual ~AccumuloProxyIf() {}
@@ -381,30 +387,27 @@ class AccumuloProxyNull : virtual public AccumuloProxyIf {
 
 typedef struct _AccumuloProxy_login_args__isset {
   _AccumuloProxy_login_args__isset() : principal(false), 
loginProperties(false) {}
-  bool principal;
-  bool loginProperties;
+  bool principal :1;
+  bool loginProperties :1;
 } _AccumuloProxy_login_args__isset;
 
 class AccumuloProxy_login_args {
  public:
 
+  AccumuloProxy_login_args(const AccumuloProxy_login_args&);
+  AccumuloProxy_login_args& operator=(const AccumuloProxy_login_args&);
   AccumuloProxy_login_args() : principal() {
   }
 
-  virtual ~AccumuloProxy_login_args() throw() {}
-
+  virtual ~AccumuloProxy_login_args() throw();
   std::string principal;
   std::map  loginProperties;
 
   _AccumuloProxy_login_args__isset __isset;
 
-  void __set_principal(const std::string& val) {
-principal = val;
-  }
+  void __set_principal(const std::string& val);
 
-  void __set_loginProperties(const std::map & val) {
-loginProperties = val;
-  }
+  void __set_loginProperties(const std::map & val);
 
   bool operator == (const AccumuloProxy_login_args & rhs) const
   {
@@ -430,8 +433,7 @@ class AccumuloProxy_login_pargs {
  public:
 
 
-  virtual ~AccumuloProxy_login_pargs() throw() {}
-
+  virtual ~AccumuloProxy_login_pargs() throw();
   const std::string* principal;
   const std::map * loginProperties;
 
@@ -441,30 +443,27 @@ class AccumuloProxy_login_pargs {
 
 typedef struct _AccumuloProxy_login_result__isset {
   _AccumuloProxy_login_result__isset() : success(false), ouch2(false) {}
-  bool success;
-  bool ouch2;
+  bool success :1;
+  bool ouch2 :1;
 } _AccumuloProxy_login_result__isset;
 
 class AccumuloProxy_login_result {
  public:
 
+  AccumuloProxy_login_result(const AccumuloProxy_login_result&);
+  AccumuloProxy_login_result& operator=(const AccumuloProxy_login_result&);
   AccumuloProxy_login_result() : success() {
   }
 
-  virtual ~AccumuloProxy_login_result() throw() {}
-
+  virtual ~AccumuloProxy_login_result() throw();
   std::string success;
   AccumuloSecurityException ouch2;
 
   _AccumuloProxy_login_result__isset __isset;
 
-  void __set_success(const std::string& val) {
-success = val;
-  }
+  void __set_success(const std::string& val);
 
-  void __set_ouch2(const AccumuloSecurityException& val) {
-ouch2 = val;
-  }
+  void __set_ouch2(const AccumuloSecurityException& val);
 
   bool operator == (const AccumuloProxy_login_result & rhs) const
   {
@@ -487,16 +486,15 @@ class AccumuloProxy_login_result {
 
 typedef struct _AccumuloProxy_login_presult__isset {
   _AccumuloProxy_login_presult__isset() : success(false), ouch2(false) {}
-  bool success;
-  bool ouch2;
+  bool success :1;
+  bool ouch2 :1;
 } _AccumuloProxy_login_presult__isset;
 
 class AccumuloProxy_login_presult {
  public:
 
 
-  virtual ~AccumuloProxy_login_presult() throw() {}
-
+  virtual ~AccumuloProxy_login_presult() throw();
   std::string* success;
   AccumuloSecurityException ouch2;
 
@@ -508,36 +506,31 @@ class AccumuloProxy_login_presult {
 
 typedef struct _AccumuloProxy_addConstraint_args__isset {
   _AccumuloProxy_addConstraint_args__isset() : login(false), tableName(false), 
constraintClassName(false) {}
-  bool login;
-  bool tableName;
-  bool constraintClassName;
+  bool login :1;
+  bool tableName :1;
+  bool constraintClassName :1;
 } _AccumuloProxy_addConstraint_args__isset;
 
 class AccumuloProxy_addConstraint_args {
  public:
 
+  AccumuloProxy_addConstraint_args(const AccumuloProxy_addConstraint_args&);
+  AccumuloProxy_addConstraint_args& operator=(const 
AccumuloProxy_addConstraint_args&);
   AccumuloProxy_addConstraint_args() : login(), tableName(), 
constraintClassName() {
   }
 
-  virtual ~AccumuloProxy_addConstraint_args() throw() {}
-
+  virtual ~AccumuloProxy_addConstraint_args() throw();
   std::string login;
   std::string tableName;
   std::string constraintClassName;
 
   _AccumuloProxy_addConstraint_args__isset __isset;
 
-  void __set_login(const std::string& val) {
-login = val;
-  }
+  void __set_login(const std::string

[05/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

2015-12-16 Thread ecn

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/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 eaa49ef..eb848c8 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class 
AccumuloProxy {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2015-12-16")
+public class AccumuloProxy {
 
   public interface Iface {
 
@@ -2492,7 +2495,7 @@ import org.slf4j.LoggerFactory;
   update_args args = new update_args();
   args.setWriter(writer);
   args.setCells(cells);
-  sendBase("update", args);
+  sendBaseOneway("update", args);
 }
 
 public void flush(String writer) throws UnknownWriter, 
MutationsRejectedException, org.apache.thrift.TException
@@ -5317,7 +5320,7 @@ import org.slf4j.LoggerFactory;
   }
 
   public void write_args(org.apache.thrift.protocol.TProtocol prot) throws 
org.apache.thrift.TException {
-prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("update", 
org.apache.thrift.protocol.TMessageType.CALL, 0));
+prot.writeMessageBegin(new 
org.apache.thrift.protocol.TMessage("update", 
org.apache.thrift.protocol.TMessageType.ONEWAY, 0));
 update_args args = new update_args();
 args.setWriter(writer);
 args.setCells(cells);
@@ -12975,7 +12978,19 @@ import org.slf4j.LoggerFactory;
 
 @Override
 public int hashCode() {
-  return 0;
+  List list = new ArrayList();
+
+  boolean present_principal = true && (isSetPrincipal());
+  list.add(present_principal);
+  if (present_principal)
+list.add(principal);
+
+  boolean present_loginProperties = true && (isSetLoginProperties());
+  list.add(present_loginProperties);
+  if (present_loginProperties)
+list.add(loginProperties);
+
+  return list.hashCode();
 }
 
 @Override
@@ -13097,13 +13112,13 @@ import org.slf4j.LoggerFactory;
 {
   org.apache.thrift.protocol.TMap _map164 = 
iprot.readMapBegin();
   struct.loginProperties = new 
HashMap(2*_map164.size);
-  for (int _i165 = 0; _i165 < _map164.size; ++_i165)
+  String _key165;
+  String _val166;
+  for (int _i167 = 0; _i167 < _map164.size; ++_i167)
   {
-String _key166;
-String _val167;
-_key166 = iprot.readString();
-_val167 = iprot.readString();
-struct.loginProperties.put(_key166, _val167);
+_key165 = iprot.readString();
+_val166 = iprot.readString();
+struct.loginProperties.put(_key165, _val166);
   }
   iprot.readMapEnd();
 }
@@ -13197,13 +13212,13 @@ import org.slf4j.LoggerFactory;
   {
 org.apache.thrift.protocol.TMap _map170 = new 
org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, 
org.apache.thrift.protocol.TType.STRING, iprot.readI32());
 struct.loginProperties = new 
HashMap(2*_map170.size);
-for (int _i171 = 0; _i171 < _map170.size; ++_i171)
+String _key171;
+String _val172;
+for (int _i173 = 0; _i173 < _map170.size; ++_i173)
 {
-  String _key172;
-  String _val173;
-  _key172 = iprot.readString();
-  _val173 = iprot.readString();
-  struct.loginProperties.put(_key172, _val173);
+  _key171 = iprot.readString();
+  _val172 = iprot.readString();
+  struct.loginProperties.put(_key171, _val172);
 }
   }
   struct.setLoginPropertiesIsSet(true);
@@ -13309,7 +13324,7 @@ import org.slf4j.LoggerFactory;
   AccumuloSecurityException ouch2)
 {
   this();
-  this.success = success;
+  this.success = org.apache.thrift.TBaseHelper.copyBinary(success);
   this.ouch2 = ouc

[06/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

2015-12-16 Thread ecn

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/cpp/proxy_types.h
--
diff --git a/proxy/src/main/cpp/proxy_types.h b/proxy/src/main/cpp/proxy_types.h
index 569de88..f7cce4c 100644
--- a/proxy/src/main/cpp/proxy_types.h
+++ b/proxy/src/main/cpp/proxy_types.h
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,6 +23,8 @@
 #ifndef proxy_TYPES_H
 #define proxy_TYPES_H
 
+#include 
+
 #include 
 #include 
 #include 
@@ -159,26 +161,80 @@ struct TimeType {
 
 extern const std::map _TimeType_VALUES_TO_NAMES;
 
+class Key;
+
+class ColumnUpdate;
+
+class DiskUsage;
+
+class KeyValue;
+
+class ScanResult;
+
+class Range;
+
+class ScanColumn;
+
+class IteratorSetting;
+
+class ScanOptions;
+
+class BatchScanOptions;
+
+class KeyValueAndPeek;
+
+class KeyExtent;
+
+class Column;
+
+class Condition;
+
+class ConditionalUpdates;
+
+class ConditionalWriterOptions;
+
+class ActiveScan;
+
+class ActiveCompaction;
+
+class WriterOptions;
+
+class CompactionStrategyConfig;
+
+class UnknownScanner;
+
+class UnknownWriter;
+
+class NoMoreEntriesException;
+
+class AccumuloException;
+
+class AccumuloSecurityException;
+
+class TableNotFoundException;
+
+class TableExistsException;
+
+class MutationsRejectedException;
+
 typedef struct _Key__isset {
   _Key__isset() : row(false), colFamily(false), colQualifier(false), 
colVisibility(false), timestamp(true) {}
-  bool row;
-  bool colFamily;
-  bool colQualifier;
-  bool colVisibility;
-  bool timestamp;
+  bool row :1;
+  bool colFamily :1;
+  bool colQualifier :1;
+  bool colVisibility :1;
+  bool timestamp :1;
 } _Key__isset;
 
 class Key {
  public:
 
-  static const char* ascii_fingerprint; // = 
"91151A432E03F5E8564877B5194B48E2";
-  static const uint8_t binary_fingerprint[16]; // = 
{0x91,0x15,0x1A,0x43,0x2E,0x03,0xF5,0xE8,0x56,0x48,0x77,0xB5,0x19,0x4B,0x48,0xE2};
-
+  Key(const Key&);
+  Key& operator=(const Key&);
   Key() : row(), colFamily(), colQualifier(), colVisibility(), 
timestamp(9223372036854775807LL) {
   }
 
-  virtual ~Key() throw() {}
-
+  virtual ~Key() throw();
   std::string row;
   std::string colFamily;
   std::string colQualifier;
@@ -187,26 +243,15 @@ class Key {
 
   _Key__isset __isset;
 
-  void __set_row(const std::string& val) {
-row = val;
-  }
+  void __set_row(const std::string& val);
 
-  void __set_colFamily(const std::string& val) {
-colFamily = val;
-  }
+  void __set_colFamily(const std::string& val);
 
-  void __set_colQualifier(const std::string& val) {
-colQualifier = val;
-  }
+  void __set_colQualifier(const std::string& val);
 
-  void __set_colVisibility(const std::string& val) {
-colVisibility = val;
-  }
+  void __set_colVisibility(const std::string& val);
 
-  void __set_timestamp(const int64_t val) {
-timestamp = val;
-__isset.timestamp = true;
-  }
+  void __set_timestamp(const int64_t val);
 
   bool operator == (const Key & rhs) const
   {
@@ -233,31 +278,36 @@ class Key {
   uint32_t read(::apache::thrift::protocol::TProtocol* iprot);
   uint32_t write(::apache::thrift::protocol::TProtocol* oprot) const;
 
+  virtual void printTo(std::ostream& out) const;
 };
 
 void swap(Key &a, Key &b);
 
+inline std::ostream& operator<<(std::ostream& out, const Key& obj)
+{
+  obj.printTo(out);
+  return out;
+}
+
 typedef struct _ColumnUpdate__isset {
   _ColumnUpdate__isset() : colFamily(false), colQualifier(false), 
colVisibility(false), timestamp(false), value(false), deleteCell(false) {}
-  bool colFamily;
-  bool colQualifier;
-  bool colVisibility;
-  bool timestamp;
-  bool value;
-  bool deleteCell;
+  bool colFamily :1;
+  bool colQualifier :1;
+  bool colVisibility :1;
+  bool timestamp :1;
+  bool value :1;
+  bool deleteCell :1;
 } _ColumnUpdate__isset;
 
 class ColumnUpdate {
  public:
 
-  static const char* ascii_fingerprint; // = 
"65CC1863F7DDC1DE75B9EAF9E2DC0D1F";
-  static const uint8_t binary_fingerprint[16]; // = 
{0x65,0xCC,0x18,0x63,0xF7,0xDD,0xC1,0xDE,0x75,0xB9,0xEA,0xF9,0xE2,0xDC,0x0D,0x1F};
-
+  ColumnUpdate(const ColumnUpdate&);
+  ColumnUpdate& operator=(const ColumnUpdate&);
   ColumnUpdate() : colFamily(), colQualifier(), colVisibility(), timestamp(0), 
value(), deleteCell(0) {
   }
 
-  virtual ~ColumnUpdate() throw() {}
-
+  virtual ~ColumnUpdate() throw();
   std::string colFamily;
   std::string colQualifier;
   std::string colVisibility;
@@ -267,33 +317,17 @@ class ColumnUpdate {
 
   _ColumnUpdate__isset __isset;
 
-  void __set_colFamily(const std::string& val) {
-colFamily = val;
-  }
+  void __set_colFamily(const std::string& val);
 
-  void __set_colQualifier(const std::string& val) {
-colQualifier = val;
-  }
+  void __set_colQualifier(const std::string& val);
 
-  void __se

[18/18] accumulo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo

2015-12-16 Thread ecn

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


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

Branch: refs/heads/master
Commit: 794ec90d5052dd1235c33765b64a1aa40f01d8d8
Parents: 3af75fc 67560a6
Author: Eric C. Newton 
Authored: Wed Dec 16 16:09:08 2015 -0500
Committer: Eric C. Newton 
Committed: Wed Dec 16 16:09:08 2015 -0500

--
 pom.xml | 1 -
 1 file changed, 1 deletion(-)
--


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

[07/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

2015-12-16 Thread ecn

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/cpp/proxy_types.cpp
--
diff --git a/proxy/src/main/cpp/proxy_types.cpp 
b/proxy/src/main/cpp/proxy_types.cpp
index a055b48..8c443e0 100644
--- a/proxy/src/main/cpp/proxy_types.cpp
+++ b/proxy/src/main/cpp/proxy_types.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,6 +23,9 @@
 #include "proxy_types.h"
 
 #include 
+#include 
+
+#include 
 
 namespace accumulo {
 
@@ -190,11 +193,35 @@ const char* _kTimeTypeNames[] = {
 };
 const std::map 
_TimeType_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(2, _kTimeTypeValues, 
_kTimeTypeNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
-const char* Key::ascii_fingerprint = "91151A432E03F5E8564877B5194B48E2";
-const uint8_t Key::binary_fingerprint[16] = 
{0x91,0x15,0x1A,0x43,0x2E,0x03,0xF5,0xE8,0x56,0x48,0x77,0xB5,0x19,0x4B,0x48,0xE2};
+
+Key::~Key() throw() {
+}
+
+
+void Key::__set_row(const std::string& val) {
+  this->row = val;
+}
+
+void Key::__set_colFamily(const std::string& val) {
+  this->colFamily = val;
+}
+
+void Key::__set_colQualifier(const std::string& val) {
+  this->colQualifier = val;
+}
+
+void Key::__set_colVisibility(const std::string& val) {
+  this->colVisibility = val;
+}
+
+void Key::__set_timestamp(const int64_t val) {
+  this->timestamp = val;
+__isset.timestamp = true;
+}
 
 uint32_t Key::read(::apache::thrift::protocol::TProtocol* iprot) {
 
+  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -267,6 +294,7 @@ uint32_t Key::read(::apache::thrift::protocol::TProtocol* 
iprot) {
 
 uint32_t Key::write(::apache::thrift::protocol::TProtocol* oprot) const {
   uint32_t xfer = 0;
+  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("Key");
 
   xfer += oprot->writeFieldBegin("row", ::apache::thrift::protocol::T_STRING, 
1);
@@ -305,11 +333,70 @@ void swap(Key &a, Key &b) {
   swap(a.__isset, b.__isset);
 }
 
-const char* ColumnUpdate::ascii_fingerprint = 
"65CC1863F7DDC1DE75B9EAF9E2DC0D1F";
-const uint8_t ColumnUpdate::binary_fingerprint[16] = 
{0x65,0xCC,0x18,0x63,0xF7,0xDD,0xC1,0xDE,0x75,0xB9,0xEA,0xF9,0xE2,0xDC,0x0D,0x1F};
+Key::Key(const Key& other0) {
+  row = other0.row;
+  colFamily = other0.colFamily;
+  colQualifier = other0.colQualifier;
+  colVisibility = other0.colVisibility;
+  timestamp = other0.timestamp;
+  __isset = other0.__isset;
+}
+Key& Key::operator=(const Key& other1) {
+  row = other1.row;
+  colFamily = other1.colFamily;
+  colQualifier = other1.colQualifier;
+  colVisibility = other1.colVisibility;
+  timestamp = other1.timestamp;
+  __isset = other1.__isset;
+  return *this;
+}
+void Key::printTo(std::ostream& out) const {
+  using ::apache::thrift::to_string;
+  out << "Key(";
+  out << "row=" << to_string(row);
+  out << ", " << "colFamily=" << to_string(colFamily);
+  out << ", " << "colQualifier=" << to_string(colQualifier);
+  out << ", " << "colVisibility=" << to_string(colVisibility);
+  out << ", " << "timestamp="; (__isset.timestamp ? (out << 
to_string(timestamp)) : (out << ""));
+  out << ")";
+}
+
+
+ColumnUpdate::~ColumnUpdate() throw() {
+}
+
+
+void ColumnUpdate::__set_colFamily(const std::string& val) {
+  this->colFamily = val;
+}
+
+void ColumnUpdate::__set_colQualifier(const std::string& val) {
+  this->colQualifier = val;
+}
+
+void ColumnUpdate::__set_colVisibility(const std::string& val) {
+  this->colVisibility = val;
+__isset.colVisibility = true;
+}
+
+void ColumnUpdate::__set_timestamp(const int64_t val) {
+  this->timestamp = val;
+__isset.timestamp = true;
+}
+
+void ColumnUpdate::__set_value(const std::string& val) {
+  this->value = val;
+__isset.value = true;
+}
+
+void ColumnUpdate::__set_deleteCell(const bool val) {
+  this->deleteCell = val;
+__isset.deleteCell = true;
+}
 
 uint32_t ColumnUpdate::read(::apache::thrift::protocol::TProtocol* iprot) {
 
+  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -390,6 +477,7 @@ uint32_t 
ColumnUpdate::read(::apache::thrift::protocol::TProtocol* iprot) {
 
 uint32_t ColumnUpdate::write(::apache::thrift::protocol::TProtocol* oprot) 
const {
   uint32_t xfer = 0;
+  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("ColumnUpdate");
 
   xfer += oprot->writeFieldBegin("colFamily", 
::apache::thrift::protocol::T_STRING, 1);
@@ -436,11 +524,53 @@ void swap(ColumnUpdate &a, ColumnUpdate &b) {
   swap(a.__isset, b.__isset);
 }
 
-const char* DiskUsage::ascii_fingerprint = "D26F4F5E2867

[15/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

2015-12-16 Thread ecn

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java 
b/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
index 58f2f02..865b3e5 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/UpdateErrors.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class 
UpdateErrors implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, 
Comparable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2015-12-16")
+public class UpdateErrors implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, 
Comparable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("UpdateErrors");
 
   private static final org.apache.thrift.protocol.TField 
FAILED_EXTENTS_FIELD_DESC = new 
org.apache.thrift.protocol.TField("failedExtents", 
org.apache.thrift.protocol.TType.MAP, (short)1);
@@ -431,7 +434,24 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-return 0;
+List list = new ArrayList();
+
+boolean present_failedExtents = true && (isSetFailedExtents());
+list.add(present_failedExtents);
+if (present_failedExtents)
+  list.add(failedExtents);
+
+boolean present_violationSummaries = true && (isSetViolationSummaries());
+list.add(present_violationSummaries);
+if (present_violationSummaries)
+  list.add(violationSummaries);
+
+boolean present_authorizationFailures = true && 
(isSetAuthorizationFailures());
+list.add(present_authorizationFailures);
+if (present_authorizationFailures)
+  list.add(authorizationFailures);
+
+return list.hashCode();
   }
 
   @Override
@@ -563,14 +583,14 @@ import org.slf4j.LoggerFactory;
   {
 org.apache.thrift.protocol.TMap _map58 = iprot.readMapBegin();
 struct.failedExtents = new 
HashMap(2*_map58.size);
-for (int _i59 = 0; _i59 < _map58.size; ++_i59)
+TKeyExtent _key59;
+long _val60;
+for (int _i61 = 0; _i61 < _map58.size; ++_i61)
 {
-  TKeyExtent _key60;
-  long _val61;
-  _key60 = new TKeyExtent();
-  _key60.read(iprot);
-  _val61 = iprot.readI64();
-  struct.failedExtents.put(_key60, _val61);
+  _key59 = new TKeyExtent();
+  _key59.read(iprot);
+  _val60 = iprot.readI64();
+  struct.failedExtents.put(_key59, _val60);
 }
 iprot.readMapEnd();
   }
@@ -584,12 +604,12 @@ import org.slf4j.LoggerFactory;
   {
 org.apache.thrift.protocol.TList _list62 = 
iprot.readListBegin();
 struct.violationSummaries = new 
ArrayList(_list62.size);
-for (int _i63 = 0; _i63 < _list62.size; ++_i63)
+TConstraintViolationSummary _elem63;
+for (int _i64 = 0; _i64 < _list62.size; ++_i64)
 {
-  TConstraintViolationSummary _elem64;
-  _elem64 = new TConstraintViolationSummary();
-  _elem64.read(iprot);
-  struct.violationSummaries.add(_elem64);
+  _elem63 = new TConstraintViolationSummary();
+  _elem63.read(iprot);
+  struct.violationSummaries.add(_elem63);
 }
 iprot.readListEnd();
   }
@@ -603,14 +623,14 @@ import org.slf4j.LoggerFactory;
   {
 org.apache.thrift.protocol.TMap _map65 = iprot.readMapBegin();
 struct.authorizationFailures = new 
HashMap(2*_map65.size);
-for (int _i66 = 0; _i66 < _map65.size; ++_i66)
+TKeyExtent _key66;
+org.apache.accumulo.core.client.impl.thrift.SecurityErrorCode 
_val67;
+for (int _i68 = 0; _i68 < _map65.size; ++_i68)
 {
-  TKeyExtent _key67;
-  
org.apache.a

[16/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

2015-12-16 Thread ecn

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java
 
b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java
index c4af921..4848920 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ThriftTest.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class 
ThriftTest {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2015-12-16")
+public class ThriftTest {
 
   public interface Iface {
 
@@ -663,7 +666,9 @@ import org.slf4j.LoggerFactory;
 
 @Override
 public int hashCode() {
-  return 0;
+  List list = new ArrayList();
+
+  return list.hashCode();
 }
 
 @Override
@@ -930,7 +935,7 @@ import org.slf4j.LoggerFactory;
 public Object getFieldValue(_Fields field) {
   switch (field) {
   case SUCCESS:
-return Boolean.valueOf(isSuccess());
+return isSuccess();
 
   }
   throw new IllegalStateException();
@@ -976,7 +981,14 @@ import org.slf4j.LoggerFactory;
 
 @Override
 public int hashCode() {
-  return 0;
+  List list = new ArrayList();
+
+  boolean present_success = true;
+  list.add(present_success);
+  if (present_success)
+list.add(success);
+
+  return list.hashCode();
 }
 
 @Override
@@ -1263,7 +1275,9 @@ import org.slf4j.LoggerFactory;
 
 @Override
 public int hashCode() {
-  return 0;
+  List list = new ArrayList();
+
+  return list.hashCode();
 }
 
 @Override
@@ -1530,7 +1544,7 @@ import org.slf4j.LoggerFactory;
 public Object getFieldValue(_Fields field) {
   switch (field) {
   case SUCCESS:
-return Boolean.valueOf(isSuccess());
+return isSuccess();
 
   }
   throw new IllegalStateException();
@@ -1576,7 +1590,14 @@ import org.slf4j.LoggerFactory;
 
 @Override
 public int hashCode() {
-  return 0;
+  List list = new ArrayList();
+
+  boolean present_success = true;
+  list.add(present_success);
+  if (present_success)
+list.add(success);
+
+  return list.hashCode();
 }
 
 @Override
@@ -1863,7 +1884,9 @@ import org.slf4j.LoggerFactory;
 
 @Override
 public int hashCode() {
-  return 0;
+  List list = new ArrayList();
+
+  return list.hashCode();
 }
 
 @Override
@@ -2175,7 +2198,7 @@ import org.slf4j.LoggerFactory;
 public Object getFieldValue(_Fields field) {
   switch (field) {
   case SUCCESS:
-return Boolean.valueOf(isSuccess());
+return isSuccess();
 
   case EX:
 return getEx();
@@ -2235,7 +2258,19 @@ import org.slf4j.LoggerFactory;
 
 @Override
 public int hashCode() {
-  return 0;
+  List list = new ArrayList();
+
+  boolean present_success = true;
+  list.add(present_success);
+  if (present_success)
+list.add(success);
+
+  boolean present_ex = true && (isSetEx());
+  list.add(present_ex);
+  if (present_ex)
+list.add(ex);
+
+  return list.hashCode();
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java 
b/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java
index d124c14..558cc86 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/data/thrift/InitialMultiScan.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import or

[17/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

2015-12-16 Thread ecn

ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler


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

Branch: refs/heads/master
Commit: 3af75fc685d6e2a90a9f68c204122a87ac90e781
Parents: c7b27e0
Author: Eric C. Newton 
Authored: Wed Dec 16 16:08:33 2015 -0500
Committer: Eric C. Newton 
Committed: Wed Dec 16 16:08:33 2015 -0500

--
 .../core/client/impl/thrift/ClientService.java  |  1278 +-
 .../client/impl/thrift/ConfigurationType.java   | 2 +-
 .../client/impl/thrift/SecurityErrorCode.java   | 2 +-
 .../core/client/impl/thrift/TDiskUsage.java |39 +-
 .../core/client/impl/thrift/TableOperation.java | 2 +-
 .../thrift/TableOperationExceptionType.java | 2 +-
 .../impl/thrift/ThriftSecurityException.java|25 +-
 .../thrift/ThriftTableOperationException.java   |44 +-
 .../core/client/impl/thrift/ThriftTest.java |57 +-
 .../core/data/thrift/InitialMultiScan.java  |23 +-
 .../accumulo/core/data/thrift/InitialScan.java  |23 +-
 .../accumulo/core/data/thrift/IterInfo.java |28 +-
 .../accumulo/core/data/thrift/MapFileInfo.java  |18 +-
 .../core/data/thrift/MultiScanResult.java   |   138 +-
 .../accumulo/core/data/thrift/ScanResult.java   |43 +-
 .../accumulo/core/data/thrift/TCMResult.java|27 +-
 .../accumulo/core/data/thrift/TCMStatus.java| 2 +-
 .../accumulo/core/data/thrift/TColumn.java  |53 +-
 .../accumulo/core/data/thrift/TCondition.java   |95 +-
 .../core/data/thrift/TConditionalMutation.java  |48 +-
 .../core/data/thrift/TConditionalSession.java   |30 +-
 .../thrift/TConstraintViolationSummary.java |35 +-
 .../apache/accumulo/core/data/thrift/TKey.java  |74 +-
 .../accumulo/core/data/thrift/TKeyExtent.java   |53 +-
 .../accumulo/core/data/thrift/TKeyValue.java|30 +-
 .../accumulo/core/data/thrift/TMutation.java|92 +-
 .../accumulo/core/data/thrift/TRange.java   |49 +-
 .../accumulo/core/data/thrift/UpdateErrors.java |   102 +-
 .../core/gc/thrift/GCMonitorService.java|35 +-
 .../accumulo/core/gc/thrift/GCStatus.java   |31 +-
 .../accumulo/core/gc/thrift/GcCycleStats.java   |53 +-
 .../core/master/thrift/BulkImportState.java | 2 +-
 .../core/master/thrift/BulkImportStatus.java|32 +-
 .../accumulo/core/master/thrift/Compacting.java |25 +-
 .../accumulo/core/master/thrift/DeadServer.java |28 +-
 .../core/master/thrift/FateOperation.java   | 2 +-
 .../core/master/thrift/FateService.java |   210 +-
 .../core/master/thrift/MasterClientService.java |   676 +-
 .../core/master/thrift/MasterGoalState.java | 2 +-
 .../core/master/thrift/MasterMonitorInfo.java   |   194 +-
 .../core/master/thrift/MasterState.java | 2 +-
 .../core/master/thrift/RecoveryException.java   |16 +-
 .../core/master/thrift/RecoveryStatus.java  |30 +-
 .../accumulo/core/master/thrift/TableInfo.java  |89 +-
 .../core/master/thrift/TabletLoadState.java | 2 +-
 .../core/master/thrift/TabletServerStatus.java  |   169 +-
 .../core/master/thrift/TabletSplit.java |41 +-
 .../core/replication/thrift/KeyValues.java  |36 +-
 .../thrift/RemoteReplicationErrorCode.java  | 2 +-
 .../thrift/RemoteReplicationException.java  |25 +-
 .../thrift/ReplicationCoordinator.java  |35 +-
 .../thrift/ReplicationCoordinatorErrorCode.java | 2 +-
 .../thrift/ReplicationCoordinatorException.java |25 +-
 .../replication/thrift/ReplicationServicer.java |77 +-
 .../core/replication/thrift/WalEdits.java   |34 +-
 .../security/thrift/TAuthenticationKey.java |48 +-
 .../thrift/TAuthenticationTokenIdentifier.java  |44 +-
 .../core/security/thrift/TCredentials.java  |40 +-
 .../core/security/thrift/TDelegationToken.java  |30 +-
 .../security/thrift/TDelegationTokenConfig.java |20 +-
 .../core/tabletserver/thrift/ActionStats.java   |67 +-
 .../tabletserver/thrift/ActiveCompaction.java   |   164 +-
 .../core/tabletserver/thrift/ActiveScan.java|   203 +-
 .../tabletserver/thrift/CompactionReason.java   | 2 +-
 .../tabletserver/thrift/CompactionType.java | 2 +-
 .../thrift/ConstraintViolationException.java|36 +-
 .../tabletserver/thrift/IteratorConfig.java |36 +-
 .../thrift/NoSuchScanIDException.java   |11 +-
 .../thrift/NotServingTabletException.java   |16 +-
 .../core/tabletserver/thrift/ScanState.java | 2 +-
 .../core/tabletserver/thrift/ScanType.java  | 2 +-
 .../core/tabletserver/thrift/TDurability.java   | 2 +-
 .../tabletserver/thrift/TIteratorSetti

[04/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

2015-12-16 Thread ecn

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java
 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java
index 28b1e6c..a3f9a06 100644
--- 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java
+++ 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/AccumuloSecurityException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class 
AccumuloSecurityException extends TException implements 
org.apache.thrift.TBase, java.io.Serializable, Cloneable, 
Comparable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2015-12-16")
+public class AccumuloSecurityException extends TException implements 
org.apache.thrift.TBase, java.io.Serializable, Cloneable, 
Comparable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("AccumuloSecurityException");
 
   private static final org.apache.thrift.protocol.TField MSG_FIELD_DESC = new 
org.apache.thrift.protocol.TField("msg", 
org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -243,7 +246,14 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-return 0;
+List list = new ArrayList();
+
+boolean present_msg = true && (isSetMsg());
+list.add(present_msg);
+if (present_msg)
+  list.add(msg);
+
+return list.hashCode();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java
index 58e1321..40f3435 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ActiveCompaction.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class 
ActiveCompaction implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, 
Comparable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2015-12-16")
+public class ActiveCompaction implements 
org.apache.thrift.TBase, 
java.io.Serializable, Cloneable, Comparable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("ActiveCompaction");
 
   private static final org.apache.thrift.protocol.TField EXTENT_FIELD_DESC = 
new org.apache.thrift.protocol.TField("extent", 
org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -676,7 +679,7 @@ import org.slf4j.LoggerFactory;
   return getExtent();
 
 case AGE:
-  return Long.valueOf(getAge());
+  return getAge();
 
 case INPUT_FILES:
   return getInputFiles();
@@ -694,10 +697,10 @@ import org.slf4j.LoggerFactory;
   return getLocalityGroup();
 
 case ENTRIES_READ:
-  return Long.valueOf(getEntriesRead());
+  return getEntriesRead();
 
 case ENTRIES_WRITTEN:
-  return Long.valueOf(getEntriesWritten());
+  return getEntriesWritten();
 
 case ITERATORS:
   return getIterators();
@@ -845,7 +848,59 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-return 0;
+List list = new ArrayList();
+
+boolean present_extent = true && (isSetExtent());
+list.add(present_extent);
+if (present_extent)
+  list.add(extent);
+
+boolean present_age = true;
+list.add(present_age);
+if (present_age)
+  list.add(a

[08/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

2015-12-16 Thread ecn

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/cpp/proxy_constants.cpp
--
diff --git a/proxy/src/main/cpp/proxy_constants.cpp 
b/proxy/src/main/cpp/proxy_constants.cpp
index 39a574e..d177867 100644
--- a/proxy/src/main/cpp/proxy_constants.cpp
+++ b/proxy/src/main/cpp/proxy_constants.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/cpp/proxy_constants.h
--
diff --git a/proxy/src/main/cpp/proxy_constants.h 
b/proxy/src/main/cpp/proxy_constants.h
index 8f789c6..c2d6fd6 100644
--- a/proxy/src/main/cpp/proxy_constants.h
+++ b/proxy/src/main/cpp/proxy_constants.h
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated

[02/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

2015-12-16 Thread ecn

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/python/AccumuloProxy.py
--
diff --git a/proxy/src/main/python/AccumuloProxy.py 
b/proxy/src/main/python/AccumuloProxy.py
index 2805fff..83c216c 100644
--- a/proxy/src/main/python/AccumuloProxy.py
+++ b/proxy/src/main/python/AccumuloProxy.py
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Autogenerated by Thrift Compiler (0.9.1)
+# Autogenerated by Thrift Compiler (0.9.3)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -21,6 +21,7 @@
 #
 
 from thrift.Thrift import TType, TMessageType, TException, 
TApplicationException
+import logging
 from ttypes import *
 from thrift.Thrift import TProcessor
 from thrift.transport import TTransport
@@ -736,20 +737,21 @@ class Client(Iface):
 self._oprot.trans.flush()
 
   def recv_login(self):
-(fname, mtype, rseqid) = self._iprot.readMessageBegin()
+iprot = self._iprot
+(fname, mtype, rseqid) = iprot.readMessageBegin()
 if mtype == TMessageType.EXCEPTION:
   x = TApplicationException()
-  x.read(self._iprot)
-  self._iprot.readMessageEnd()
+  x.read(iprot)
+  iprot.readMessageEnd()
   raise x
 result = login_result()
-result.read(self._iprot)
-self._iprot.readMessageEnd()
+result.read(iprot)
+iprot.readMessageEnd()
 if result.success is not None:
   return result.success
 if result.ouch2 is not None:
   raise result.ouch2
-raise TApplicationException(TApplicationException.MISSING_RESULT, "login 
failed: unknown result");
+raise TApplicationException(TApplicationException.MISSING_RESULT, "login 
failed: unknown result")
 
   def addConstraint(self, login, tableName, constraintClassName):
 """
@@ -772,15 +774,16 @@ class Client(Iface):
 self._oprot.trans.flush()
 
   def recv_addConstraint(self):
-(fname, mtype, rseqid) = self._iprot.readMessageBegin()
+iprot = self._iprot
+(fname, mtype, rseqid) = iprot.readMessageBegin()
 if mtype == TMessageType.EXCEPTION:
   x = TApplicationException()
-  x.read(self._iprot)
-  self._iprot.readMessageEnd()
+  x.read(iprot)
+  iprot.readMessageEnd()
   raise x
 result = addConstraint_result()
-result.read(self._iprot)
-self._iprot.readMessageEnd()
+result.read(iprot)
+iprot.readMessageEnd()
 if result.success is not None:
   return result.success
 if result.ouch1 is not None:
@@ -789,7 +792,7 @@ class Client(Iface):
   raise result.ouch2
 if result.ouch3 is not None:
   raise result.ouch3
-raise TApplicationException(TApplicationException.MISSING_RESULT, 
"addConstraint failed: unknown result");
+raise TApplicationException(TApplicationException.MISSING_RESULT, 
"addConstraint failed: unknown result")
 
   def addSplits(self, login, tableName, splits):
 """
@@ -812,15 +815,16 @@ class Client(Iface):
 self._oprot.trans.flush()
 
   def recv_addSplits(self):
-(fname, mtype, rseqid) = self._iprot.readMessageBegin()
+iprot = self._iprot
+(fname, mtype, rseqid) = iprot.readMessageBegin()
 if mtype == TMessageType.EXCEPTION:
   x = TApplicationException()
-  x.read(self._iprot)
-  self._iprot.readMessageEnd()
+  x.read(iprot)
+  iprot.readMessageEnd()
   raise x
 result = addSplits_result()
-result.read(self._iprot)
-self._iprot.readMessageEnd()
+result.read(iprot)
+iprot.readMessageEnd()
 if result.ouch1 is not None:
   raise result.ouch1
 if result.ouch2 is not None:
@@ -852,15 +856,16 @@ class Client(Iface):
 self._oprot.trans.flush()
 
   def recv_attachIterator(self):
-(fname, mtype, rseqid) = self._iprot.readMessageBegin()
+iprot = self._iprot
+(fname, mtype, rseqid) = iprot.readMessageBegin()
 if mtype == TMessageType.EXCEPTION:
   x = TApplicationException()
-  x.read(self._iprot)
-  self._iprot.readMessageEnd()
+  x.read(iprot)
+  iprot.readMessageEnd()
   raise x
 result = attachIterator_result()
-result.read(self._iprot)
-self._iprot.readMessageEnd()
+result.read(iprot)
+iprot.readMessageEnd()
 if result.ouch1 is not None:
   raise result.ouch1
 if result.ouch2 is not None:
@@ -892,15 +897,16 @@ class Client(Iface):
 self._oprot.trans.flush()
 
   def recv_checkIteratorConflicts(self):
-(fname, mtype, rseqid) = self._iprot.readMessageBegin()
+iprot = self._iprot
+(fname, mtype, rseqid) = iprot.readMessageBegin()
 if mtype == TMessageType.EXCEPTION:
   x = TApplicationException()
-  x.read(self._iprot)
-  self._iprot.readMessageEnd()
+  x.read(iprot)
+  iprot.readMessageEnd()
   raise x
 result = checkIteratorConflicts_result()
-result.read(self._iprot)
-self._iprot.readMessageEnd()
+r

[03/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

2015-12-16 Thread ecn

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java
index 1136284..d734fc6 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyExtent.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class 
KeyExtent implements org.apache.thrift.TBase, 
java.io.Serializable, Cloneable, Comparable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2015-12-16")
+public class KeyExtent implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("KeyExtent");
 
   private static final org.apache.thrift.protocol.TField TABLE_ID_FIELD_DESC = 
new org.apache.thrift.protocol.TField("tableId", 
org.apache.thrift.protocol.TType.STRING, (short)1);
@@ -153,8 +156,8 @@ import org.slf4j.LoggerFactory;
   {
 this();
 this.tableId = tableId;
-this.endRow = endRow;
-this.prevEndRow = prevEndRow;
+this.endRow = org.apache.thrift.TBaseHelper.copyBinary(endRow);
+this.prevEndRow = org.apache.thrift.TBaseHelper.copyBinary(prevEndRow);
   }
 
   /**
@@ -166,11 +169,9 @@ import org.slf4j.LoggerFactory;
 }
 if (other.isSetEndRow()) {
   this.endRow = org.apache.thrift.TBaseHelper.copyBinary(other.endRow);
-;
 }
 if (other.isSetPrevEndRow()) {
   this.prevEndRow = 
org.apache.thrift.TBaseHelper.copyBinary(other.prevEndRow);
-;
 }
   }
 
@@ -215,16 +216,16 @@ import org.slf4j.LoggerFactory;
   }
 
   public ByteBuffer bufferForEndRow() {
-return endRow;
+return org.apache.thrift.TBaseHelper.copyBinary(endRow);
   }
 
   public KeyExtent setEndRow(byte[] endRow) {
-setEndRow(endRow == null ? (ByteBuffer)null : ByteBuffer.wrap(endRow));
+this.endRow = endRow == null ? (ByteBuffer)null : 
ByteBuffer.wrap(Arrays.copyOf(endRow, endRow.length));
 return this;
   }
 
   public KeyExtent setEndRow(ByteBuffer endRow) {
-this.endRow = endRow;
+this.endRow = org.apache.thrift.TBaseHelper.copyBinary(endRow);
 return this;
   }
 
@@ -249,16 +250,16 @@ import org.slf4j.LoggerFactory;
   }
 
   public ByteBuffer bufferForPrevEndRow() {
-return prevEndRow;
+return org.apache.thrift.TBaseHelper.copyBinary(prevEndRow);
   }
 
   public KeyExtent setPrevEndRow(byte[] prevEndRow) {
-setPrevEndRow(prevEndRow == null ? (ByteBuffer)null : 
ByteBuffer.wrap(prevEndRow));
+this.prevEndRow = prevEndRow == null ? (ByteBuffer)null : 
ByteBuffer.wrap(Arrays.copyOf(prevEndRow, prevEndRow.length));
 return this;
   }
 
   public KeyExtent setPrevEndRow(ByteBuffer prevEndRow) {
-this.prevEndRow = prevEndRow;
+this.prevEndRow = org.apache.thrift.TBaseHelper.copyBinary(prevEndRow);
 return this;
   }
 
@@ -383,7 +384,24 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-return 0;
+List list = new ArrayList();
+
+boolean present_tableId = true && (isSetTableId());
+list.add(present_tableId);
+if (present_tableId)
+  list.add(tableId);
+
+boolean present_endRow = true && (isSetEndRow());
+list.add(present_endRow);
+if (present_endRow)
+  list.add(endRow);
+
+boolean present_prevEndRow = true && (isSetPrevEndRow());
+list.add(present_prevEndRow);
+if (present_prevEndRow)
+  list.add(prevEndRow);
+
+return list.hashCode();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java
--
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java
index 76d71b5..976fa4b 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/KeyValue.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated b

[11/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

2015-12-16 Thread ecn

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
index 310d3b6..ee819ad 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TabletStats.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class 
TabletStats implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2015-12-16")
+public class TabletStats implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("TabletStats");
 
   private static final org.apache.thrift.protocol.TField EXTENT_FIELD_DESC = 
new org.apache.thrift.protocol.TField("extent", 
org.apache.thrift.protocol.TType.STRUCT, (short)1);
@@ -526,16 +529,16 @@ import org.slf4j.LoggerFactory;
   return getSplits();
 
 case NUM_ENTRIES:
-  return Long.valueOf(getNumEntries());
+  return getNumEntries();
 
 case INGEST_RATE:
-  return Double.valueOf(getIngestRate());
+  return getIngestRate();
 
 case QUERY_RATE:
-  return Double.valueOf(getQueryRate());
+  return getQueryRate();
 
 case SPLIT_CREATION_TIME:
-  return Long.valueOf(getSplitCreationTime());
+  return getSplitCreationTime();
 
 }
 throw new IllegalStateException();
@@ -658,7 +661,49 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-return 0;
+List list = new ArrayList();
+
+boolean present_extent = true && (isSetExtent());
+list.add(present_extent);
+if (present_extent)
+  list.add(extent);
+
+boolean present_majors = true && (isSetMajors());
+list.add(present_majors);
+if (present_majors)
+  list.add(majors);
+
+boolean present_minors = true && (isSetMinors());
+list.add(present_minors);
+if (present_minors)
+  list.add(minors);
+
+boolean present_splits = true && (isSetSplits());
+list.add(present_splits);
+if (present_splits)
+  list.add(splits);
+
+boolean present_numEntries = true;
+list.add(present_numEntries);
+if (present_numEntries)
+  list.add(numEntries);
+
+boolean present_ingestRate = true;
+list.add(present_ingestRate);
+if (present_ingestRate)
+  list.add(ingestRate);
+
+boolean present_queryRate = true;
+list.add(present_queryRate);
+if (present_queryRate)
+  list.add(queryRate);
+
+boolean present_splitCreationTime = true;
+list.add(present_splitCreationTime);
+if (present_splitCreationTime)
+  list.add(splitCreationTime);
+
+return list.hashCode();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java
 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java
index 203597a..30399cb 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/TooManyFilesException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class 
TooManyFilesException extends TException implements 
org.apache.thrift.TBase, 
java.io.Serializable, Clonea

[12/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

2015-12-16 Thread ecn

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/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 dc964b9..3d4b0c8 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
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class 
TabletClientService {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2015-12-16")
+public class TabletClientService {
 
   public interface Iface extends 
org.apache.accumulo.core.client.impl.thrift.ClientService.Iface {
 
@@ -297,7 +300,7 @@ import org.slf4j.LoggerFactory;
   closeScan_args args = new closeScan_args();
   args.setTinfo(tinfo);
   args.setScanID(scanID);
-  sendBase("closeScan", args);
+  sendBaseOneway("closeScan", args);
 }
 
 public org.apache.accumulo.core.data.thrift.InitialMultiScan 
startMultiScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
Map>
 batch, List columns, 
List ssiList, 
Map> ssio, List authorizations, boolean 
waitForWrites, TSamplerConfiguration samplerConfig, long batchTimeOut, String 
classLoaderContext) throws 
org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, 
TSampleNotPresentException, org.apache.thrift.TException
@@ -433,7 +436,7 @@ import org.slf4j.LoggerFactory;
   args.setUpdateID(updateID);
   args.setKeyExtent(keyExtent);
   args.setMutations(mutations);
-  sendBase("applyUpdates", args);
+  sendBaseOneway("applyUpdates", args);
 }
 
 public org.apache.accumulo.core.data.thrift.UpdateErrors 
closeUpdate(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long updateID) 
throws NoSuchScanIDException, org.apache.thrift.TException
@@ -587,7 +590,7 @@ import org.slf4j.LoggerFactory;
   closeConditionalUpdate_args args = new closeConditionalUpdate_args();
   args.setTinfo(tinfo);
   args.setSessID(sessID);
-  sendBase("closeConditionalUpdate", args);
+  sendBaseOneway("closeConditionalUpdate", args);
 }
 
 public List 
bulkImport(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, 
Map>
 files, boolean setTime) throws 
org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, 
org.apache.thrift.TException
@@ -661,7 +664,7 @@ import org.slf4j.LoggerFactory;
   args.setCredentials(credentials);
   args.setLock(lock);
   args.setExtent(extent);
-  sendBase("loadTablet", args);
+  sendBaseOneway("loadTablet", args);
 }
 
 public void unloadTablet(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String lock, org.apache.accumulo.core.data.thrift.TKeyExtent extent, boolean 
save) throws org.apache.thrift.TException
@@ -677,7 +680,7 @@ import org.slf4j.LoggerFactory;
   args.setLock(lock);
   args.setExtent(extent);
   args.setSave(save);
-  sendBase("unloadTablet", args);
+  sendBaseOneway("unloadTablet", args);
 }
 
 public void flush(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, 
String tableId, ByteBuffer startRow, ByteBuffer endRow) throws 
org.apache.thrift.TException
@@ -694,7 +697,7 @@ import org.slf4j.LoggerFactory;
   args.setTableId(tableId);
   args.setStartRow(startRow);
   args.setEndRow(endRow);
-  sendBase("flush", args);
+  sendBaseOneway("flush", args);
 }
 
 public void flushTablet(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, String lock, 
org.apache.accumulo.core.data.thrift.TKeyExtent extent) throws 
org.apache.thrift.TException
@@ -709,7 +712,7 @@ import org.slf4j.LoggerFactory;
   args.setCredentials(credentials);
   args.setLock(lock);
   args.setExtent(extent);
-  sendBase("flushTablet", args);

[10/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

2015-12-16 Thread ecn

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/cpp/AccumuloProxy.cpp
--
diff --git a/proxy/src/main/cpp/AccumuloProxy.cpp 
b/proxy/src/main/cpp/AccumuloProxy.cpp
index b220dcb..d74ad95 100644
--- a/proxy/src/main/cpp/AccumuloProxy.cpp
+++ b/proxy/src/main/cpp/AccumuloProxy.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -24,8 +24,14 @@
 
 namespace accumulo {
 
+
+AccumuloProxy_login_args::~AccumuloProxy_login_args() throw() {
+}
+
+
 uint32_t AccumuloProxy_login_args::read(::apache::thrift::protocol::TProtocol* 
iprot) {
 
+  apache::thrift::protocol::TInputRecursionTracker tracker(*iprot);
   uint32_t xfer = 0;
   std::string fname;
   ::apache::thrift::protocol::TType ftype;
@@ -56,17 +62,17 @@ uint32_t 
AccumuloProxy_login_args::read(::apache::thrift::protocol::TProtocol* i
 if (ftype == ::apache::thrift::protocol::T_MAP) {
   {
 this->loginProperties.clear();
-uint32_t _size133;
-::apache::thrift::protocol::TType _ktype134;
-::apache::thrift::protocol::TType _vtype135;
-xfer += iprot->readMapBegin(_ktype134, _vtype135, _size133);
-uint32_t _i137;
-for (_i137 = 0; _i137 < _size133; ++_i137)
+uint32_t _size189;
+::apache::thrift::protocol::TType _ktype190;
+::apache::thrift::protocol::TType _vtype191;
+xfer += iprot->readMapBegin(_ktype190, _vtype191, _size189);
+uint32_t _i193;
+for (_i193 = 0; _i193 < _size189; ++_i193)
 {
-  std::string _key138;
-  xfer += iprot->readString(_key138);
-  std::string& _val139 = this->loginProperties[_key138];
-  xfer += iprot->readString(_val139);
+  std::string _key194;
+  xfer += iprot->readString(_key194);
+  std::string& _val195 = this->loginProperties[_key194];
+  xfer += iprot->readString(_val195);
 }
 xfer += iprot->readMapEnd();
   }
@@ -89,6 +95,7 @@ uint32_t 
AccumuloProxy_login_args::read(::apache::thrift::protocol::TProtocol* i
 
 uint32_t 
AccumuloProxy_login_args::write(::apache::thrift::protocol::TProtocol* oprot) 
const {
   uint32_t xfer = 0;
+  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_login_args");
 
   xfer += oprot->writeFieldBegin("principal", 
::apache::thrift::protocol::T_STRING, 1);
@@ -98,11 +105,11 @@ uint32_t 
AccumuloProxy_login_args::write(::apache::thrift::protocol::TProtocol*
   xfer += oprot->writeFieldBegin("loginProperties", 
::apache::thrift::protocol::T_MAP, 2);
   {
 xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, 
::apache::thrift::protocol::T_STRING, 
static_cast(this->loginProperties.size()));
-std::map ::const_iterator _iter140;
-for (_iter140 = this->loginProperties.begin(); _iter140 != 
this->loginProperties.end(); ++_iter140)
+std::map ::const_iterator _iter196;
+for (_iter196 = this->loginProperties.begin(); _iter196 != 
this->loginProperties.end(); ++_iter196)
 {
-  xfer += oprot->writeString(_iter140->first);
-  xfer += oprot->writeString(_iter140->second);
+  xfer += oprot->writeString(_iter196->first);
+  xfer += oprot->writeString(_iter196->second);
 }
 xfer += oprot->writeMapEnd();
   }
@@ -113,8 +120,14 @@ uint32_t 
AccumuloProxy_login_args::write(::apache::thrift::protocol::TProtocol*
   return xfer;
 }
 
+
+AccumuloProxy_login_pargs::~AccumuloProxy_login_pargs() throw() {
+}
+
+
 uint32_t 
AccumuloProxy_login_pargs::write(::apache::thrift::protocol::TProtocol* oprot) 
const {
   uint32_t xfer = 0;
+  apache::thrift::protocol::TOutputRecursionTracker tracker(*oprot);
   xfer += oprot->writeStructBegin("AccumuloProxy_login_pargs");
 
   xfer += oprot->writeFieldBegin("principal", 
::apache::thrift::protocol::T_STRING, 1);
@@ -124,11 +137,11 @@ uint32_t 
AccumuloProxy_login_pargs::write(::apache::thrift::protocol::TProtocol*
   xfer += oprot->writeFieldBegin("loginProperties", 
::apache::thrift::protocol::T_MAP, 2);
   {
 xfer += oprot->writeMapBegin(::apache::thrift::protocol::T_STRING, 
::apache::thrift::protocol::T_STRING, 
static_cast((*(this->loginProperties)).size()));
-std::map ::const_iterator _iter141;
-for (_iter141 = (*(this->loginProperties)).begin(); _iter141 != 
(*(this->loginProperties)).end(); ++_iter141)
+std::map ::const_iterator _iter197;
+for (_iter197 = (*(this->loginProperties)).begin(); _iter197 != 
(*(this->loginProperties)).end(); ++_iter197)
 {
-  xfer += oprot->writeString(_iter141->first);
-  xfer += oprot->writeString(_

[13/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

2015-12-16 Thread ecn

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
index 86a502b..f26a581 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActionStats.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings({"unchecked", "serial", "rawtypes", "unused"}) public class 
ActionStats implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable {
+@SuppressWarnings({"cast", "rawtypes", "serial", "unchecked", "unused"})
+@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)", date = 
"2015-12-16")
+public class ActionStats implements org.apache.thrift.TBase, java.io.Serializable, Cloneable, Comparable {
   private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new 
org.apache.thrift.protocol.TStruct("ActionStats");
 
   private static final org.apache.thrift.protocol.TField STATUS_FIELD_DESC = 
new org.apache.thrift.protocol.TField("status", 
org.apache.thrift.protocol.TType.I32, (short)1);
@@ -514,28 +517,28 @@ import org.slf4j.LoggerFactory;
   public Object getFieldValue(_Fields field) {
 switch (field) {
 case STATUS:
-  return Integer.valueOf(getStatus());
+  return getStatus();
 
 case ELAPSED:
-  return Double.valueOf(getElapsed());
+  return getElapsed();
 
 case NUM:
-  return Integer.valueOf(getNum());
+  return getNum();
 
 case COUNT:
-  return Long.valueOf(getCount());
+  return getCount();
 
 case SUM_DEV:
-  return Double.valueOf(getSumDev());
+  return getSumDev();
 
 case FAIL:
-  return Integer.valueOf(getFail());
+  return getFail();
 
 case QUEUE_TIME:
-  return Double.valueOf(getQueueTime());
+  return getQueueTime();
 
 case QUEUE_SUM_DEV:
-  return Double.valueOf(getQueueSumDev());
+  return getQueueSumDev();
 
 }
 throw new IllegalStateException();
@@ -658,7 +661,49 @@ import org.slf4j.LoggerFactory;
 
   @Override
   public int hashCode() {
-return 0;
+List list = new ArrayList();
+
+boolean present_status = true;
+list.add(present_status);
+if (present_status)
+  list.add(status);
+
+boolean present_elapsed = true;
+list.add(present_elapsed);
+if (present_elapsed)
+  list.add(elapsed);
+
+boolean present_num = true;
+list.add(present_num);
+if (present_num)
+  list.add(num);
+
+boolean present_count = true;
+list.add(present_count);
+if (present_count)
+  list.add(count);
+
+boolean present_sumDev = true;
+list.add(present_sumDev);
+if (present_sumDev)
+  list.add(sumDev);
+
+boolean present_fail = true;
+list.add(present_fail);
+if (present_fail)
+  list.add(fail);
+
+boolean present_queueTime = true;
+list.add(present_queueTime);
+if (present_queueTime)
+  list.add(queueTime);
+
+boolean present_queueSumDev = true;
+list.add(present_queueSumDev);
+if (present_queueSumDev)
+  list.add(queueSumDev);
+
+return list.hashCode();
   }
 
   @Override

http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
index 9c1977d..b32b38e 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveCompaction.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.1)
+ * Autogenerated by Thrift Compiler (0.9.3)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -45,10 +45,13 @@ import java.util.Collections;
 import java.util.BitSet;
 import java.nio.ByteBuffer;
 import java.util.Arrays;
+import javax.annotation.Generated;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-@SuppressWarnings(

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

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

[1/3] accumulo git commit: ACCUMULO-4076 Leave javadocs in default location

[1/3] accumulo git commit: ACCUMULO-4076 Leave javadocs in default location

[2/3] accumulo git commit: ACCUMULO-4076 Leave javadocs in default location

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

[01/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[14/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[09/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[05/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[06/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[18/18] accumulo git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/accumulo

[07/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[15/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[16/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[17/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[04/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[08/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[02/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[03/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[11/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[12/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[10/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

[13/18] accumulo git commit: ACCUMULO-4077 back out a couple of 0.9.1 hacks, run the new compiler

24 matches

Site Navigation

Mail list logo

Footer information