date:20170209

[06/10] accumulo git commit: ACCUMULO-4519 regenerate thrift

2017-02-09 Thread ctubbsii

ACCUMULO-4519 regenerate thrift


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

Branch: refs/heads/master
Commit: a9bf1062f25d5810816db23ec80d6b06f61b
Parents: 025aacc
Author: Christopher Tubbs 
Authored: Thu Feb 9 16:28:55 2017 -0500
Committer: Christopher Tubbs 
Committed: Thu Feb 9 16:28:55 2017 -0500

--
 proxy/src/main/cpp/proxy_types.cpp| 14 +++---
 proxy/src/main/cpp/proxy_types.h  |  6 +-
 .../accumulo/proxy/thrift/SystemPermission.java   | 14 +-
 proxy/src/main/python/ttypes.py   | 12 
 proxy/src/main/ruby/proxy_types.rb|  8 ++--
 5 files changed, 47 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a9bf10ff/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..4a626f5 100644
--- a/proxy/src/main/cpp/proxy_types.cpp
+++ b/proxy/src/main/cpp/proxy_types.cpp
@@ -70,7 +70,11 @@ int _kSystemPermissionValues[] = {
   SystemPermission::CREATE_USER,
   SystemPermission::DROP_USER,
   SystemPermission::ALTER_USER,
-  SystemPermission::SYSTEM
+  SystemPermission::SYSTEM,
+  SystemPermission::CREATE_NAMESPACE,
+  SystemPermission::DROP_NAMESPACE,
+  SystemPermission::ALTER_NAMESPACE,
+  SystemPermission::OBTAIN_DELEGATION_TOKEN
 };
 const char* _kSystemPermissionNames[] = {
   "GRANT",
@@ -80,9 +84,13 @@ const char* _kSystemPermissionNames[] = {
   "CREATE_USER",
   "DROP_USER",
   "ALTER_USER",
-  "SYSTEM"
+  "SYSTEM",
+  "CREATE_NAMESPACE",
+  "DROP_NAMESPACE",
+  "ALTER_NAMESPACE",
+  "OBTAIN_DELEGATION_TOKEN"
 };
-const std::map 
_SystemPermission_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(8, 
_kSystemPermissionValues, _kSystemPermissionNames), 
::apache::thrift::TEnumIterator(-1, NULL, NULL));
+const std::map 
_SystemPermission_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(12, 
_kSystemPermissionValues, _kSystemPermissionNames), 
::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
 int _kScanTypeValues[] = {
   ScanType::SINGLE,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a9bf10ff/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..c0169ef 100644
--- a/proxy/src/main/cpp/proxy_types.h
+++ b/proxy/src/main/cpp/proxy_types.h
@@ -68,7 +68,11 @@ struct SystemPermission {
 CREATE_USER = 4,
 DROP_USER = 5,
 ALTER_USER = 6,
-SYSTEM = 7
+SYSTEM = 7,
+CREATE_NAMESPACE = 8,
+DROP_NAMESPACE = 9,
+ALTER_NAMESPACE = 10,
+OBTAIN_DELEGATION_TOKEN = 11
   };
 };
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a9bf10ff/proxy/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java
index 929b83a..6ebb69a 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java
@@ -35,7 +35,11 @@ import org.apache.thrift.TEnum;
   CREATE_USER(4),
   DROP_USER(5),
   ALTER_USER(6),
-  SYSTEM(7);
+  SYSTEM(7),
+  CREATE_NAMESPACE(8),
+  DROP_NAMESPACE(9),
+  ALTER_NAMESPACE(10),
+  OBTAIN_DELEGATION_TOKEN(11);
 
   private final int value;
 
@@ -72,6 +76,14 @@ import org.apache.thrift.TEnum;
 return ALTER_USER;
   case 7:
 return SYSTEM;
+  case 8:
+return CREATE_NAMESPACE;
+  case 9:
+return DROP_NAMESPACE;
+  case 10:
+return ALTER_NAMESPACE;
+  case 11:
+return OBTAIN_DELEGATION_TOKEN;
   default:
 return null;
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a9bf10ff/proxy/src/main/python/ttypes.py
--
diff --git a/proxy/src/main/python/ttypes.py b/proxy/src/main/python/ttypes.py
index 9444f71..a748c0a 100644
--- a/proxy/src/main/python/ttypes.py
+++ b/proxy/src/main/python/ttypes.py
@@ -91,6 +91,10 @@ class SystemPermission:
   DROP_USER = 5
   ALTER_USER = 6
   SYSTEM = 7
+  CREATE_NAMESPACE = 8
+  DROP_NAMESPACE = 9
+  ALTER_NAMESPACE = 10
+  OBTAIN_DELEGATION_TOKEN = 11

[01/10] accumulo git commit: ACCUMULO-4519 patch from Yudong Wu

2017-02-09 Thread ctubbsii

Repository: accumulo
Updated Branches:
  refs/heads/1.7 13d3f5deb -> a9bf10fff
  refs/heads/1.8 a4ef3e09f -> e86fabb87
  refs/heads/master 1e000359f -> e2247ead5


ACCUMULO-4519 patch from Yudong Wu

Adds missing system permission and namespace functionality to the proxy.


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

Branch: refs/heads/1.7
Commit: 025aacc9fde81d1d51394126fd550f07a71f260e
Parents: 13d3f5d
Author: Michael Wall 
Authored: Thu Feb 9 16:13:47 2017 -0500
Committer: Christopher Tubbs 
Committed: Thu Feb 9 16:24:18 2017 -0500

--
 proxy/src/main/thrift/proxy.thrift | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/025aacc9/proxy/src/main/thrift/proxy.thrift
--
diff --git a/proxy/src/main/thrift/proxy.thrift 
b/proxy/src/main/thrift/proxy.thrift
index 25510d1..00427c0 100644
--- a/proxy/src/main/thrift/proxy.thrift
+++ b/proxy/src/main/thrift/proxy.thrift
@@ -131,6 +131,10 @@ enum SystemPermission {
   DROP_USER = 5,
   ALTER_USER = 6,
   SYSTEM = 7,
+  CREATE_NAMESPACE = 8,
+  DROP_NAMESPACE = 9,
+  ALTER_NAMESPACE = 10,
+  OBTAIN_DELEGATION_TOKEN = 11,
 }
 
 enum ScanType {

[08/10] accumulo git commit: Merge branch '1.7' into 1.8

2017-02-09 Thread ctubbsii

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: e86fabb87730abce15ca8f66459cdd44372aeadf
Parents: a4ef3e0 a9bf10f
Author: Christopher Tubbs 
Authored: Thu Feb 9 16:45:46 2017 -0500
Committer: Christopher Tubbs 
Committed: Thu Feb 9 16:45:46 2017 -0500

--
 proxy/src/main/cpp/proxy_types.cpp| 14 +++---
 proxy/src/main/cpp/proxy_types.h  |  6 +-
 .../accumulo/proxy/thrift/SystemPermission.java   | 14 +-
 proxy/src/main/python/ttypes.py   | 12 
 proxy/src/main/ruby/proxy_types.rb|  8 ++--
 proxy/src/main/thrift/proxy.thrift|  4 
 6 files changed, 51 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e86fabb8/proxy/src/main/cpp/proxy_types.cpp
--
diff --cc proxy/src/main/cpp/proxy_types.cpp
index 09c2d9c,4a626f5..87ef7ac
--- a/proxy/src/main/cpp/proxy_types.cpp
+++ b/proxy/src/main/cpp/proxy_types.cpp
@@@ -83,34 -84,14 +87,38 @@@ const char* _kSystemPermissionNames[] 
"CREATE_USER",
"DROP_USER",
"ALTER_USER",
-   "SYSTEM"
+   "SYSTEM",
+   "CREATE_NAMESPACE",
+   "DROP_NAMESPACE",
+   "ALTER_NAMESPACE",
+   "OBTAIN_DELEGATION_TOKEN"
  };
- const std::map 
_SystemPermission_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(8, 
_kSystemPermissionValues, _kSystemPermissionNames), 
::apache::thrift::TEnumIterator(-1, NULL, NULL));
+ const std::map 
_SystemPermission_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(12, 
_kSystemPermissionValues, _kSystemPermissionNames), 
::apache::thrift::TEnumIterator(-1, NULL, NULL));
  
 +int _kNamespacePermissionValues[] = {
 +  NamespacePermission::READ,
 +  NamespacePermission::WRITE,
 +  NamespacePermission::ALTER_NAMESPACE,
 +  NamespacePermission::GRANT,
 +  NamespacePermission::ALTER_TABLE,
 +  NamespacePermission::CREATE_TABLE,
 +  NamespacePermission::DROP_TABLE,
 +  NamespacePermission::BULK_IMPORT,
 +  NamespacePermission::DROP_NAMESPACE
 +};
 +const char* _kNamespacePermissionNames[] = {
 +  "READ",
 +  "WRITE",
 +  "ALTER_NAMESPACE",
 +  "GRANT",
 +  "ALTER_TABLE",
 +  "CREATE_TABLE",
 +  "DROP_TABLE",
 +  "BULK_IMPORT",
 +  "DROP_NAMESPACE"
 +};
 +const std::map 
_NamespacePermission_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(9, 
_kNamespacePermissionValues, _kNamespacePermissionNames), 
::apache::thrift::TEnumIterator(-1, NULL, NULL));
 +
  int _kScanTypeValues[] = {
ScanType::SINGLE,
ScanType::BATCH

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e86fabb8/proxy/src/main/cpp/proxy_types.h
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e86fabb8/proxy/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e86fabb8/proxy/src/main/python/ttypes.py
--
diff --cc proxy/src/main/python/ttypes.py
index 87a977d,a748c0a..3f9ec9c
--- a/proxy/src/main/python/ttypes.py
+++ b/proxy/src/main/python/ttypes.py
@@@ -112,43 -120,12 +120,47 @@@ class SystemPermission
  "DROP_USER": 5,
  "ALTER_USER": 6,
  "SYSTEM": 7,
+ "CREATE_NAMESPACE": 8,
+ "DROP_NAMESPACE": 9,
+ "ALTER_NAMESPACE": 10,
+ "OBTAIN_DELEGATION_TOKEN": 11,
}
  
 +class NamespacePermission:
 +  READ = 0
 +  WRITE = 1
 +  ALTER_NAMESPACE = 2
 +  GRANT = 3
 +  ALTER_TABLE = 4
 +  CREATE_TABLE = 5
 +  DROP_TABLE = 6
 +  BULK_IMPORT = 7
 +  DROP_NAMESPACE = 8
 +
 +  _VALUES_TO_NAMES = {
 +0: "READ",
 +1: "WRITE",
 +2: "ALTER_NAMESPACE",
 +3: "GRANT",
 +4: "ALTER_TABLE",
 +5: "CREATE_TABLE",
 +6: "DROP_TABLE",
 +7: "BULK_IMPORT",
 +8: "DROP_NAMESPACE",
 +  }
 +
 +  _NAMES_TO_VALUES = {
 +"READ": 0,
 +"WRITE": 1,
 +"ALTER_NAMESPACE": 2,
 +"GRANT": 3,
 +"ALTER_TABLE": 4,
 +"CREATE_TABLE": 5,
 +"DROP_TABLE": 6,
 +"BULK_IMPORT": 7,
 +"DROP_NAMESPACE": 8,
 +  }
 +
  class ScanType:
SINGLE = 0
BATCH = 1

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e86fabb8/proxy/src/main/ruby/proxy_types.rb
--
diff --cc proxy/src/main/ruby/proxy_types.rb
index e542df6,522c80c..ddf8a18
---

[02/10] accumulo git commit: ACCUMULO-4519 patch from Yudong Wu

2017-02-09 Thread ctubbsii

ACCUMULO-4519 patch from Yudong Wu

Adds missing system permission and namespace functionality to the proxy.


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

Branch: refs/heads/1.8
Commit: 025aacc9fde81d1d51394126fd550f07a71f260e
Parents: 13d3f5d
Author: Michael Wall 
Authored: Thu Feb 9 16:13:47 2017 -0500
Committer: Christopher Tubbs 
Committed: Thu Feb 9 16:24:18 2017 -0500

--
 proxy/src/main/thrift/proxy.thrift | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/025aacc9/proxy/src/main/thrift/proxy.thrift
--
diff --git a/proxy/src/main/thrift/proxy.thrift 
b/proxy/src/main/thrift/proxy.thrift
index 25510d1..00427c0 100644
--- a/proxy/src/main/thrift/proxy.thrift
+++ b/proxy/src/main/thrift/proxy.thrift
@@ -131,6 +131,10 @@ enum SystemPermission {
   DROP_USER = 5,
   ALTER_USER = 6,
   SYSTEM = 7,
+  CREATE_NAMESPACE = 8,
+  DROP_NAMESPACE = 9,
+  ALTER_NAMESPACE = 10,
+  OBTAIN_DELEGATION_TOKEN = 11,
 }
 
 enum ScanType {

[03/10] accumulo git commit: ACCUMULO-4519 patch from Yudong Wu

2017-02-09 Thread ctubbsii

ACCUMULO-4519 patch from Yudong Wu

Adds missing system permission and namespace functionality to the proxy.


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

Branch: refs/heads/master
Commit: 025aacc9fde81d1d51394126fd550f07a71f260e
Parents: 13d3f5d
Author: Michael Wall 
Authored: Thu Feb 9 16:13:47 2017 -0500
Committer: Christopher Tubbs 
Committed: Thu Feb 9 16:24:18 2017 -0500

--
 proxy/src/main/thrift/proxy.thrift | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/025aacc9/proxy/src/main/thrift/proxy.thrift
--
diff --git a/proxy/src/main/thrift/proxy.thrift 
b/proxy/src/main/thrift/proxy.thrift
index 25510d1..00427c0 100644
--- a/proxy/src/main/thrift/proxy.thrift
+++ b/proxy/src/main/thrift/proxy.thrift
@@ -131,6 +131,10 @@ enum SystemPermission {
   DROP_USER = 5,
   ALTER_USER = 6,
   SYSTEM = 7,
+  CREATE_NAMESPACE = 8,
+  DROP_NAMESPACE = 9,
+  ALTER_NAMESPACE = 10,
+  OBTAIN_DELEGATION_TOKEN = 11,
 }
 
 enum ScanType {

[10/10] accumulo git commit: Merge branch '1.8'

2017-02-09 Thread ctubbsii

Merge branch '1.8'

This closes #217


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

Branch: refs/heads/master
Commit: e2247ead5bee94dd538fcfdf04de2f8d1c0c06d8
Parents: 1e00035 e86fabb
Author: Christopher Tubbs 
Authored: Thu Feb 9 17:11:12 2017 -0500
Committer: Christopher Tubbs 
Committed: Thu Feb 9 17:11:12 2017 -0500

--
 proxy/src/main/cpp/proxy_types.cpp| 14 +++---
 proxy/src/main/cpp/proxy_types.h  |  6 +-
 .../accumulo/proxy/thrift/SystemPermission.java   | 14 +-
 proxy/src/main/python/ttypes.py   | 12 
 proxy/src/main/ruby/proxy_types.rb|  8 ++--
 proxy/src/main/thrift/proxy.thrift|  4 
 6 files changed, 51 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e2247ead/proxy/src/main/cpp/proxy_types.cpp
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e2247ead/proxy/src/main/cpp/proxy_types.h
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e2247ead/proxy/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java
--

[07/10] accumulo git commit: Merge branch '1.7' into 1.8

2017-02-09 Thread ctubbsii

Merge branch '1.7' into 1.8


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

Branch: refs/heads/1.8
Commit: e86fabb87730abce15ca8f66459cdd44372aeadf
Parents: a4ef3e0 a9bf10f
Author: Christopher Tubbs 
Authored: Thu Feb 9 16:45:46 2017 -0500
Committer: Christopher Tubbs 
Committed: Thu Feb 9 16:45:46 2017 -0500

--
 proxy/src/main/cpp/proxy_types.cpp| 14 +++---
 proxy/src/main/cpp/proxy_types.h  |  6 +-
 .../accumulo/proxy/thrift/SystemPermission.java   | 14 +-
 proxy/src/main/python/ttypes.py   | 12 
 proxy/src/main/ruby/proxy_types.rb|  8 ++--
 proxy/src/main/thrift/proxy.thrift|  4 
 6 files changed, 51 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/e86fabb8/proxy/src/main/cpp/proxy_types.cpp
--
diff --cc proxy/src/main/cpp/proxy_types.cpp
index 09c2d9c,4a626f5..87ef7ac
--- a/proxy/src/main/cpp/proxy_types.cpp
+++ b/proxy/src/main/cpp/proxy_types.cpp
@@@ -83,34 -84,14 +87,38 @@@ const char* _kSystemPermissionNames[] 
"CREATE_USER",
"DROP_USER",
"ALTER_USER",
-   "SYSTEM"
+   "SYSTEM",
+   "CREATE_NAMESPACE",
+   "DROP_NAMESPACE",
+   "ALTER_NAMESPACE",
+   "OBTAIN_DELEGATION_TOKEN"
  };
- const std::map 
_SystemPermission_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(8, 
_kSystemPermissionValues, _kSystemPermissionNames), 
::apache::thrift::TEnumIterator(-1, NULL, NULL));
+ const std::map 
_SystemPermission_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(12, 
_kSystemPermissionValues, _kSystemPermissionNames), 
::apache::thrift::TEnumIterator(-1, NULL, NULL));
  
 +int _kNamespacePermissionValues[] = {
 +  NamespacePermission::READ,
 +  NamespacePermission::WRITE,
 +  NamespacePermission::ALTER_NAMESPACE,
 +  NamespacePermission::GRANT,
 +  NamespacePermission::ALTER_TABLE,
 +  NamespacePermission::CREATE_TABLE,
 +  NamespacePermission::DROP_TABLE,
 +  NamespacePermission::BULK_IMPORT,
 +  NamespacePermission::DROP_NAMESPACE
 +};
 +const char* _kNamespacePermissionNames[] = {
 +  "READ",
 +  "WRITE",
 +  "ALTER_NAMESPACE",
 +  "GRANT",
 +  "ALTER_TABLE",
 +  "CREATE_TABLE",
 +  "DROP_TABLE",
 +  "BULK_IMPORT",
 +  "DROP_NAMESPACE"
 +};
 +const std::map 
_NamespacePermission_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(9, 
_kNamespacePermissionValues, _kNamespacePermissionNames), 
::apache::thrift::TEnumIterator(-1, NULL, NULL));
 +
  int _kScanTypeValues[] = {
ScanType::SINGLE,
ScanType::BATCH

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e86fabb8/proxy/src/main/cpp/proxy_types.h
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e86fabb8/proxy/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e86fabb8/proxy/src/main/python/ttypes.py
--
diff --cc proxy/src/main/python/ttypes.py
index 87a977d,a748c0a..3f9ec9c
--- a/proxy/src/main/python/ttypes.py
+++ b/proxy/src/main/python/ttypes.py
@@@ -112,43 -120,12 +120,47 @@@ class SystemPermission
  "DROP_USER": 5,
  "ALTER_USER": 6,
  "SYSTEM": 7,
+ "CREATE_NAMESPACE": 8,
+ "DROP_NAMESPACE": 9,
+ "ALTER_NAMESPACE": 10,
+ "OBTAIN_DELEGATION_TOKEN": 11,
}
  
 +class NamespacePermission:
 +  READ = 0
 +  WRITE = 1
 +  ALTER_NAMESPACE = 2
 +  GRANT = 3
 +  ALTER_TABLE = 4
 +  CREATE_TABLE = 5
 +  DROP_TABLE = 6
 +  BULK_IMPORT = 7
 +  DROP_NAMESPACE = 8
 +
 +  _VALUES_TO_NAMES = {
 +0: "READ",
 +1: "WRITE",
 +2: "ALTER_NAMESPACE",
 +3: "GRANT",
 +4: "ALTER_TABLE",
 +5: "CREATE_TABLE",
 +6: "DROP_TABLE",
 +7: "BULK_IMPORT",
 +8: "DROP_NAMESPACE",
 +  }
 +
 +  _NAMES_TO_VALUES = {
 +"READ": 0,
 +"WRITE": 1,
 +"ALTER_NAMESPACE": 2,
 +"GRANT": 3,
 +"ALTER_TABLE": 4,
 +"CREATE_TABLE": 5,
 +"DROP_TABLE": 6,
 +"BULK_IMPORT": 7,
 +"DROP_NAMESPACE": 8,
 +  }
 +
  class ScanType:
SINGLE = 0
BATCH = 1

http://git-wip-us.apache.org/repos/asf/accumulo/blob/e86fabb8/proxy/src/main/ruby/proxy_types.rb
--
diff --cc proxy/src/main/ruby/proxy_types.rb
index e542df6,522c80c..ddf8a18
---

[04/10] accumulo git commit: ACCUMULO-4519 regenerate thrift

2017-02-09 Thread ctubbsii

ACCUMULO-4519 regenerate thrift


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

Branch: refs/heads/1.7
Commit: a9bf1062f25d5810816db23ec80d6b06f61b
Parents: 025aacc
Author: Christopher Tubbs 
Authored: Thu Feb 9 16:28:55 2017 -0500
Committer: Christopher Tubbs 
Committed: Thu Feb 9 16:28:55 2017 -0500

--
 proxy/src/main/cpp/proxy_types.cpp| 14 +++---
 proxy/src/main/cpp/proxy_types.h  |  6 +-
 .../accumulo/proxy/thrift/SystemPermission.java   | 14 +-
 proxy/src/main/python/ttypes.py   | 12 
 proxy/src/main/ruby/proxy_types.rb|  8 ++--
 5 files changed, 47 insertions(+), 7 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a9bf10ff/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..4a626f5 100644
--- a/proxy/src/main/cpp/proxy_types.cpp
+++ b/proxy/src/main/cpp/proxy_types.cpp
@@ -70,7 +70,11 @@ int _kSystemPermissionValues[] = {
   SystemPermission::CREATE_USER,
   SystemPermission::DROP_USER,
   SystemPermission::ALTER_USER,
-  SystemPermission::SYSTEM
+  SystemPermission::SYSTEM,
+  SystemPermission::CREATE_NAMESPACE,
+  SystemPermission::DROP_NAMESPACE,
+  SystemPermission::ALTER_NAMESPACE,
+  SystemPermission::OBTAIN_DELEGATION_TOKEN
 };
 const char* _kSystemPermissionNames[] = {
   "GRANT",
@@ -80,9 +84,13 @@ const char* _kSystemPermissionNames[] = {
   "CREATE_USER",
   "DROP_USER",
   "ALTER_USER",
-  "SYSTEM"
+  "SYSTEM",
+  "CREATE_NAMESPACE",
+  "DROP_NAMESPACE",
+  "ALTER_NAMESPACE",
+  "OBTAIN_DELEGATION_TOKEN"
 };
-const std::map 
_SystemPermission_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(8, 
_kSystemPermissionValues, _kSystemPermissionNames), 
::apache::thrift::TEnumIterator(-1, NULL, NULL));
+const std::map 
_SystemPermission_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(12, 
_kSystemPermissionValues, _kSystemPermissionNames), 
::apache::thrift::TEnumIterator(-1, NULL, NULL));
 
 int _kScanTypeValues[] = {
   ScanType::SINGLE,

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a9bf10ff/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..c0169ef 100644
--- a/proxy/src/main/cpp/proxy_types.h
+++ b/proxy/src/main/cpp/proxy_types.h
@@ -68,7 +68,11 @@ struct SystemPermission {
 CREATE_USER = 4,
 DROP_USER = 5,
 ALTER_USER = 6,
-SYSTEM = 7
+SYSTEM = 7,
+CREATE_NAMESPACE = 8,
+DROP_NAMESPACE = 9,
+ALTER_NAMESPACE = 10,
+OBTAIN_DELEGATION_TOKEN = 11
   };
 };
 

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a9bf10ff/proxy/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java
index 929b83a..6ebb69a 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/SystemPermission.java
@@ -35,7 +35,11 @@ import org.apache.thrift.TEnum;
   CREATE_USER(4),
   DROP_USER(5),
   ALTER_USER(6),
-  SYSTEM(7);
+  SYSTEM(7),
+  CREATE_NAMESPACE(8),
+  DROP_NAMESPACE(9),
+  ALTER_NAMESPACE(10),
+  OBTAIN_DELEGATION_TOKEN(11);
 
   private final int value;
 
@@ -72,6 +76,14 @@ import org.apache.thrift.TEnum;
 return ALTER_USER;
   case 7:
 return SYSTEM;
+  case 8:
+return CREATE_NAMESPACE;
+  case 9:
+return DROP_NAMESPACE;
+  case 10:
+return ALTER_NAMESPACE;
+  case 11:
+return OBTAIN_DELEGATION_TOKEN;
   default:
 return null;
 }

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a9bf10ff/proxy/src/main/python/ttypes.py
--
diff --git a/proxy/src/main/python/ttypes.py b/proxy/src/main/python/ttypes.py
index 9444f71..a748c0a 100644
--- a/proxy/src/main/python/ttypes.py
+++ b/proxy/src/main/python/ttypes.py
@@ -91,6 +91,10 @@ class SystemPermission:
   DROP_USER = 5
   ALTER_USER = 6
   SYSTEM = 7
+  CREATE_NAMESPACE = 8
+  DROP_NAMESPACE = 9
+  ALTER_NAMESPACE = 10
+  OBTAIN_DELEGATION_TOKEN = 11

[1/2] accumulo git commit: ACCUMULO-4480 - update testing section of user manual for 1.8

2017-02-09 Thread mjwall

Repository: accumulo
Updated Branches:
  refs/heads/master 62bbce43e -> 1e000359f


ACCUMULO-4480 - update testing section of user manual for 1.8


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

Branch: refs/heads/master
Commit: a4ef3e09f36aa51e575461113b3005e504fdae11
Parents: bdb27e9
Author: Michael Wall 
Authored: Thu Feb 2 12:57:00 2017 -0500
Committer: Michael Wall 
Committed: Thu Feb 9 14:25:05 2017 -0500

--
 .../main/asciidoc/chapters/administration.txt   | 37 
 1 file changed, 14 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4ef3e09/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 c716a16..e8fbcb8 100644
--- a/docs/src/main/asciidoc/chapters/administration.txt
+++ b/docs/src/main/asciidoc/chapters/administration.txt
@@ -316,10 +316,10 @@ will expect the KeyStore in the same location.
 [[ClientConfiguration]]
  Client Configuration
 
-In version 1.6.0, Accumulo includes a new type of configuration file known as 
a client
+In version 1.6.0, Accumulo included a new type of configuration file known as 
a client
 configuration file. One problem with the traditional "site.xml" file that is 
prevalent
 through Hadoop is that it is a single file used by both clients and servers. 
This makes
-is very difficult to protect secrets that are only meant for the server 
processes while
+it very difficult to protect secrets that are only meant for the server 
processes while
 allowing the clients to connect to the servers.
 
 The client configuration file is a subset of the information stored in 
accumulo-site.xml
@@ -1175,24 +1175,15 @@ the system to full capacity without administrator 
interaction after many of the
 common failure modes.
 
  Tested Versions
-Another large consideration for Accumulo stability is to use versions of
-software that have been tested together in a VM environment. Any cluster of
-processes that have not been tested together are likely to expose running
-conditions that vary from the environments individually tested in the various
-components. For example, Accumulo's use of HDFS includes many short block
-reads, which differs from the more common full file read used in most
-map/reduce applications. We have found that certain versions of Accumulo and
-Hadoop will include stability bugs that greatly affect overall stability. In
-our testing, Accumulo 1.6.2, Hadoop 2.6.0, and Zookeeper 3.4.6 resulted in a
-stable VM clusters that did not fail a month of testing, while Accumulo 1.6.1,
-Hadoop 2.5.1, and Zookeeper 3.4.5 had a mean time between failure of less than
-a week under heavy ingest and query load. We expect that results will vary with
-other configurations, and you should choose your software versions with that in
-mind.
-
-
-
-
-
-
-
+Each release of Accumulo is built with a specific version of Apache
+Hadoop, Apache ZooKeeper and Apache Thrift.  We expect Accumulo to
+work with versions that are API compatable with those versions.
+However this compatibility is not guaranteed because Hadoop, ZooKeeper
+and Thift may not provide guarantees between their own versions. We
+have also found that certain versions of Accumulo and Hadoop included
+bugs that greatly affected overall stability.  Thrift is particularly
+prone to compatablity changes between versions and you must use the
+same version your Accumulo is built with.
+
+Please check the release notes for your Accumulo version or use the
+mailing lists at https://accumulo.apache.org for more info.

[2/2] accumulo git commit: Merge branch '1.8'

2017-02-09 Thread mjwall

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 1e000359f25470b8c97ff32c5c4f732dfa338636
Parents: 62bbce4 a4ef3e0
Author: Michael Wall 
Authored: Thu Feb 9 14:46:35 2017 -0500
Committer: Michael Wall 
Committed: Thu Feb 9 14:46:35 2017 -0500

--
 .../main/asciidoc/chapters/administration.txt   | 37 
 1 file changed, 14 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/1e000359/docs/src/main/asciidoc/chapters/administration.txt
--

accumulo git commit: ACCUMULO-4480 - update testing section of user manual for 1.8

2017-02-09 Thread mjwall

Repository: accumulo
Updated Branches:
  refs/heads/1.8 bdb27e978 -> a4ef3e09f


ACCUMULO-4480 - update testing section of user manual for 1.8


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

Branch: refs/heads/1.8
Commit: a4ef3e09f36aa51e575461113b3005e504fdae11
Parents: bdb27e9
Author: Michael Wall 
Authored: Thu Feb 2 12:57:00 2017 -0500
Committer: Michael Wall 
Committed: Thu Feb 9 14:25:05 2017 -0500

--
 .../main/asciidoc/chapters/administration.txt   | 37 
 1 file changed, 14 insertions(+), 23 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a4ef3e09/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 c716a16..e8fbcb8 100644
--- a/docs/src/main/asciidoc/chapters/administration.txt
+++ b/docs/src/main/asciidoc/chapters/administration.txt
@@ -316,10 +316,10 @@ will expect the KeyStore in the same location.
 [[ClientConfiguration]]
  Client Configuration
 
-In version 1.6.0, Accumulo includes a new type of configuration file known as 
a client
+In version 1.6.0, Accumulo included a new type of configuration file known as 
a client
 configuration file. One problem with the traditional "site.xml" file that is 
prevalent
 through Hadoop is that it is a single file used by both clients and servers. 
This makes
-is very difficult to protect secrets that are only meant for the server 
processes while
+it very difficult to protect secrets that are only meant for the server 
processes while
 allowing the clients to connect to the servers.
 
 The client configuration file is a subset of the information stored in 
accumulo-site.xml
@@ -1175,24 +1175,15 @@ the system to full capacity without administrator 
interaction after many of the
 common failure modes.
 
  Tested Versions
-Another large consideration for Accumulo stability is to use versions of
-software that have been tested together in a VM environment. Any cluster of
-processes that have not been tested together are likely to expose running
-conditions that vary from the environments individually tested in the various
-components. For example, Accumulo's use of HDFS includes many short block
-reads, which differs from the more common full file read used in most
-map/reduce applications. We have found that certain versions of Accumulo and
-Hadoop will include stability bugs that greatly affect overall stability. In
-our testing, Accumulo 1.6.2, Hadoop 2.6.0, and Zookeeper 3.4.6 resulted in a
-stable VM clusters that did not fail a month of testing, while Accumulo 1.6.1,
-Hadoop 2.5.1, and Zookeeper 3.4.5 had a mean time between failure of less than
-a week under heavy ingest and query load. We expect that results will vary with
-other configurations, and you should choose your software versions with that in
-mind.
-
-
-
-
-
-
-
+Each release of Accumulo is built with a specific version of Apache
+Hadoop, Apache ZooKeeper and Apache Thrift.  We expect Accumulo to
+work with versions that are API compatable with those versions.
+However this compatibility is not guaranteed because Hadoop, ZooKeeper
+and Thift may not provide guarantees between their own versions. We
+have also found that certain versions of Accumulo and Hadoop included
+bugs that greatly affected overall stability.  Thrift is particularly
+prone to compatablity changes between versions and you must use the
+same version your Accumulo is built with.
+
+Please check the release notes for your Accumulo version or use the
+mailing lists at https://accumulo.apache.org for more info.

[29/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/master/thrift/FateService.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/master/thrift/FateService.java 
b/core/src/main/java/org/apache/accumulo/core/master/thrift/FateService.java
index cc49eca..959c4a4 100644
--- a/core/src/main/java/org/apache/accumulo/core/master/thrift/FateService.java
+++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/FateService.java
@@ -15,51 +15,24 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.core.master.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class FateService {
 
   public interface Iface {
 
 public long beginFateOperation(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials) 
throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, 
org.apache.accumulo.core.client.impl.thrift.ThriftNotActiveServiceException, 
org.apache.thrift.TException;
 
-public void 
executeFateOperation(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid, 
FateOperation op, List arguments, Map options, 
boolean autoClean) throws 
org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, 
org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, 
org.apache.accumulo.core.client.impl.thrift.ThriftNotActiveServiceException, 
org.apache.thrift.TException;
+public void 
executeFateOperation(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid, 
FateOperation op, java.util.List arguments, 
java.util.Map options, boolean autoClean) 
throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, 
org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, 
org.apache.accumulo.core.client.impl.thrift.ThriftNotActiveServiceException, 
org.apache.thrift.TException;
 
-public String 
waitForFateOperation(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid) 
throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, 
org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, 
org.apache.accumulo.core.client.impl.thrift.ThriftNotActiveServiceException, 
org.apache.thrift.TException;
+public java.lang.String 
waitForFateOperation(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid) 
throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, 
org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, 
org.apache.accumulo.core.client.impl.thrift.ThriftNotActiveServiceException, 
org.apache.thrift.TException;
 
 public void 
finishFateOperation(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, long opid) 
throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, 
org.apache.accumulo.core.client.impl.thrift.ThriftNotActiveServiceException, 
org.apache.thrift.TException;
 
@@ -67,17 +40,17 @@ public class FateService {
 
   public interface AsyncIface {
 
-public void beginFateOperation(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.thrift.async.AsyncMethodCallback resultHandler)

[24/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.java
 
b/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.java
index 0ceabcf..c15ba25 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationCoordinator.java
@@ -15,57 +15,30 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.core.replication.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class ReplicationCoordinator {
 
   public interface Iface {
 
-public String getServicerAddress(String remoteTableId, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) throws 
ReplicationCoordinatorException, org.apache.thrift.TException;
+public java.lang.String getServicerAddress(java.lang.String remoteTableId, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) throws 
ReplicationCoordinatorException, org.apache.thrift.TException;
 
   }
 
   public interface AsyncIface {
 
-public void getServicerAddress(String remoteTableId, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+public void getServicerAddress(java.lang.String remoteTableId, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
 
   }
 
-  public static class Client extends org.apache.thrift.TServiceClient 
implements Iface {
+  public static class Client extends 
org.apache.accumulo.core.rpc.TServiceClientWrapper implements Iface {
 public static class Factory implements 
org.apache.thrift.TServiceClientFactory {
   public Factory() {}
   public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
@@ -85,13 +58,13 @@ public class ReplicationCoordinator {
   super(iprot, oprot);
 }
 
-public String getServicerAddress(String remoteTableId, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) throws 
ReplicationCoordinatorException, org.apache.thrift.TException
+public java.lang.String getServicerAddress(java.lang.String remoteTableId, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) throws 
ReplicationCoordinatorException, org.apache.thrift.TException
 {
   send_getServicerAddress(remoteTableId, credentials);
   return recv_getServicerAddress();
 }
 
-public void send_getServicerAddress(String remoteTableId, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) throws 
org.apache.thrift.TException
+public void send_getServicerAddress(java.lang.String remoteTableId, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) throws 
org.apache.thrift.TException
 {
   getServicerAddress_args args = new getServicerAddress_args();
   args.setRemoteTableId(remoteTableId);
@@ -99,7 +72,7 @@ public class ReplicationCoordinator {
   sendBase("getServicerAddress", args);
 }
 
-public String recv_getServicerAddress() throws 
ReplicationCoordinatorException, org.apache.thrift.TException
+public java.lang.String recv_getServicerAddress() throws 
ReplicationCoordinatorException, org.apache.thrift.TException
 {
   getServicerAddress_result result = new getServicerAddress_result();

[32/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java 
b/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java
index d4df3d3..c90b213 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TRange.java
@@ -15,42 +15,15 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.core.data.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class TRange 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("TRange");
 
@@ -61,11 +34,8 @@ public class TRange implements 
org.apache.thrift.TBase,
   private static final org.apache.thrift.protocol.TField 
INFINITE_START_KEY_FIELD_DESC = new 
org.apache.thrift.protocol.TField("infiniteStartKey", 
org.apache.thrift.protocol.TType.BOOL, (short)5);
   private static final org.apache.thrift.protocol.TField 
INFINITE_STOP_KEY_FIELD_DESC = new 
org.apache.thrift.protocol.TField("infiniteStopKey", 
org.apache.thrift.protocol.TType.BOOL, (short)6);
 
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new TRangeStandardSchemeFactory());
-schemes.put(TupleScheme.class, new TRangeTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new TRangeStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new TRangeTupleSchemeFactory();
 
   public TKey start; // required
   public TKey stop; // required
@@ -83,10 +53,10 @@ public class TRange implements 
org.apache.thrift.TBase,
 INFINITE_START_KEY((short)5, "infiniteStartKey"),
 INFINITE_STOP_KEY((short)6, "infiniteStopKey");
 
-private static final Map byName = new HashMap();
+private static final java.util.Map byName = new 
java.util.HashMap();
 
 static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
+  for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
 byName.put(field.getFieldName(), field);
   }
 }
@@ -119,21 +89,21 @@ public class TRange implements 
org.apache.thrift.TBase,
  */
 public static _Fields findByThriftIdOrThrow(int fieldId) {
   _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
+  if (fields == null) throw new java.lang.IllegalArgumentException("Field 
" + fieldId + " doesn't exist!");
   return fields;
 }
 
 /**
  * Find the _Fields constant that matches name, or null if its not found.
  */
-public static _Fields findByName(String name) {
+public static _Fields findByName(java.lang.String name) {
   return byName.get(name);
 }
 
 private final short _thriftId;
-private final String _fieldName;
+private final java.lang.String _fieldName;
 
-_Fields(short thriftId, String fieldName) {
+_Fields(short thriftId, java.lang.String fieldName) {
   _thriftId = thriftId;
   _fieldName = fieldName;
 }
@@ -142,7 +112,7 @@ public class TRange

[20/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/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 4c0decc..fa9dbd4 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,42 +15,15 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.core.tabletserver.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 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");
 
@@ -66,16 +39,13 @@ public class ActiveCompaction implements 
org.apache.thrift.TBase, SchemeFactory> schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new 
ActiveCompactionStandardSchemeFactory());
-schemes.put(TupleScheme.class, new ActiveCompactionTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new ActiveCompactionStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new ActiveCompactionTupleSchemeFactory();
 
   public org.apache.accumulo.core.data.thrift.TKeyExtent extent; // required
   public long age; // required
-  public List inputFiles; // required
-  public String outputFile; // required
+  public java.util.List inputFiles; // required
+  public java.lang.String outputFile; // required
   /**
* 
* @see CompactionType
@@ -86,11 +56,11 @@ public class ActiveCompaction implements 
org.apache.thrift.TBase ssiList; // 
required
-  public Map> ssio; // required
+  public java.util.List 
ssiList; // required
+  public 
java.util.Map>
 ssio; // required
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -114,10 +84,10 @@ public class ActiveCompaction implements 
org.apache.thrift.TBase byName = new HashMap();
+private static final java.util.Map byName = new 
java.util.HashMap();
 
 static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
+  for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
 byName.put(field.getFieldName(), field);
   }
 }
@@ -160,21 +130,21 @@ public class ActiveCompaction implements 
org.apache.thrift.TBase 
metaDataMap;
+  public static final java.util.Map<_Fields, 
org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = 
new java.util.EnumMap<_Fields, 
org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
 tmpMap.put(_Fields.EXTENT, new 
org.apache.thrift.meta_data.FieldMetaData("extent", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
 new

[17/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/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 4ce9927..641556c 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,53 +15,26 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.core.tabletserver.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class TabletClientService {
 
   public interface Iface extends 
org.apache.accumulo.core.client.impl.thrift.ClientService.Iface {
 
-public org.apache.accumulo.core.data.thrift.InitialScan 
startScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.accumulo.core.data.thrift.TKeyExtent extent, 
org.apache.accumulo.core.data.thrift.TRange range, 
List columns, int batchSize, 
List ssiList, 
Map> ssio, List authorizations, boolean 
waitForWrites, boolean isolated, long readaheadThreshold, TSamplerConfiguration 
samplerConfig, long batchTimeOut, String classLoaderContext) throws 
org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, 
NotServingTabletException, TooManyFilesException, TSampleNotPresentException, 
org.apache.thrift.TException;
+public org.apache.accumulo.core.data.thrift.InitialScan 
startScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.accumulo.core.data.thrift.TKeyExtent extent, 
org.apache.accumulo.core.data.thrift.TRange range, 
java.util.List columns, int 
batchSize, java.util.List 
ssiList, 
java.util.Map>
 ssio, java.util.List authorizations, boolean 
waitForWrites, boolean isolated, long readaheadThreshold, TSamplerConfiguration 
samplerConfig, long batchTimeOut, java.lang.String classLoaderContext) throws 
org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, 
NotServingTabletException, TooManyFilesException, TSampleNotPresentException, 
org.apache.thrift.TException;
 
 public org.apache.accumulo.core.data.thrift.ScanResult 
continueScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, long scanID) 
throws NoSuchScanIDException, NotServingTabletException, TooManyFilesException, 
TSampleNotPresentException, org.apache.thrift.TException;
 
 public void closeScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
long scanID) throws org.apache.thrift.TException;
 
-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;
+public org.apache.accumulo.core.data.thrift.InitialMultiScan 
startMultiScan(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials

[02/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/ruby/accumulo_proxy.rb
--
diff --git a/proxy/src/main/ruby/accumulo_proxy.rb 
b/proxy/src/main/ruby/accumulo_proxy.rb
index e02ba16..3c02507 100644
--- a/proxy/src/main/ruby/accumulo_proxy.rb
+++ b/proxy/src/main/ruby/accumulo_proxy.rb
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Autogenerated by Thrift Compiler (0.9.3)
+# Autogenerated by Thrift Compiler (0.10.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/ruby/proxy_constants.rb
--
diff --git a/proxy/src/main/ruby/proxy_constants.rb 
b/proxy/src/main/ruby/proxy_constants.rb
index baaf9af..47eb2cf 100644
--- a/proxy/src/main/ruby/proxy_constants.rb
+++ b/proxy/src/main/ruby/proxy_constants.rb
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Autogenerated by Thrift Compiler (0.9.3)
+# Autogenerated by Thrift Compiler (0.10.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/ruby/proxy_types.rb
--
diff --git a/proxy/src/main/ruby/proxy_types.rb 
b/proxy/src/main/ruby/proxy_types.rb
index e542df6..163e2df 100644
--- a/proxy/src/main/ruby/proxy_types.rb
+++ b/proxy/src/main/ruby/proxy_types.rb
@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Autogenerated by Thrift Compiler (0.9.3)
+# Autogenerated by Thrift Compiler (0.10.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/Annotation.java
--
diff --git 
a/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/Annotation.java 
b/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/Annotation.java
index 3997c21..ee36b66 100644
--- 
a/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/Annotation.java
+++ 
b/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/Annotation.java
@@ -15,66 +15,36 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.tracer.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class Annotation 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("Annotation");
 
   private static final org.apache.thrift.protocol.TField TIME_FIELD_DESC = new 
org.apache.thrift.protocol.TField("time", org.apache.thrift.protocol.TType.I64, 
(short)1);
   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)2);
 
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new AnnotationStandardSchemeFactory());
-schemes.put(TupleScheme.class, new AnnotationTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new

[37/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/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 aa828d4..a8ec8c9 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,42 +15,15 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.core.client.impl.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class ThriftTest {
 
   public interface Iface {
@@ -65,15 +38,15 @@ public class ThriftTest {
 
   public interface AsyncIface {
 
-public void success(org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
+public void 
success(org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
-public void fails(org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
+public void 
fails(org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
-public void throwsError(org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
+public void 
throwsError(org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException;
 
   }
 
-  public static class Client extends org.apache.thrift.TServiceClient 
implements Iface {
+  public static class Client extends 
org.apache.accumulo.core.rpc.TServiceClientWrapper implements Iface {
 public static class Factory implements 
org.apache.thrift.TServiceClientFactory {
   public Factory() {}
   public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
@@ -180,15 +153,15 @@ public class ThriftTest {
   super(protocolFactory, clientManager, transport);
 }
 
-public void success(org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException {
+public void 
success(org.apache.thrift.async.AsyncMethodCallback 
resultHandler) throws org.apache.thrift.TException {
   checkReady();
   success_call method_call = new success_call(resultHandler, this, 
___protocolFactory, ___transport);
   this.___currentMethod = method_call;
   ___manager.call(method_call);
 }
 
-public static class success_call extends 
org.apache.thrift.async.TAsyncMethodCall {
-  public success_call(org.apache.thrift.async.AsyncMethodCallback 
resultHandler, org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+public static class success_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+  public 
success_call(org.apache.thrift.async.AsyncMethodCallback 
resultHandler, org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
 super(client, protocolFactory, transport, resultHandler, false);
   }
 
@@ -199,9 +172,9 @@ public class ThriftTest {
 prot.writeMessageEnd();
   }
 
-  public boolean getResult() throws org.apache.thrift.TException {
+  public java.lang.Boolean getResult() throws org.apache.thrift.TException 
{
 if

[28/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
 
b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
index a9dfe2d..1612d1b 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterClientService.java
@@ -15,121 +15,94 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.core.master.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class MasterClientService {
 
   public interface Iface extends FateService.Iface {
 
-public long initiateFlush(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String tableName) throws 
org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, 
org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, 
org.apache.accumulo.core.client.impl.thrift.ThriftNotActiveServiceException, 
org.apache.thrift.TException;
+public long initiateFlush(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String tableName) throws 
org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, 
org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, 
org.apache.accumulo.core.client.impl.thrift.ThriftNotActiveServiceException, 
org.apache.thrift.TException;
 
-public void waitForFlush(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String tableName, ByteBuffer startRow, ByteBuffer endRow, long flushID, long 
maxLoops) throws 
org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, 
org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, 
org.apache.accumulo.core.client.impl.thrift.ThriftNotActiveServiceException, 
org.apache.thrift.TException;
+public void waitForFlush(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String tableName, java.nio.ByteBuffer startRow, java.nio.ByteBuffer 
endRow, long flushID, long maxLoops) throws 
org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, 
org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, 
org.apache.accumulo.core.client.impl.thrift.ThriftNotActiveServiceException, 
org.apache.thrift.TException;
 
-public void setTableProperty(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String tableName, String property, String value) throws 
org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, 
org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, 
org.apache.accumulo.core.client.impl.thrift.ThriftNotActiveServiceException, 
org.apache.thrift.TException;
+public void setTableProperty(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String tableName, java.lang.String property, java.lang.String value) 
throws org.apache.accumulo.core.client.impl.thrift.ThriftSecurityException, 
org.apache.accumulo.core.client.impl.thrift.ThriftTableOperationException, 
org.apache.accumulo.core.client.impl.thrift.ThriftNotActiveServiceException, 
org.apache.thrift.TException;
 
-

[25/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java 
b/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java
index 48d4465..ace2df8 100644
--- a/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java
+++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletSplit.java
@@ -15,66 +15,36 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.core.master.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class TabletSplit 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("TabletSplit");
 
   private static final org.apache.thrift.protocol.TField OLD_TABLET_FIELD_DESC 
= new org.apache.thrift.protocol.TField("oldTablet", 
org.apache.thrift.protocol.TType.STRUCT, (short)1);
   private static final org.apache.thrift.protocol.TField 
NEW_TABLETS_FIELD_DESC = new org.apache.thrift.protocol.TField("newTablets", 
org.apache.thrift.protocol.TType.LIST, (short)2);
 
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new TabletSplitStandardSchemeFactory());
-schemes.put(TupleScheme.class, new TabletSplitTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new TabletSplitStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new TabletSplitTupleSchemeFactory();
 
   public org.apache.accumulo.core.data.thrift.TKeyExtent oldTablet; // required
-  public List newTablets; // 
required
+  public java.util.List 
newTablets; // required
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 OLD_TABLET((short)1, "oldTablet"),
 NEW_TABLETS((short)2, "newTablets");
 
-private static final Map byName = new HashMap();
+private static final java.util.Map byName = new 
java.util.HashMap();
 
 static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
+  for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
 byName.put(field.getFieldName(), field);
   }
 }
@@ -99,21 +69,21 @@ public class TabletSplit implements 
org.apache.thrift.TBase

[31/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/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 949771e..6b8da94 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
@@ -15,42 +15,15 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.core.gc.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class GCMonitorService {
 
   public interface Iface {
@@ -61,11 +34,11 @@ public class GCMonitorService {
 
   public interface AsyncIface {
 
-public void getStatus(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+public void getStatus(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
 
   }
 
-  public static class Client extends org.apache.thrift.TServiceClient 
implements Iface {
+  public static class Client extends 
org.apache.accumulo.core.rpc.TServiceClientWrapper implements Iface {
 public static class Factory implements 
org.apache.thrift.TServiceClientFactory {
   public Factory() {}
   public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
@@ -130,17 +103,17 @@ public class GCMonitorService {
   super(protocolFactory, clientManager, transport);
 }
 
-public void getStatus(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
+public void getStatus(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException {
   checkReady();
   getStatus_call method_call = new getStatus_call(tinfo, credentials, 
resultHandler, this, ___protocolFactory, ___transport);
   this.___currentMethod = method_call;
   ___manager.call(method_call);
 }
 
-public static class getStatus_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+public static class getStatus_call extends 
org.apache.thrift.async.TAsyncMethodCall {
   private org.apache.accumulo.core.trace.thrift.TInfo tinfo;
   private org.apache.accumulo.core.security.thrift.TCredentials 
credentials;
-  public getStatus_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory, 
org.apache.thrift.transport.TNonblockingTransport transport) throws 
org.apache.thrift.TException {
+  public getStatus_call(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.thrift.async.AsyncMethodCallback resultHandler, 
org.apache.thrift.async.TAsyncClient client, 
org.apache.thrift.protocol.TProtocolFactory protocolFactory,

[15/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/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 150de3e..518146b 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,453 +15,426 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.proxy.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class AccumuloProxy {
 
   public interface Iface {
 
-public ByteBuffer login(String principal, Map 
loginProperties) throws AccumuloSecurityException, org.apache.thrift.TException;
+public java.nio.ByteBuffer login(java.lang.String principal, 
java.util.Map loginProperties) throws 
AccumuloSecurityException, org.apache.thrift.TException;
 
-public int addConstraint(ByteBuffer login, String tableName, String 
constraintClassName) throws AccumuloException, AccumuloSecurityException, 
TableNotFoundException, org.apache.thrift.TException;
+public int addConstraint(java.nio.ByteBuffer login, java.lang.String 
tableName, java.lang.String constraintClassName) throws AccumuloException, 
AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException;
 
-public void addSplits(ByteBuffer login, String tableName, Set 
splits) throws AccumuloException, AccumuloSecurityException, 
TableNotFoundException, org.apache.thrift.TException;
+public void addSplits(java.nio.ByteBuffer login, java.lang.String 
tableName, java.util.Set splits) throws AccumuloException, 
AccumuloSecurityException, TableNotFoundException, org.apache.thrift.TException;
 
-public void attachIterator(ByteBuffer login, String tableName, 
IteratorSetting setting, Set scopes) throws 
AccumuloSecurityException, AccumuloException, TableNotFoundException, 
org.apache.thrift.TException;
+public void attachIterator(java.nio.ByteBuffer login, java.lang.String 
tableName, IteratorSetting setting, java.util.Set scopes) throws 
AccumuloSecurityException, AccumuloException, TableNotFoundException, 
org.apache.thrift.TException;
 
-public void checkIteratorConflicts(ByteBuffer login, String tableName, 
IteratorSetting setting, Set scopes) throws 
AccumuloSecurityException, AccumuloException, TableNotFoundException, 
org.apache.thrift.TException;
+public void checkIteratorConflicts(java.nio.ByteBuffer login, 
java.lang.String tableName, IteratorSetting setting, 
java.util.Set scopes) throws AccumuloSecurityException, 
AccumuloException, TableNotFoundException, org.apache.thrift.TException;
 
-public void clearLocatorCache(ByteBuffer login, String tableName) throws 
TableNotFoundException, org.apache.thrift.TException;
+public void clearLocatorCache(java.nio.ByteBuffer login, java.lang.String 
tableName) throws TableNotFoundException, org.apache.thrift.TException;
 
-public void cloneTable(ByteBuffer login, String tableName, String 
newTableName, boolean flush, Map propertiesToSet, Set 
propertiesToExclude) throws AccumuloException, AccumuloSecurityException, 
TableNotFoundException, TableExistsException, org.apache.thrift.TException;
+public void cloneTable(java.nio.ByteBuffer login, java.lang.String 
tableName, java.lang.String newTableName, boolean flush, 
java.util.Map propertiesToSet, 
java.util.Set propertiesToExclude) throws AccumuloException,

[19/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
index 3ee05a2..8575f30 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/ActiveScan.java
@@ -15,42 +15,15 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.core.tabletserver.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class ActiveScan 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("ActiveScan");
 
@@ -69,15 +42,12 @@ public class ActiveScan implements 
org.apache.thrift.TBase schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new ActiveScanStandardSchemeFactory());
-schemes.put(TupleScheme.class, new ActiveScanTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new ActiveScanStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new ActiveScanTupleSchemeFactory();
 
-  public String client; // required
-  public String user; // required
-  public String tableId; // required
+  public java.lang.String client; // required
+  public java.lang.String user; // required
+  public java.lang.String tableId; // required
   public long age; // required
   public long idleTime; // required
   /**
@@ -91,12 +61,12 @@ public class ActiveScan implements 
org.apache.thrift.TBase> ssio; // required
-  public List authorizations; // required
+  public java.util.List columns; 
// required
+  public java.util.List 
ssiList; // required
+  public 
java.util.Map>
 ssio; // required
+  public java.util.List authorizations; // required
   public long scanId; // optional
-  public String classLoaderContext; // required
+  public java.lang.String classLoaderContext; // required
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -123,10 +93,10 @@ public class ActiveScan implements 
org.apache.thrift.TBase byName = new HashMap();
+private static final java.util.Map byName = new

[08/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanColumn.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanColumn.java 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanColumn.java
index 3cea424..1eb2b48 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanColumn.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ScanColumn.java
@@ -15,66 +15,36 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.proxy.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class ScanColumn 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("ScanColumn");
 
   private static final org.apache.thrift.protocol.TField COL_FAMILY_FIELD_DESC 
= new org.apache.thrift.protocol.TField("colFamily", 
org.apache.thrift.protocol.TType.STRING, (short)1);
   private static final org.apache.thrift.protocol.TField 
COL_QUALIFIER_FIELD_DESC = new 
org.apache.thrift.protocol.TField("colQualifier", 
org.apache.thrift.protocol.TType.STRING, (short)2);
 
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new ScanColumnStandardSchemeFactory());
-schemes.put(TupleScheme.class, new ScanColumnTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new ScanColumnStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new ScanColumnTupleSchemeFactory();
 
-  public ByteBuffer colFamily; // required
-  public ByteBuffer colQualifier; // optional
+  public java.nio.ByteBuffer colFamily; // required
+  public java.nio.ByteBuffer colQualifier; // optional
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 COL_FAMILY((short)1, "colFamily"),
 COL_QUALIFIER((short)2, "colQualifier");
 
-private static final Map byName = new HashMap();
+private static final java.util.Map byName = new 
java.util.HashMap();
 
 static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
+  for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
 byName.put(field.getFieldName(), field);
   }
 }
@@ -99,21 +69,21 @@ public class ScanColumn implements 
org.apache.thrift.TBase

[01/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

Repository: accumulo
Updated Branches:
  refs/heads/master 8be77dfd9 -> 62bbce43e


http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/TestService.java
--
diff --git 
a/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/TestService.java
 
b/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/TestService.java
index f99c2c8..60de00a 100644
--- 
a/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/TestService.java
+++ 
b/server/tracer/src/main/java/org/apache/accumulo/tracer/thrift/TestService.java
@@ -15,57 +15,30 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.tracer.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class TestService {
 
   public interface Iface {
 
-public boolean checkTrace(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, String message) throws org.apache.thrift.TException;
+public boolean checkTrace(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, java.lang.String message) throws org.apache.thrift.TException;
 
   }
 
   public interface AsyncIface {
 
-public void checkTrace(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
String message, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
+public void checkTrace(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
java.lang.String message, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
 
   }
 
-  public static class Client extends org.apache.thrift.TServiceClient 
implements Iface {
+  public static class Client extends 
org.apache.accumulo.core.rpc.TServiceClientWrapper implements Iface {
 public static class Factory implements 
org.apache.thrift.TServiceClientFactory {
   public Factory() {}
   public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
@@ -85,13 +58,13 @@ public class TestService {
   super(iprot, oprot);
 }
 
-public boolean checkTrace(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, String message) throws org.apache.thrift.TException
+public boolean checkTrace(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, java.lang.String message) throws org.apache.thrift.TException
 {
   send_checkTrace(tinfo, message);
   return recv_checkTrace();
 }
 
-public void send_checkTrace(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, String message) throws org.apache.thrift.TException
+public void send_checkTrace(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, java.lang.String message) throws org.apache.thrift.TException
 {
   checkTrace_args args = new checkTrace_args();
   args.setTinfo(tinfo);
@@ -127,17 +100,17 @@ public class TestService {
   super(protocolFactory, clientManager, transport);
 }
 
-public void checkTrace(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
String message, org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException {
+public void checkTrace(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
java.lang.String message, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException {
   checkReady();
   checkTrace_call method_call = new checkTrace_call(tinfo, message, 
resultHandler, this, ___protocolFactory, ___transport);
   this.___currentMethod = method_call;
   ___manager.call(method_call);
 }
 
-public static class checkTrace_call extends 
org.apache.thrift.async.TAsyncMethodCall {
+public static class checkTrace_call extends

[13/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java
index 777e075..8b9e20f 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/BatchScanOptions.java
@@ -15,42 +15,15 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.proxy.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class BatchScanOptions 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("BatchScanOptions");
 
@@ -60,16 +33,13 @@ public class BatchScanOptions implements 
org.apache.thrift.TBase, SchemeFactory> schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new 
BatchScanOptionsStandardSchemeFactory());
-schemes.put(TupleScheme.class, new BatchScanOptionsTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new BatchScanOptionsStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new BatchScanOptionsTupleSchemeFactory();
 
-  public Set authorizations; // optional
-  public List ranges; // optional
-  public List columns; // optional
-  public List iterators; // optional
+  public java.util.Set authorizations; // optional
+  public java.util.List ranges; // optional
+  public java.util.List columns; // optional
+  public java.util.List iterators; // optional
   public int threads; // optional
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
@@ -80,10 +50,10 @@ public class BatchScanOptions implements 
org.apache.thrift.TBase byName = new HashMap();
+private static final java.util.Map byName = new 
java.util.HashMap();
 
 static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
+  for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
 byName.put(field.getFieldName(), field);
   }
 }
@@ -114,21 +84,21 @@ public class BatchScanOptions implements 
org.apache.thrift.TBase 
metaDataMap;
+  public static final java.util.Map<_Fields, 
org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = 
new java.util.EnumMap<_Fields, 
org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
 tmpMap.put(_Fields.AUTHORIZATIONS, new 
org.apache.thrift.meta_data.FieldMetaData("authorizations", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
 new 
org.apache.thrift.meta_data.SetMetaData(org.apache.thrift.protocol.TType.SET, 
 new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING
, true;
@@ -163,7 +133,7 @@ public class BatchScanOptions implements 
org.apache.thrift.TBase __this__authorizations = new 
HashSet(other.authorizations);
+  java.util.Set __this__authorizations = new

[27/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java
 
b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java
index 2891727..36eea21 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/master/thrift/MasterGoalState.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,11 +23,8 @@
 package org.apache.accumulo.core.master.thrift;
 
 
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
 
-@SuppressWarnings({"unused"}) public enum MasterGoalState implements 
org.apache.thrift.TEnum {
+public enum MasterGoalState implements org.apache.thrift.TEnum {
   CLEAN_STOP(0),
   SAFE_MODE(1),
   NORMAL(2);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/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 9e7b8ea..f6be4d6 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,42 +15,15 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.core.master.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 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");
 
@@ -64,15 +37,12 @@ public class MasterMonitorInfo implements 
org.apache.thrift.TBase, SchemeFactory> schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new 
MasterMonitorInfoStandardSchemeFactory());
-schemes.put(TupleScheme.class, new MasterMonitorInfoTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new MasterMonitorInfoStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new MasterMonitorInfoTupleSchemeFactory();
 
-  public Map tableMap; // required
-  public List tServerInfo; // required
-  public Map badTServers; // required
+  public java.util.Map tableMap; // required
+  public java.util.List tServerInfo; // required
+  public java.util.Map badTServers; // 
required
   /**
* 
* @see MasterState
@@ -84,9 +54,9 @@ public class MasterMonitorInfo implements 
org.apache.thrift.TBase serversShuttingDown; // required
-  public List deadTabletServers; // required
-  public List bulkImports; // required
+  public java.util.Set serversShuttingDown; // required
+  public java.util.List deadTabletServers; // required
+  public java.util.List bulkImports; // required
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating

[12/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionStrategyConfig.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionStrategyConfig.java
 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionStrategyConfig.java
index e8f7f88..03c0688 100644
--- 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionStrategyConfig.java
+++ 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/CompactionStrategyConfig.java
@@ -15,66 +15,36 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.proxy.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class CompactionStrategyConfig 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("CompactionStrategyConfig");
 
   private static final org.apache.thrift.protocol.TField CLASS_NAME_FIELD_DESC 
= new org.apache.thrift.protocol.TField("className", 
org.apache.thrift.protocol.TType.STRING, (short)1);
   private static final org.apache.thrift.protocol.TField OPTIONS_FIELD_DESC = 
new org.apache.thrift.protocol.TField("options", 
org.apache.thrift.protocol.TType.MAP, (short)2);
 
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new 
CompactionStrategyConfigStandardSchemeFactory());
-schemes.put(TupleScheme.class, new 
CompactionStrategyConfigTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new CompactionStrategyConfigStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new CompactionStrategyConfigTupleSchemeFactory();
 
-  public String className; // required
-  public Map options; // required
+  public java.lang.String className; // required
+  public java.util.Map options; // required
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 CLASS_NAME((short)1, "className"),
 OPTIONS((short)2, "options");
 
-private static final Map byName = new HashMap();
+private static final java.util.Map byName = new 
java.util.HashMap();
 
 static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
+  for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
 byName.put(field.getFieldName(), field);
   }
 }
@@ -99,21 +69,21 @@ public class CompactionStrategyConfig implements 
org.apache.thrift.TBase 
metaDataMap;
+  public static final java.util.Map<_Fields, 
org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = 
new java.util.EnumMap<_Fields, 
org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
 tmpMap.put(_Fields.CLASS_NAME, new 
org.apache.thrift.meta_data.FieldMetaData("className", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
 new

[36/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/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 fd59d4b..b3573cc 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,53 +15,23 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.core.data.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class InitialMultiScan 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("InitialMultiScan");
 
   private static final org.apache.thrift.protocol.TField SCAN_ID_FIELD_DESC = 
new org.apache.thrift.protocol.TField("scanID", 
org.apache.thrift.protocol.TType.I64, (short)1);
   private static final org.apache.thrift.protocol.TField RESULT_FIELD_DESC = 
new org.apache.thrift.protocol.TField("result", 
org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new 
InitialMultiScanStandardSchemeFactory());
-schemes.put(TupleScheme.class, new InitialMultiScanTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new InitialMultiScanStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new InitialMultiScanTupleSchemeFactory();
 
   public long scanID; // required
   public MultiScanResult result; // required
@@ -71,10 +41,10 @@ public class InitialMultiScan implements 
org.apache.thrift.TBase byName = new HashMap();
+private static final java.util.Map byName = new 
java.util.HashMap();
 
 static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
+  for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
 byName.put(field.getFieldName(), field);
   }
 }
@@ -99,21 +69,21 @@ public class InitialMultiScan implements 
org.apache.thrift.TBase 
metaDataMap;
+  public static final java.util.Map<_Fields, 
org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = 
new java.util.EnumMap<_Fields, 
org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
 tmpMap.put(_Fields.SCAN_ID, new 
org.apache.thrift.meta_data.FieldMetaData("scanID", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
 new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64
, "ScanID")));
 tmpMap.put(_Fields.RESULT, new 
org.apache.thrift.meta_data.FieldMetaData("result", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
 new 
org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT,
 MultiScanResult.class)));
-metaDataMap = Collections.unmodifiableMap(tmpMap);
+metaDataMap = java.util.Collections.unmodifiableMap(tmpMap);

[38/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java
 
b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java
index 143393e..2f4735b 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ConfigurationType.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,11 +23,8 @@
 package org.apache.accumulo.core.client.impl.thrift;
 
 
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
 
-@SuppressWarnings({"unused"}) public enum ConfigurationType implements 
org.apache.thrift.TEnum {
+public enum ConfigurationType implements org.apache.thrift.TEnum {
   CURRENT(0),
   SITE(1),
   DEFAULT(2);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/SecurityErrorCode.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/SecurityErrorCode.java
 
b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/SecurityErrorCode.java
index 8bc1964..28e83c7 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/SecurityErrorCode.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/SecurityErrorCode.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
@@ -23,11 +23,8 @@
 package org.apache.accumulo.core.client.impl.thrift;
 
 
-import java.util.Map;
-import java.util.HashMap;
-import org.apache.thrift.TEnum;
 
-@SuppressWarnings({"unused"}) public enum SecurityErrorCode implements 
org.apache.thrift.TEnum {
+public enum SecurityErrorCode implements org.apache.thrift.TEnum {
   DEFAULT_SECURITY_ERROR(0),
   BAD_CREDENTIALS(1),
   PERMISSION_DENIED(2),

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TDiskUsage.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TDiskUsage.java
 
b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TDiskUsage.java
index 30dc624..7058f3b 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TDiskUsage.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/TDiskUsage.java
@@ -15,55 +15,25 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.core.client.impl.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class TDiskUsage 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("TDiskUsage");
 
   private static final org.apache.thrift.protocol.TField TABLES_FIELD_DESC = 
new org.apache.thrift.protocol.TField("tables", 
org.apache.thrift.protocol.TType.LIST, (short)1);
   private

[04/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/python/constants.py
--
diff --git a/proxy/src/main/python/constants.py 
b/proxy/src/main/python/constants.py
index 8139236..3b2f97a 100644
--- a/proxy/src/main/python/constants.py
+++ b/proxy/src/main/python/constants.py
@@ -13,13 +13,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Autogenerated by Thrift Compiler (0.9.3)
+# Autogenerated by Thrift Compiler (0.10.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
 #  options string: py
 #
 
-from thrift.Thrift import TType, TMessageType, TException, 
TApplicationException
-from ttypes import *
-
+from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, 
TApplicationException
+from thrift.protocol.TProtocol import TProtocolException
+import sys
+from .ttypes import *

[40/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

ACCUMULO-4551 Add thrift-gen changes from 0.10.0


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

Branch: refs/heads/master
Commit: 62bbce43ede2dade0a229e22fdd581cf917e6bf3
Parents: ead6674
Author: Christopher Tubbs 
Authored: Sat Feb 4 23:49:35 2017 -0500
Committer: Christopher Tubbs 
Committed: Thu Feb 9 14:27:47 2017 -0500

--
 .../core/client/impl/thrift/ClientService.java  |  8983 +--
 .../client/impl/thrift/ConfigurationType.java   | 7 +-
 .../client/impl/thrift/SecurityErrorCode.java   | 7 +-
 .../core/client/impl/thrift/TDiskUsage.java |   160 +-
 .../core/client/impl/thrift/TableOperation.java | 7 +-
 .../thrift/TableOperationExceptionType.java | 7 +-
 .../thrift/ThriftNotActiveServiceException.java |   104 +-
 .../impl/thrift/ThriftSecurityException.java|   136 +-
 .../thrift/ThriftTableOperationException.java   |   183 +-
 .../core/client/impl/thrift/ThriftTest.java |   720 +-
 .../core/data/thrift/InitialMultiScan.java  |   130 +-
 .../accumulo/core/data/thrift/InitialScan.java  |   130 +-
 .../accumulo/core/data/thrift/IterInfo.java |   159 +-
 .../accumulo/core/data/thrift/MapFileInfo.java  |   121 +-
 .../core/data/thrift/MultiScanResult.java   |   264 +-
 .../accumulo/core/data/thrift/ScanResult.java   |   148 +-
 .../accumulo/core/data/thrift/TCMResult.java|   130 +-
 .../accumulo/core/data/thrift/TCMStatus.java| 7 +-
 .../accumulo/core/data/thrift/TColumn.java  |   181 +-
 .../accumulo/core/data/thrift/TCondition.java   |   261 +-
 .../core/data/thrift/TConditionalMutation.java  |   157 +-
 .../core/data/thrift/TConditionalSession.java   |   155 +-
 .../thrift/TConstraintViolationSummary.java |   174 +-
 .../apache/accumulo/core/data/thrift/TKey.java  |   221 +-
 .../accumulo/core/data/thrift/TKeyExtent.java   |   181 +-
 .../accumulo/core/data/thrift/TKeyValue.java|   140 +-
 .../accumulo/core/data/thrift/TMutation.java|   247 +-
 .../accumulo/core/data/thrift/TRange.java   |   184 +-
 .../accumulo/core/data/thrift/UpdateErrors.java |   203 +-
 .../core/gc/thrift/GCMonitorService.java|   296 +-
 .../accumulo/core/gc/thrift/GCStatus.java   |   142 +-
 .../accumulo/core/gc/thrift/GcCycleStats.java   |   196 +-
 .../core/master/thrift/BulkImportState.java | 7 +-
 .../core/master/thrift/BulkImportStatus.java|   149 +-
 .../accumulo/core/master/thrift/Compacting.java |   136 +-
 .../accumulo/core/master/thrift/DeadServer.java |   159 +-
 .../core/master/thrift/FateOperation.java   | 7 +-
 .../core/master/thrift/FateService.java |  1337 +-
 .../core/master/thrift/MasterClientService.java |  5295 +-
 .../core/master/thrift/MasterGoalState.java | 7 +-
 .../core/master/thrift/MasterMonitorInfo.java   |   339 +-
 .../core/master/thrift/MasterState.java | 7 +-
 .../core/master/thrift/RecoveryException.java   |   127 +-
 .../core/master/thrift/RecoveryStatus.java  |   155 +-
 .../accumulo/core/master/thrift/TableInfo.java  |   294 +-
 .../core/master/thrift/TabletLoadState.java | 7 +-
 .../core/master/thrift/TabletServerStatus.java  |   402 +-
 .../core/master/thrift/TabletSplit.java |   142 +-
 .../core/replication/thrift/KeyValues.java  |   133 +-
 .../thrift/RemoteReplicationErrorCode.java  | 7 +-
 .../thrift/RemoteReplicationException.java  |   136 +-
 .../thrift/ReplicationCoordinator.java  |   332 +-
 .../thrift/ReplicationCoordinatorErrorCode.java | 7 +-
 .../thrift/ReplicationCoordinatorException.java |   136 +-
 .../replication/thrift/ReplicationServicer.java |   620 +-
 .../core/replication/thrift/WalEdits.java   |   145 +-
 .../security/thrift/TAuthenticationKey.java |   182 +-
 .../thrift/TAuthenticationTokenIdentifier.java  |   193 +-
 .../core/security/thrift/TCredentials.java  |   188 +-
 .../core/security/thrift/TDelegationToken.java  |   140 +-
 .../security/thrift/TDelegationTokenConfig.java |   123 +-
 .../core/tabletserver/thrift/ActionStats.java   |   226 +-
 .../tabletserver/thrift/ActiveCompaction.java   |   373 +-
 .../core/tabletserver/thrift/ActiveScan.java|   446 +-
 .../tabletserver/thrift/CompactionReason.java   | 7 +-
 .../tabletserver/thrift/CompactionType.java | 7 +-
 .../thrift/ConstraintViolationException.java|   135 +-
 .../tabletserver/thrift/IteratorConfig.java |   133 +-
 .../thrift/NoSuchScanIDException.java   |   104 +-
 .../thrift/NotServingTabletException.java   |   117 +-
 .../core/tabletserver/thrift/ScanState.java | 7 +-
 .../core/tabletserver/thrift/ScanType.java  | 7 +-

[21/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationToken.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationToken.java
 
b/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationToken.java
index 9e2b3a0..ade9302 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationToken.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/security/thrift/TDelegationToken.java
@@ -15,55 +15,25 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.core.security.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class TDelegationToken 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("TDelegationToken");
 
   private static final org.apache.thrift.protocol.TField PASSWORD_FIELD_DESC = 
new org.apache.thrift.protocol.TField("password", 
org.apache.thrift.protocol.TType.STRING, (short)1);
   private static final org.apache.thrift.protocol.TField IDENTIFIER_FIELD_DESC 
= new org.apache.thrift.protocol.TField("identifier", 
org.apache.thrift.protocol.TType.STRUCT, (short)2);
 
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new 
TDelegationTokenStandardSchemeFactory());
-schemes.put(TupleScheme.class, new TDelegationTokenTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new TDelegationTokenStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new TDelegationTokenTupleSchemeFactory();
 
-  public ByteBuffer password; // required
+  public java.nio.ByteBuffer password; // required
   public TAuthenticationTokenIdentifier identifier; // required
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
@@ -71,10 +41,10 @@ public class TDelegationToken implements 
org.apache.thrift.TBase byName = new HashMap();
+private static final java.util.Map byName = new 
java.util.HashMap();
 
 static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
+  for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
 byName.put(field.getFieldName(), field);
   }
 }
@@ -99,21 +69,21 @@ public class TDelegationToken implements 
org.apache.thrift.TBase 
metaDataMap;
+  public static final java.util.Map<_Fields, 
org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = 
new java.util.EnumMap<_Fields, 
org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
 tmpMap.put(_Fields.PASSWORD, new 
org.apache.thrift.meta_data.FieldMetaData("password", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
 new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING
, true)));
 tmpMap.put(_Fields.IDENTIFIER, new 
org.apache.thrift.meta_data.FieldMetaData("identifier", 
org.apache.thrift.TFieldRequirementType.DEFAULT, 
 new

[05/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/python/AccumuloProxy.py
--
diff --git a/proxy/src/main/python/AccumuloProxy.py 
b/proxy/src/main/python/AccumuloProxy.py
index 19bd257..ea6e63a 100644
--- a/proxy/src/main/python/AccumuloProxy.py
+++ b/proxy/src/main/python/AccumuloProxy.py
@@ -13,83 +13,8495 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Autogenerated by Thrift Compiler (0.9.3)
+# Autogenerated by Thrift Compiler (0.10.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
 #  options string: py
 #
 
-from thrift.Thrift import TType, TMessageType, TException, 
TApplicationException
+from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, 
TApplicationException
+from thrift.protocol.TProtocol import TProtocolException
+import sys
 import logging
-from ttypes import *
+from .ttypes import *
 from thrift.Thrift import TProcessor
 from thrift.transport import TTransport
-from thrift.protocol import TBinaryProtocol, TProtocol
-try:
-  from thrift.protocol import fastbinary
-except:
-  fastbinary = None
 
 
-class Iface:
-  def login(self, principal, loginProperties):
+class Iface(object):
+def login(self, principal, loginProperties):
+"""
+Parameters:
+ - principal
+ - loginProperties
+"""
+pass
+
+def addConstraint(self, login, tableName, constraintClassName):
+"""
+Parameters:
+ - login
+ - tableName
+ - constraintClassName
+"""
+pass
+
+def addSplits(self, login, tableName, splits):
+"""
+Parameters:
+ - login
+ - tableName
+ - splits
+"""
+pass
+
+def attachIterator(self, login, tableName, setting, scopes):
+"""
+Parameters:
+ - login
+ - tableName
+ - setting
+ - scopes
+"""
+pass
+
+def checkIteratorConflicts(self, login, tableName, setting, scopes):
+"""
+Parameters:
+ - login
+ - tableName
+ - setting
+ - scopes
+"""
+pass
+
+def clearLocatorCache(self, login, tableName):
+"""
+Parameters:
+ - login
+ - tableName
+"""
+pass
+
+def cloneTable(self, login, tableName, newTableName, flush, 
propertiesToSet, propertiesToExclude):
+"""
+Parameters:
+ - login
+ - tableName
+ - newTableName
+ - flush
+ - propertiesToSet
+ - propertiesToExclude
+"""
+pass
+
+def compactTable(self, login, tableName, startRow, endRow, iterators, 
flush, wait, compactionStrategy):
+"""
+Parameters:
+ - login
+ - tableName
+ - startRow
+ - endRow
+ - iterators
+ - flush
+ - wait
+ - compactionStrategy
+"""
+pass
+
+def cancelCompaction(self, login, tableName):
+"""
+Parameters:
+ - login
+ - tableName
+"""
+pass
+
+def createTable(self, login, tableName, versioningIter, type):
+"""
+Parameters:
+ - login
+ - tableName
+ - versioningIter
+ - type
+"""
+pass
+
+def deleteTable(self, login, tableName):
+"""
+Parameters:
+ - login
+ - tableName
+"""
+pass
+
+def deleteRows(self, login, tableName, startRow, endRow):
+"""
+Parameters:
+ - login
+ - tableName
+ - startRow
+ - endRow
+"""
+pass
+
+def exportTable(self, login, tableName, exportDir):
+"""
+Parameters:
+ - login
+ - tableName
+ - exportDir
+"""
+pass
+
+def flushTable(self, login, tableName, startRow, endRow, wait):
+"""
+Parameters:
+ - login
+ - tableName
+ - startRow
+ - endRow
+ - wait
+"""
+pass
+
+def getDiskUsage(self, login, tables):
+"""
+Parameters:
+ - login
+ - tables
+"""
+pass
+
+def getLocalityGroups(self, login, tableName):
+"""
+Parameters:
+ - login
+ - tableName
+"""
+pass
+
+def getIteratorSetting(self, login, tableName, iteratorName, scope):
+"""
+Parameters:
+ - login
+ - tableName
+ - iteratorName
+ - scope
+"""
+pass
+
+def getMaxRow(self, login, tableName, auths, startRow, startInclusive, 
endRow, endInclusive):
+"""
+Parameters:
+ - login
+ - tableName
+ - auths
+ - startRow
+ - startInclusive
+ -

[14/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/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 f77a908..7ac823d 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,63 +15,33 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.proxy.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
-public class AccumuloSecurityException extends TException implements 
org.apache.thrift.TBase, java.io.Serializable, Cloneable, 
Comparable {
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
+public class AccumuloSecurityException extends org.apache.thrift.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);
 
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new 
AccumuloSecurityExceptionStandardSchemeFactory());
-schemes.put(TupleScheme.class, new 
AccumuloSecurityExceptionTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new AccumuloSecurityExceptionStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new AccumuloSecurityExceptionTupleSchemeFactory();
 
-  public String msg; // required
+  public java.lang.String msg; // required
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 MSG((short)1, "msg");
 
-private static final Map byName = new HashMap();
+private static final java.util.Map byName = new 
java.util.HashMap();
 
 static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
+  for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
 byName.put(field.getFieldName(), field);
   }
 }
@@ -94,21 +64,21 @@ public class AccumuloSecurityException extends TException 
implements org.apache.
  */
 public static _Fields findByThriftIdOrThrow(int fieldId) {
   _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
+  if (fields == null) throw new java.lang.IllegalArgumentException("Field 
" + fieldId + " doesn't exist!");
   return fields;
 }
 
 /**
  * Find the _Fields constant that matches name, or null if its not found.
  */
-public static _Fields findByName(String name) {
+public static _Fields findByName(java.lang.String name) {
   return byName.get(name);
 }
 
 private final short _thriftId;
-private final String _fieldName;
+private final java.lang.String _fieldName;
 
-_Fields(short thriftId, String fieldName) {
+

[39/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
 
b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
index 0df0107..af65874 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/client/impl/thrift/ClientService.java
@@ -15,173 +15,146 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.core.client.impl.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class ClientService {
 
   public interface Iface {
 
-public String getRootTabletLocation() throws org.apache.thrift.TException;
+public java.lang.String getRootTabletLocation() throws 
org.apache.thrift.TException;
 
-public String getInstanceId() throws org.apache.thrift.TException;
+public java.lang.String getInstanceId() throws 
org.apache.thrift.TException;
 
-public String getZooKeepers() throws org.apache.thrift.TException;
+public java.lang.String getZooKeepers() throws 
org.apache.thrift.TException;
 
-public List 
bulkImportFiles(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, 
String tableId, List files, String errorDir, boolean setTime) throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException;
+public java.util.List 
bulkImportFiles(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, long tid, 
java.lang.String tableId, java.util.List files, 
java.lang.String errorDir, boolean setTime) throws ThriftSecurityException, 
ThriftTableOperationException, org.apache.thrift.TException;
 
 public boolean isActive(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
long tid) throws org.apache.thrift.TException;
 
 public void ping(org.apache.accumulo.core.security.thrift.TCredentials 
credentials) throws ThriftSecurityException, org.apache.thrift.TException;
 
-public List getDiskUsage(Set tables, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException;
+public java.util.List 
getDiskUsage(java.util.Set tables, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) throws 
ThriftSecurityException, ThriftTableOperationException, 
org.apache.thrift.TException;
 
-public Set 
listLocalUsers(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) throws 
ThriftSecurityException, org.apache.thrift.TException;
+public java.util.Set 
listLocalUsers(org.apache.accumulo.core.trace.thrift.TInfo tinfo, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) throws 
ThriftSecurityException, org.apache.thrift.TException;
 
-public void createLocalUser(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
String principal, ByteBuffer password) throws ThriftSecurityException, 
org.apache.thrift.TException;
+public void createLocalUser(org.apache.accumulo.core.trace.thrift.TInfo 
tinfo, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
java.lang.String principal, java.nio.ByteBuffer password) throws 
ThriftSecurityException, org.apache.thrift.TException;
 
-public void

[07/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableNotFoundException.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableNotFoundException.java
 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableNotFoundException.java
index d889faf..1bc9529 100644
--- 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableNotFoundException.java
+++ 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/TableNotFoundException.java
@@ -15,63 +15,33 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.proxy.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
-public class TableNotFoundException extends TException implements 
org.apache.thrift.TBase, java.io.Serializable, Cloneable, 
Comparable {
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
+public class TableNotFoundException extends org.apache.thrift.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("TableNotFoundException");
 
   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);
 
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new 
TableNotFoundExceptionStandardSchemeFactory());
-schemes.put(TupleScheme.class, new 
TableNotFoundExceptionTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new TableNotFoundExceptionStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new TableNotFoundExceptionTupleSchemeFactory();
 
-  public String msg; // required
+  public java.lang.String msg; // required
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 MSG((short)1, "msg");
 
-private static final Map byName = new HashMap();
+private static final java.util.Map byName = new 
java.util.HashMap();
 
 static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
+  for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
 byName.put(field.getFieldName(), field);
   }
 }
@@ -94,21 +64,21 @@ public class TableNotFoundException extends TException 
implements org.apache.thr
  */
 public static _Fields findByThriftIdOrThrow(int fieldId) {
   _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
+  if (fields == null) throw new java.lang.IllegalArgumentException("Field 
" + fieldId + " doesn't exist!");
   return fields;
 }
 
 /**
  * Find the _Fields constant that matches name, or null if its not found.
  */
-public static _Fields findByName(String name) {
+public static _Fields findByName(java.lang.String name) {
   return byName.get(name);
 }
 
 private final short _thriftId;
-private final String _fieldName;
+private final java.lang.String _fieldName;
 
-_Fields(short thriftId, String fieldName) {
+_Fields(short thriftId, java.lang.String

[23/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationServicer.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationServicer.java
 
b/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationServicer.java
index 8403b56..5fddb64 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationServicer.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/replication/thrift/ReplicationServicer.java
@@ -15,61 +15,34 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.core.replication.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class ReplicationServicer {
 
   public interface Iface {
 
-public long replicateLog(String remoteTableId, WalEdits data, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) throws 
RemoteReplicationException, org.apache.thrift.TException;
+public long replicateLog(java.lang.String remoteTableId, WalEdits data, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) throws 
RemoteReplicationException, org.apache.thrift.TException;
 
-public long replicateKeyValues(String remoteTableId, KeyValues data, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) throws 
RemoteReplicationException, org.apache.thrift.TException;
+public long replicateKeyValues(java.lang.String remoteTableId, KeyValues 
data, org.apache.accumulo.core.security.thrift.TCredentials credentials) throws 
RemoteReplicationException, org.apache.thrift.TException;
 
   }
 
   public interface AsyncIface {
 
-public void replicateLog(String remoteTableId, WalEdits data, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+public void replicateLog(java.lang.String remoteTableId, WalEdits data, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
 
-public void replicateKeyValues(String remoteTableId, KeyValues data, 
org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) throws 
org.apache.thrift.TException;
+public void replicateKeyValues(java.lang.String remoteTableId, KeyValues 
data, org.apache.accumulo.core.security.thrift.TCredentials credentials, 
org.apache.thrift.async.AsyncMethodCallback resultHandler) 
throws org.apache.thrift.TException;
 
   }
 
-  public static class Client extends org.apache.thrift.TServiceClient 
implements Iface {
+  public static class Client extends 
org.apache.accumulo.core.rpc.TServiceClientWrapper implements Iface {
 public static class Factory implements 
org.apache.thrift.TServiceClientFactory {
   public Factory() {}
   public Client getClient(org.apache.thrift.protocol.TProtocol prot) {
@@ -89,13 +62,13 @@ public class ReplicationServicer {
   super(iprot, oprot);
 }
 
-public long replicateLog(String remoteTableId, WalEdits data, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) throws 
RemoteReplicationException, org.apache.thrift.TException
+public long replicateLog(java.lang.String remoteTableId, WalEdits data, 
org.apache.accumulo.core.security.thrift.TCredentials credentials) throws 
RemoteReplicationException, org.apache.thrift.TException
 {
   send_replicateLog(remoteTableId, data, credentials);
   return recv_replicateLog();
 }
 
-

[10/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Key.java
--
diff --git a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Key.java 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Key.java
index 93237c5..d935c9a 100644
--- a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Key.java
+++ b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/Key.java
@@ -15,42 +15,15 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.proxy.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class Key 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("Key");
 
@@ -60,16 +33,13 @@ public class Key implements org.apache.thrift.TBase, java.io.S
   private static final org.apache.thrift.protocol.TField 
COL_VISIBILITY_FIELD_DESC = new 
org.apache.thrift.protocol.TField("colVisibility", 
org.apache.thrift.protocol.TType.STRING, (short)4);
   private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC 
= new org.apache.thrift.protocol.TField("timestamp", 
org.apache.thrift.protocol.TType.I64, (short)5);
 
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new KeyStandardSchemeFactory());
-schemes.put(TupleScheme.class, new KeyTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new KeyStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new KeyTupleSchemeFactory();
 
-  public ByteBuffer row; // required
-  public ByteBuffer colFamily; // required
-  public ByteBuffer colQualifier; // required
-  public ByteBuffer colVisibility; // required
+  public java.nio.ByteBuffer row; // required
+  public java.nio.ByteBuffer colFamily; // required
+  public java.nio.ByteBuffer colQualifier; // required
+  public java.nio.ByteBuffer colVisibility; // required
   public long timestamp; // optional
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
@@ -80,10 +50,10 @@ public class Key implements org.apache.thrift.TBase, java.io.S
 COL_VISIBILITY((short)4, "colVisibility"),
 TIMESTAMP((short)5, "timestamp");
 
-private static final Map byName = new HashMap();
+private static final java.util.Map byName = new 
java.util.HashMap();
 
 static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
+  for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
 byName.put(field.getFieldName(), field);
   }
 }
@@ -114,21 +84,21 @@ public class Key implements org.apache.thrift.TBase, java.io.S
  */
 public static _Fields findByThriftIdOrThrow(int fieldId) {
   _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
+  if (fields == null) throw new java.lang.IllegalArgumentException("Field 
" + fieldId + " doesn't exist!");
   return fields;
 }
 
 /**
  * Find the _Fields constant that matches name, or null if its not found.
  */
-public static _Fields findByName(String name) {
+public static _Fields findByName(java.lang.String name) {

[26/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java 
b/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java
index 5c385d7..d122cf4 100644
--- a/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java
+++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/TableInfo.java
@@ -15,42 +15,15 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.core.master.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class TableInfo 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("TableInfo");
 
@@ -67,11 +40,8 @@ public class TableInfo implements 
org.apache.thrift.TBase schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new TableInfoStandardSchemeFactory());
-schemes.put(TupleScheme.class, new TableInfoTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new TableInfoStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new TableInfoTupleSchemeFactory();
 
   public long recs; // required
   public long recsInMemory; // required
@@ -101,10 +71,10 @@ public class TableInfo implements 
org.apache.thrift.TBase byName = new HashMap();
+private static final java.util.Map byName = new 
java.util.HashMap();
 
 static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
+  for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
 byName.put(field.getFieldName(), field);
   }
 }
@@ -149,21 +119,21 @@ public class TableInfo implements 
org.apache.thrift.TBase

[16/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/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 95dd551..8051bf4 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,42 +15,15 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.core.tabletserver.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 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");
 
@@ -63,11 +36,8 @@ public class TabletStats implements 
org.apache.thrift.TBase schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new TabletStatsStandardSchemeFactory());
-schemes.put(TupleScheme.class, new TabletStatsTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new TabletStatsStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new TabletStatsTupleSchemeFactory();
 
   public org.apache.accumulo.core.data.thrift.TKeyExtent extent; // required
   public ActionStats majors; // required
@@ -89,10 +59,10 @@ public class TabletStats implements 
org.apache.thrift.TBase byName = new HashMap();
+private static final java.util.Map byName = new 
java.util.HashMap();
 
 static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
+  for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
 byName.put(field.getFieldName(), field);
   }
 }
@@ -129,21 +99,21 @@ public class TabletStats implements 
org.apache.thrift.TBase

[06/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/python/AccumuloProxy-remote
--
diff --git a/proxy/src/main/python/AccumuloProxy-remote 
b/proxy/src/main/python/AccumuloProxy-remote
index bc08e9b..a98dd67 100644
--- a/proxy/src/main/python/AccumuloProxy-remote
+++ b/proxy/src/main/python/AccumuloProxy-remote
@@ -14,7 +14,7 @@
 # limitations under the License.
 #!/usr/bin/env python
 #
-# Autogenerated by Thrift Compiler (0.9.3)
+# Autogenerated by Thrift Compiler (0.10.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
@@ -23,779 +23,802 @@
 
 import sys
 import pprint
-from urlparse import urlparse
-from thrift.transport import TTransport
-from thrift.transport import TSocket
-from thrift.transport import TSSLSocket
-from thrift.transport import THttpClient
-from thrift.protocol import TBinaryProtocol
+if sys.version_info[0] > 2:
+from urllib.parse import urlparse
+else:
+from urlparse import urlparse
+from thrift.transport import TTransport, TSocket, TSSLSocket, THttpClient
+from thrift.protocol.TBinaryProtocol import TBinaryProtocol
 
 from accumulo import AccumuloProxy
 from accumulo.ttypes import *
 
 if len(sys.argv) <= 1 or sys.argv[1] == '--help':
-  print('')
-  print('Usage: ' + sys.argv[0] + ' [-h host[:port]] [-u url] [-f[ramed]] 
[-s[sl]] function [arg1 [arg2...]]')
-  print('')
-  print('Functions:')
-  print('  string login(string principal,  loginProperties)')
-  print('  i32 addConstraint(string login, string tableName, string 
constraintClassName)')
-  print('  void addSplits(string login, string tableName,  splits)')
-  print('  void attachIterator(string login, string tableName, IteratorSetting 
setting,  scopes)')
-  print('  void checkIteratorConflicts(string login, string tableName, 
IteratorSetting setting,  scopes)')
-  print('  void clearLocatorCache(string login, string tableName)')
-  print('  void cloneTable(string login, string tableName, string 
newTableName, bool flush,  propertiesToSet,  propertiesToExclude)')
-  print('  void compactTable(string login, string tableName, string startRow, 
string endRow,  iterators, bool flush, bool wait, CompactionStrategyConfig 
compactionStrategy)')
-  print('  void cancelCompaction(string login, string tableName)')
-  print('  void createTable(string login, string tableName, bool 
versioningIter, TimeType type)')
-  print('  void deleteTable(string login, string tableName)')
-  print('  void deleteRows(string login, string tableName, string startRow, 
string endRow)')
-  print('  void exportTable(string login, string tableName, string exportDir)')
-  print('  void flushTable(string login, string tableName, string startRow, 
string endRow, bool wait)')
-  print('   getDiskUsage(string login,  tables)')
-  print('   getLocalityGroups(string login, string tableName)')
-  print('  IteratorSetting getIteratorSetting(string login, string tableName, 
string iteratorName, IteratorScope scope)')
-  print('  string getMaxRow(string login, string tableName,  auths, string 
startRow, bool startInclusive, string endRow, bool endInclusive)')
-  print('   getTableProperties(string login, string tableName)')
-  print('  void importDirectory(string login, string tableName, string 
importDir, string failureDir, bool setTime)')
-  print('  void importTable(string login, string tableName, string importDir)')
-  print('   listSplits(string login, string tableName, i32 maxSplits)')
-  print('   listTables(string login)')
-  print('   listIterators(string login, string tableName)')
-  print('   listConstraints(string login, string tableName)')
-  print('  void mergeTablets(string login, string tableName, string startRow, 
string endRow)')
-  print('  void offlineTable(string login, string tableName, bool wait)')
-  print('  void onlineTable(string login, string tableName, bool wait)')
-  print('  void removeConstraint(string login, string tableName, i32 
constraint)')
-  print('  void removeIterator(string login, string tableName, string 
iterName,  scopes)')
-  print('  void removeTableProperty(string login, string tableName, string 
property)')
-  print('  void renameTable(string login, string oldTableName, string 
newTableName)')
-  print('  void setLocalityGroups(string login, string tableName,  groups)')
-  print('  void setTableProperty(string login, string tableName, string 
property, string value)')
-  print('   splitRangeByTablets(string login, string tableName, Range range, 
i32 maxSplits)')
-  print('  bool tableExists(string login, string tableName)')
-  print('   tableIdMap(string login)')
-  print('  bool testTableClassLoad(string login, string tableName, string 
className, string asTypeName)')
-  print('  void pingTabletServer(string login, string tserver)')
-  print('   getActiveScans(string login, string tserver)')
-  print('   getActiveCompactions(string login, string tserver)')
-  print('

[33/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java
--
diff --git a/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java 
b/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java
index fc66459..9121dfd 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TKey.java
@@ -15,42 +15,15 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.core.data.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class TKey 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("TKey");
 
@@ -60,16 +33,13 @@ public class TKey implements org.apache.thrift.TBase, java.i
   private static final org.apache.thrift.protocol.TField 
COL_VISIBILITY_FIELD_DESC = new 
org.apache.thrift.protocol.TField("colVisibility", 
org.apache.thrift.protocol.TType.STRING, (short)4);
   private static final org.apache.thrift.protocol.TField TIMESTAMP_FIELD_DESC 
= new org.apache.thrift.protocol.TField("timestamp", 
org.apache.thrift.protocol.TType.I64, (short)5);
 
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new TKeyStandardSchemeFactory());
-schemes.put(TupleScheme.class, new TKeyTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new TKeyStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new TKeyTupleSchemeFactory();
 
-  public ByteBuffer row; // required
-  public ByteBuffer colFamily; // required
-  public ByteBuffer colQualifier; // required
-  public ByteBuffer colVisibility; // required
+  public java.nio.ByteBuffer row; // required
+  public java.nio.ByteBuffer colFamily; // required
+  public java.nio.ByteBuffer colQualifier; // required
+  public java.nio.ByteBuffer colVisibility; // required
   public long timestamp; // required
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
@@ -80,10 +50,10 @@ public class TKey implements org.apache.thrift.TBase, java.i
 COL_VISIBILITY((short)4, "colVisibility"),
 TIMESTAMP((short)5, "timestamp");
 
-private static final Map byName = new HashMap();
+private static final java.util.Map byName = new 
java.util.HashMap();
 
 static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
+  for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
 byName.put(field.getFieldName(), field);
   }
 }
@@ -114,21 +84,21 @@ public class TKey implements org.apache.thrift.TBase, java.i
  */
 public static _Fields findByThriftIdOrThrow(int fieldId) {
   _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
+  if (fields == null) throw new java.lang.IllegalArgumentException("Field 
" + fieldId + " doesn't exist!");
   return fields;
 }
 
 /**
  * Find the _Fields constant that matches name, or null if its not found.
  */
-public static _Fields findByName(String name) {
+public static _Fields

[18/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
index bdbdd18..e2a1d50 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/tabletserver/thrift/NoSuchScanIDException.java
@@ -15,61 +15,31 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.core.tabletserver.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
-public class NoSuchScanIDException extends TException implements 
org.apache.thrift.TBase, 
java.io.Serializable, Cloneable, Comparable {
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
+public class NoSuchScanIDException extends org.apache.thrift.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("NoSuchScanIDException");
 
 
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new 
NoSuchScanIDExceptionStandardSchemeFactory());
-schemes.put(TupleScheme.class, new 
NoSuchScanIDExceptionTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new NoSuchScanIDExceptionStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new NoSuchScanIDExceptionTupleSchemeFactory();
 
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 ;
 
-private static final Map byName = new HashMap();
+private static final java.util.Map byName = new 
java.util.HashMap();
 
 static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
+  for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
 byName.put(field.getFieldName(), field);
   }
 }
@@ -90,21 +60,21 @@ public class NoSuchScanIDException extends TException 
implements org.apache.thri
  */
 public static _Fields findByThriftIdOrThrow(int fieldId) {
   _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
+  if (fields == null) throw new java.lang.IllegalArgumentException("Field 
" + fieldId + " doesn't exist!");
   return fields;
 }
 
 /**
  * Find the _Fields constant that matches name, or null if its not found.
  */
-public static _Fields findByName(String name) {
+public static _Fields findByName(java.lang.String name) {
   return byName.get(name);
 }
 
 private final short _thriftId;
-private final String _fieldName;
+private final java.lang.String _fieldName;
 
-_Fields(short thriftId, String fieldName) {
+_Fields(short thriftId, java.lang.String fieldName) {
   _thriftId = thriftId;
   _fieldName = fieldName;
 }
@@ -113,14 +83,14 @@ public class NoSuchScanIDException extends TException 
implements org.apache.thri
   return _thriftId;
 }
 
-public String

[09/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceExistsException.java
--
diff --git 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceExistsException.java
 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceExistsException.java
index db1a380..a8148d2 100644
--- 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceExistsException.java
+++ 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/NamespaceExistsException.java
@@ -15,63 +15,33 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.proxy.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
-public class NamespaceExistsException extends TException implements 
org.apache.thrift.TBase, java.io.Serializable, Cloneable, 
Comparable {
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
+public class NamespaceExistsException extends org.apache.thrift.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("NamespaceExistsException");
 
   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);
 
-  private static final Map schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new 
NamespaceExistsExceptionStandardSchemeFactory());
-schemes.put(TupleScheme.class, new 
NamespaceExistsExceptionTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new NamespaceExistsExceptionStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new NamespaceExistsExceptionTupleSchemeFactory();
 
-  public String msg; // required
+  public java.lang.String msg; // required
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
 MSG((short)1, "msg");
 
-private static final Map byName = new HashMap();
+private static final java.util.Map byName = new 
java.util.HashMap();
 
 static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
+  for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
 byName.put(field.getFieldName(), field);
   }
 }
@@ -94,21 +64,21 @@ public class NamespaceExistsException extends TException 
implements org.apache.t
  */
 public static _Fields findByThriftIdOrThrow(int fieldId) {
   _Fields fields = findByThriftId(fieldId);
-  if (fields == null) throw new IllegalArgumentException("Field " + 
fieldId + " doesn't exist!");
+  if (fields == null) throw new java.lang.IllegalArgumentException("Field 
" + fieldId + " doesn't exist!");
   return fields;
 }
 
 /**
  * Find the _Fields constant that matches name, or null if its not found.
  */
-public static _Fields findByName(String name) {
+public static _Fields findByName(java.lang.String name) {
   return byName.get(name);
 }
 
 private final short _thriftId;
-private final String _fieldName;
+private final java.lang.String _fieldName;
 
-_Fields(short thriftId, String fieldName) {
+_Fields(short

[34/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/data/thrift/TCondition.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/data/thrift/TCondition.java 
b/core/src/main/java/org/apache/accumulo/core/data/thrift/TCondition.java
index 2a4e131..6fec05b 100644
--- a/core/src/main/java/org/apache/accumulo/core/data/thrift/TCondition.java
+++ b/core/src/main/java/org/apache/accumulo/core/data/thrift/TCondition.java
@@ -15,42 +15,15 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.core.data.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class TCondition 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("TCondition");
 
@@ -62,19 +35,16 @@ public class TCondition implements 
org.apache.thrift.TBase schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new TConditionStandardSchemeFactory());
-schemes.put(TupleScheme.class, new TConditionTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new TConditionStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new TConditionTupleSchemeFactory();
 
-  public ByteBuffer cf; // required
-  public ByteBuffer cq; // required
-  public ByteBuffer cv; // required
+  public java.nio.ByteBuffer cf; // required
+  public java.nio.ByteBuffer cq; // required
+  public java.nio.ByteBuffer cv; // required
   public long ts; // required
   public boolean hasTimestamp; // required
-  public ByteBuffer val; // required
-  public ByteBuffer iterators; // required
+  public java.nio.ByteBuffer val; // required
+  public java.nio.ByteBuffer iterators; // required
 
   /** The set of fields this struct contains, along with convenience methods 
for finding and manipulating them. */
   public enum _Fields implements org.apache.thrift.TFieldIdEnum {
@@ -86,10 +56,10 @@ public class TCondition implements 
org.apache.thrift.TBase byName = new HashMap();
+private static final java.util.Map byName = new 
java.util.HashMap();
 
 static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
+  for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
 byName.put(field.getFieldName(), field);
   }
 }
@@ -124,21 +94,21 @@ public class TCondition implements 
org.apache.thrift.TBase

[11/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/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
index 16c78a3..cd3ce5d 100644
--- 
a/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java
+++ 
b/proxy/src/main/java/org/apache/accumulo/proxy/thrift/ConditionalWriterOptions.java
@@ -15,42 +15,15 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.proxy.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class ConditionalWriterOptions 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("ConditionalWriterOptions");
 
@@ -60,16 +33,13 @@ public class ConditionalWriterOptions implements 
org.apache.thrift.TBase, SchemeFactory> schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new 
ConditionalWriterOptionsStandardSchemeFactory());
-schemes.put(TupleScheme.class, new 
ConditionalWriterOptionsTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new ConditionalWriterOptionsStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new ConditionalWriterOptionsTupleSchemeFactory();
 
   public long maxMemory; // optional
   public long timeoutMs; // optional
   public int threads; // optional
-  public Set authorizations; // optional
+  public java.util.Set authorizations; // optional
   /**
* 
* @see Durability
@@ -88,10 +58,10 @@ public class ConditionalWriterOptions implements 
org.apache.thrift.TBase byName = new HashMap();
+private static final java.util.Map byName = new 
java.util.HashMap();
 
 static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
+  for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
 byName.put(field.getFieldName(), field);
   }
 }
@@ -122,21 +92,21 @@ public class ConditionalWriterOptions implements 
org.apache.thrift.TBase 
metaDataMap;
+  public static final java.util.Map<_Fields, 
org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
   static {
-Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new 
EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
+java.util.Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = 
new java.util.EnumMap<_Fields, 
org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
 tmpMap.put(_Fields.MAX_MEMORY, new 
org.apache.thrift.meta_data.FieldMetaData("maxMemory", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
 new 
org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.I64)));
 tmpMap.put(_Fields.TIMEOUT_MS, new 
org.apache.thrift.meta_data.FieldMetaData("timeoutMs", 
org.apache.thrift.TFieldRequirementType.OPTIONAL, 
@@ -170,7 +140,7 @@ public class ConditionalWriterOptions implements 
org.apache.thrift.TBase __this__authorizations = new 
HashSet(other.authorizations);
+  java.util.Set __this__authorizations = new 
java.util.HashSet(other.authorizations);
   this.authorizations = __this__authorizations;
 }
 if

[03/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/proxy/src/main/python/ttypes.py
--
diff --git a/proxy/src/main/python/ttypes.py b/proxy/src/main/python/ttypes.py
index 87a977d..69269bc 100644
--- a/proxy/src/main/python/ttypes.py
+++ b/proxy/src/main/python/ttypes.py
@@ -13,3355 +13,3143 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
-# Autogenerated by Thrift Compiler (0.9.3)
+# Autogenerated by Thrift Compiler (0.10.0)
 #
 # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
 #
 #  options string: py
 #
 
-from thrift.Thrift import TType, TMessageType, TException, 
TApplicationException
+from thrift.Thrift import TType, TMessageType, TFrozenDict, TException, 
TApplicationException
+from thrift.protocol.TProtocol import TProtocolException
+import sys
 
 from thrift.transport import TTransport
-from thrift.protocol import TBinaryProtocol, TProtocol
-try:
-  from thrift.protocol import fastbinary
-except:
-  fastbinary = None
-
-
-class PartialKey:
-  ROW = 0
-  ROW_COLFAM = 1
-  ROW_COLFAM_COLQUAL = 2
-  ROW_COLFAM_COLQUAL_COLVIS = 3
-  ROW_COLFAM_COLQUAL_COLVIS_TIME = 4
-  ROW_COLFAM_COLQUAL_COLVIS_TIME_DEL = 5
-
-  _VALUES_TO_NAMES = {
-0: "ROW",
-1: "ROW_COLFAM",
-2: "ROW_COLFAM_COLQUAL",
-3: "ROW_COLFAM_COLQUAL_COLVIS",
-4: "ROW_COLFAM_COLQUAL_COLVIS_TIME",
-5: "ROW_COLFAM_COLQUAL_COLVIS_TIME_DEL",
-  }
-
-  _NAMES_TO_VALUES = {
-"ROW": 0,
-"ROW_COLFAM": 1,
-"ROW_COLFAM_COLQUAL": 2,
-"ROW_COLFAM_COLQUAL_COLVIS": 3,
-"ROW_COLFAM_COLQUAL_COLVIS_TIME": 4,
-"ROW_COLFAM_COLQUAL_COLVIS_TIME_DEL": 5,
-  }
-
-class TablePermission:
-  READ = 2
-  WRITE = 3
-  BULK_IMPORT = 4
-  ALTER_TABLE = 5
-  GRANT = 6
-  DROP_TABLE = 7
-
-  _VALUES_TO_NAMES = {
-2: "READ",
-3: "WRITE",
-4: "BULK_IMPORT",
-5: "ALTER_TABLE",
-6: "GRANT",
-7: "DROP_TABLE",
-  }
-
-  _NAMES_TO_VALUES = {
-"READ": 2,
-"WRITE": 3,
-"BULK_IMPORT": 4,
-"ALTER_TABLE": 5,
-"GRANT": 6,
-"DROP_TABLE": 7,
-  }
-
-class SystemPermission:
-  GRANT = 0
-  CREATE_TABLE = 1
-  DROP_TABLE = 2
-  ALTER_TABLE = 3
-  CREATE_USER = 4
-  DROP_USER = 5
-  ALTER_USER = 6
-  SYSTEM = 7
-
-  _VALUES_TO_NAMES = {
-0: "GRANT",
-1: "CREATE_TABLE",
-2: "DROP_TABLE",
-3: "ALTER_TABLE",
-4: "CREATE_USER",
-5: "DROP_USER",
-6: "ALTER_USER",
-7: "SYSTEM",
-  }
-
-  _NAMES_TO_VALUES = {
-"GRANT": 0,
-"CREATE_TABLE": 1,
-"DROP_TABLE": 2,
-"ALTER_TABLE": 3,
-"CREATE_USER": 4,
-"DROP_USER": 5,
-"ALTER_USER": 6,
-"SYSTEM": 7,
-  }
-
-class NamespacePermission:
-  READ = 0
-  WRITE = 1
-  ALTER_NAMESPACE = 2
-  GRANT = 3
-  ALTER_TABLE = 4
-  CREATE_TABLE = 5
-  DROP_TABLE = 6
-  BULK_IMPORT = 7
-  DROP_NAMESPACE = 8
-
-  _VALUES_TO_NAMES = {
-0: "READ",
-1: "WRITE",
-2: "ALTER_NAMESPACE",
-3: "GRANT",
-4: "ALTER_TABLE",
-5: "CREATE_TABLE",
-6: "DROP_TABLE",
-7: "BULK_IMPORT",
-8: "DROP_NAMESPACE",
-  }
-
-  _NAMES_TO_VALUES = {
-"READ": 0,
-"WRITE": 1,
-"ALTER_NAMESPACE": 2,
-"GRANT": 3,
-"ALTER_TABLE": 4,
-"CREATE_TABLE": 5,
-"DROP_TABLE": 6,
-"BULK_IMPORT": 7,
-"DROP_NAMESPACE": 8,
-  }
-
-class ScanType:
-  SINGLE = 0
-  BATCH = 1
-
-  _VALUES_TO_NAMES = {
-0: "SINGLE",
-1: "BATCH",
-  }
-
-  _NAMES_TO_VALUES = {
-"SINGLE": 0,
-"BATCH": 1,
-  }
-
-class ScanState:
-  IDLE = 0
-  RUNNING = 1
-  QUEUED = 2
-
-  _VALUES_TO_NAMES = {
-0: "IDLE",
-1: "RUNNING",
-2: "QUEUED",
-  }
-
-  _NAMES_TO_VALUES = {
-"IDLE": 0,
-"RUNNING": 1,
-"QUEUED": 2,
-  }
-
-class ConditionalStatus:
-  ACCEPTED = 0
-  REJECTED = 1
-  VIOLATED = 2
-  UNKNOWN = 3
-  INVISIBLE_VISIBILITY = 4
-
-  _VALUES_TO_NAMES = {
-0: "ACCEPTED",
-1: "REJECTED",
-2: "VIOLATED",
-3: "UNKNOWN",
-4: "INVISIBLE_VISIBILITY",
-  }
-
-  _NAMES_TO_VALUES = {
-"ACCEPTED": 0,
-"REJECTED": 1,
-"VIOLATED": 2,
-"UNKNOWN": 3,
-"INVISIBLE_VISIBILITY": 4,
-  }
-
-class Durability:
-  DEFAULT = 0
-  NONE = 1
-  LOG = 2
-  FLUSH = 3
-  SYNC = 4
-
-  _VALUES_TO_NAMES = {
-0: "DEFAULT",
-1: "NONE",
-2: "LOG",
-3: "FLUSH",
-4: "SYNC",
-  }
-
-  _NAMES_TO_VALUES = {
-"DEFAULT": 0,
-"NONE": 1,
-"LOG": 2,
-"FLUSH": 3,
-"SYNC": 4,
-  }
-
-class CompactionType:
-  MINOR = 0
-  MERGE = 1
-  MAJOR = 2
-  FULL = 3
-
-  _VALUES_TO_NAMES = {
-0: "MINOR",
-1: "MERGE",
-2: "MAJOR",
-3: "FULL",
-  }
-
-  _NAMES_TO_VALUES = {
-"MINOR": 0,
-"MERGE": 1,
-"MAJOR": 2,
-"FULL": 3,
-  }
-
-class CompactionReason:
-  USER = 0
-  SYSTEM = 1
-  CHOP = 2
-  IDLE = 3
-  CLOSE = 4
-
-  _VALUES_TO_NAMES = {
-0: "USER",
-1: "SYSTEM",
-2: "CHOP",
-3: "IDLE",
-4: "CLOSE",
-  }
-
-  _NAMES_TO_VALUES = {
-"USER":

[35/41] accumulo git commit: ACCUMULO-4551 Add thrift-gen changes from 0.10.0

2017-02-09 Thread ctubbsii

http://git-wip-us.apache.org/repos/asf/accumulo/blob/62bbce43/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java 
b/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
index eba7661..fe918ff 100644
--- 
a/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
+++ 
b/core/src/main/java/org/apache/accumulo/core/data/thrift/MultiScanResult.java
@@ -15,42 +15,15 @@
  * limitations under the License.
  */
 /**
- * Autogenerated by Thrift Compiler (0.9.3)
+ * Autogenerated by Thrift Compiler (0.10.0)
  *
  * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
  *  @generated
  */
 package org.apache.accumulo.core.data.thrift;
 
-import org.apache.thrift.scheme.IScheme;
-import org.apache.thrift.scheme.SchemeFactory;
-import org.apache.thrift.scheme.StandardScheme;
-
-import org.apache.thrift.scheme.TupleScheme;
-import org.apache.thrift.protocol.TTupleProtocol;
-import org.apache.thrift.protocol.TProtocolException;
-import org.apache.thrift.EncodingUtils;
-import org.apache.thrift.TException;
-import org.apache.thrift.async.AsyncMethodCallback;
-import org.apache.thrift.server.AbstractNonblockingServer.*;
-import java.util.List;
-import java.util.ArrayList;
-import java.util.Map;
-import java.util.HashMap;
-import java.util.EnumMap;
-import java.util.Set;
-import java.util.HashSet;
-import java.util.EnumSet;
-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({"cast", "rawtypes", "serial", "unchecked", "unused"})
-@Generated(value = "Autogenerated by Thrift Compiler (0.9.3)")
+@javax.annotation.Generated(value = "Autogenerated by Thrift Compiler 
(0.10.0)")
 public class MultiScanResult 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("MultiScanResult");
 
@@ -62,15 +35,12 @@ public class MultiScanResult implements 
org.apache.thrift.TBase schemes = 
new HashMap();
-  static {
-schemes.put(StandardScheme.class, new 
MultiScanResultStandardSchemeFactory());
-schemes.put(TupleScheme.class, new MultiScanResultTupleSchemeFactory());
-  }
+  private static final org.apache.thrift.scheme.SchemeFactory 
STANDARD_SCHEME_FACTORY = new MultiScanResultStandardSchemeFactory();
+  private static final org.apache.thrift.scheme.SchemeFactory 
TUPLE_SCHEME_FACTORY = new MultiScanResultTupleSchemeFactory();
 
-  public List results; // required
-  public Map failures; // required
-  public List fullScans; // required
+  public java.util.List results; // required
+  public java.util.Map failures; // required
+  public java.util.List fullScans; // required
   public TKeyExtent partScan; // required
   public TKey partNextKey; // required
   public boolean partNextKeyInclusive; // required
@@ -86,10 +56,10 @@ public class MultiScanResult implements 
org.apache.thrift.TBase byName = new HashMap();
+private static final java.util.Map byName = new 
java.util.HashMap();
 
 static {
-  for (_Fields field : EnumSet.allOf(_Fields.class)) {
+  for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
 byName.put(field.getFieldName(), field);
   }
 }
@@ -124,21 +94,21 @@ public class MultiScanResult implements 
org.apache.thrift.TBase

[41/41] accumulo git commit: ACCUMULO-4551 Update to thrift 0.10.0

2017-02-09 Thread ctubbsii

ACCUMULO-4551 Update to thrift 0.10.0


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

Branch: refs/heads/master
Commit: ead6674ee395bc645daffd456c7205ebc09bed1d
Parents: 8be77df
Author: Christopher Tubbs 
Authored: Sat Feb 4 23:49:23 2017 -0500
Committer: Christopher Tubbs 
Committed: Thu Feb 9 14:27:47 2017 -0500

--
 .../core/rpc/TServiceClientWrapper.java | 56 
 core/src/main/scripts/generate-thrift.sh| 17 +++---
 core/src/main/thrift/client.thrift  | 18 +++
 core/src/main/thrift/master.thrift  |  2 +-
 pom.xml |  2 +-
 .../accumulo/server/rpc/RpcWrapperTest.java |  2 +-
 6 files changed, 79 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/ead6674e/core/src/main/java/org/apache/accumulo/core/rpc/TServiceClientWrapper.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/rpc/TServiceClientWrapper.java 
b/core/src/main/java/org/apache/accumulo/core/rpc/TServiceClientWrapper.java
new file mode 100644
index 000..9636fe5
--- /dev/null
+++ b/core/src/main/java/org/apache/accumulo/core/rpc/TServiceClientWrapper.java
@@ -0,0 +1,56 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.accumulo.core.rpc;
+
+import org.apache.thrift.TApplicationException;
+import org.apache.thrift.TBase;
+import org.apache.thrift.TException;
+import org.apache.thrift.TServiceClient;
+import org.apache.thrift.protocol.TMessage;
+import org.apache.thrift.protocol.TMessageType;
+import org.apache.thrift.protocol.TProtocol;
+
+// Wrapper for THRIFT-4062 workaround; shouldn't be needed in newer versions
+// Also update generate-thrift.sh to stop using this
+public abstract class TServiceClientWrapper extends TServiceClient {
+
+  public TServiceClientWrapper(TProtocol iprot, TProtocol oprot) {
+super(iprot, oprot);
+  }
+
+  public TServiceClientWrapper(TProtocol prot) {
+super(prot);
+  }
+
+  @Override
+  protected void receiveBase(TBase result, String methodName) throws 
TException {
+TMessage msg = iprot_.readMessageBegin();
+if (msg.type == TMessageType.EXCEPTION) {
+  TApplicationException x = new TApplicationException();
+  x.read(iprot_);
+  iprot_.readMessageEnd();
+  throw x;
+}
+if (msg.seqid != seqid_) {
+  throw new TApplicationException(TApplicationException.BAD_SEQUENCE_ID, 
String.format("%s failed: out of sequence response: expected %d but got %d",
+  methodName, seqid_, msg.seqid));
+}
+result.read(iprot_);
+iprot_.readMessageEnd();
+  }
+
+}

http://git-wip-us.apache.org/repos/asf/accumulo/blob/ead6674e/core/src/main/scripts/generate-thrift.sh
--
diff --git a/core/src/main/scripts/generate-thrift.sh 
b/core/src/main/scripts/generate-thrift.sh
index 691ea79..d189323 100755
--- a/core/src/main/scripts/generate-thrift.sh
+++ b/core/src/main/scripts/generate-thrift.sh
@@ -26,7 +26,7 @@
 #   INCLUDED_MODULES should be an array that includes other Maven modules with 
src/main/thrift directories
 #   Use INCLUDED_MODULES=(-) in calling scripts that require no other modules
 # 

-[[ -z $REQUIRED_THRIFT_VERSION ]] && REQUIRED_THRIFT_VERSION='0.9.3'
+[[ -z $REQUIRED_THRIFT_VERSION ]] && REQUIRED_THRIFT_VERSION='0.10.0'
 [[ -z $INCLUDED_MODULES ]]&& INCLUDED_MODULES=(../server/tracer)
 [[ -z $BASE_OUTPUT_PACKAGE ]] && 
BASE_OUTPUT_PACKAGE='org.apache.accumulo.core'
 [[ -z $PACKAGES_TO_GENERATE ]]&& PACKAGES_TO_GENERATE=(gc master 
tabletserver security client.impl data

[1/4] accumulo git commit: ACCUMULO-4479 Removing UPGRADING.md in favor

2017-02-09 Thread mjwall

Repository: accumulo
Updated Branches:
  refs/heads/master b1beefde8 -> 8be77dfd9


ACCUMULO-4479 Removing UPGRADING.md in favor

of adding upgrade instructions to release notes


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

Branch: refs/heads/master
Commit: cfc286b7e9c877ee66dbe293eb41a98d9d507af1
Parents: 78176e5
Author: Michael Wall 
Authored: Thu Feb 9 10:34:15 2017 -0500
Committer: Michael Wall 
Committed: Thu Feb 9 10:34:15 2017 -0500

--
 UPGRADING.md | 106 --
 1 file changed, 106 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfc286b7/UPGRADING.md
--
diff --git a/UPGRADING.md b/UPGRADING.md
deleted file mode 100644
index e383683..000
--- a/UPGRADING.md
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-Upgrading
-=
-
-# From 1.6 to 1.7
-
-Upgrades from 1.6 to 1.7 are be possible with little effort as no changes were 
made at the data layer and RPC changes
-were made in a backwards-compatible way. The recommended way is to stop 
Accumulo 1.6, perform the Accumulo upgrade to
-1.7, and then start 1.7. Like previous versions, after 1.7.0 is started on a 
1.6 instance, a one-time upgrade will
-happen by the Master which will prevent a downgrade back to 1.6. Upgrades are 
still one way. Upgrades from versions
-prior to 1.6 to 1.7 should follow the below path to 1.6 and then perform the 
upgrade to 1.7 -- direct upgrades to 1.7
-for versions other than 1.6 are untested.
-
-After upgrading to 1.7.0, users will notice the addition of a `replication` 
table in the `accumulo` namespace. This
-table is created and put offline to avoid any additional maintainence if the 
data-center replication feature is not
-in use.
-
-Existing configuration files from 1.6 should be compared against the examples 
provided in 1.7. The 1.6 configuration
-files should all function with 1.7 code, but you will likely want to include a 
new file (hadoop-metrics2-accumulo.properties)
-to enable the new metrics subsystem. Read the section on Hadoop Metrics2 in 
the Administration chapter of the Accumulo User Manual.
-
-For each of the other new features, new configuration properties exist to 
support the feature. Refer to the added
-sections in the User Manual for the feature for information on how to properly 
configure and use the new functionality.
-
-# From 1.5 to 1.6
-
-This happens automatically the first time Accumulo 1.6 is started. If your 
instance previously upgraded from 1.4 to 1.5,
-you must verify that your 1.5 instance has no outstanding local write ahead 
logs. You can do this by ensuring either:
-
- * All of your tables are online and the Monitor shows all tablets hosted
- * The directory for write ahead logs (logger.dir.walog) from 1.4 has no files 
remaining on any tablet server / logger
- hosts
-
-To upgrade from 1.5 to 1.6 you must:
-
- * Verify that there are no outstanding FATE operations
-* Under 1.5 you can list what's in FATE by running 
`$ACCUMULO_HOME/bin/accumulo
-  org.apache.accumulo.server.fate.Admin print`
-* Note that operations in any state will prevent an upgrade. It is safe to 
delete operations with status SUCCESSFUL.
-  For others, you should restart your 1.5 cluster and allow them to finish.
- * Stop the 1.5 instance.
- * Configure 1.6 to use the hdfs directory and zookeepers that 1.5 was using.
- * Copy other 1.5 configuration options as needed.
- * Start Accumulo 1.6.
-
-The upgrade process must make changes to Accumulo's internal state in both
-ZooKeeper and the table metadata. This process may take some time if Tablet
-Servers have to go through recovery. During this time, the Monitor will claim
-that the Master is down and some services may send the Monitor log messages
-about failure to communicate with each other.  These messages are safe to
-ignore. If you need detail on the upgrade's progress you should view the local
-logs on the Tablet Servers and active Master.
-
-### From 1.4 to 1.6
-
-To upgrade from 1.4 to 1.6 you must perform a manual initial step.
-
-Prior to upgrading you must:
-
- * Verify that there are no outstanding FATE operations
- * Under 1.4 you can list what's in FATE by running
-   `$ACCUMULO_HOME/bin/accumulo org.apache.accumulo.server.fate.Admin 
print`
- * Note that operations in any state will prevent an upgrade. It is safe
-   to delete operations with status SUCCESSFUL. For others, you should 
restart
-   your 1.4 cluster and allow them to finish.
- * Stop the 1.4 instance.
- * Configure 1.6 to

[4/4] accumulo git commit: Merge branch '1.8'

2017-02-09 Thread mjwall

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: 8be77dfd9401064449ef406952dfc8d2692cac41
Parents: b1beefd bdb27e9
Author: Michael Wall 
Authored: Thu Feb 9 10:48:29 2017 -0500
Committer: Michael Wall 
Committed: Thu Feb 9 10:48:29 2017 -0500

--
 UPGRADING.md | 106 --
 1 file changed, 106 deletions(-)
--

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

2017-02-09 Thread mjwall

Merge branch '1.7' into 1.8


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

Branch: refs/heads/master
Commit: bdb27e9782825ede6d683089372f48f30f9c4fd3
Parents: f412042 13d3f5d
Author: Michael Wall 
Authored: Thu Feb 9 10:48:03 2017 -0500
Committer: Michael Wall 
Committed: Thu Feb 9 10:48:03 2017 -0500

--
 UPGRADING.md | 106 --
 1 file changed, 106 deletions(-)
--

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

2017-02-09 Thread mjwall

Merge branch '1.7' into 1.8


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

Branch: refs/heads/1.8
Commit: bdb27e9782825ede6d683089372f48f30f9c4fd3
Parents: f412042 13d3f5d
Author: Michael Wall 
Authored: Thu Feb 9 10:48:03 2017 -0500
Committer: Michael Wall 
Committed: Thu Feb 9 10:48:03 2017 -0500

--
 UPGRADING.md | 106 --
 1 file changed, 106 deletions(-)
--

[2/3] accumulo git commit: Merge branch 'mjwall-ACCUMULO-4481' into 1.7

2017-02-09 Thread mjwall

Merge branch 'mjwall-ACCUMULO-4481' 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/13d3f5de
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/13d3f5de
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/13d3f5de

Branch: refs/heads/1.8
Commit: 13d3f5deba89a5061f231b2cbf7ef1a502174dec
Parents: 78176e5 cfc286b
Author: Michael Wall 
Authored: Thu Feb 9 10:46:31 2017 -0500
Committer: Michael Wall 
Committed: Thu Feb 9 10:46:31 2017 -0500

--
 UPGRADING.md | 106 --
 1 file changed, 106 deletions(-)
--

[1/3] accumulo git commit: ACCUMULO-4479 Removing UPGRADING.md in favor

2017-02-09 Thread mjwall

Repository: accumulo
Updated Branches:
  refs/heads/1.8 f4120422b -> bdb27e978


ACCUMULO-4479 Removing UPGRADING.md in favor

of adding upgrade instructions to release notes


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

Branch: refs/heads/1.8
Commit: cfc286b7e9c877ee66dbe293eb41a98d9d507af1
Parents: 78176e5
Author: Michael Wall 
Authored: Thu Feb 9 10:34:15 2017 -0500
Committer: Michael Wall 
Committed: Thu Feb 9 10:34:15 2017 -0500

--
 UPGRADING.md | 106 --
 1 file changed, 106 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfc286b7/UPGRADING.md
--
diff --git a/UPGRADING.md b/UPGRADING.md
deleted file mode 100644
index e383683..000
--- a/UPGRADING.md
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-Upgrading
-=
-
-# From 1.6 to 1.7
-
-Upgrades from 1.6 to 1.7 are be possible with little effort as no changes were 
made at the data layer and RPC changes
-were made in a backwards-compatible way. The recommended way is to stop 
Accumulo 1.6, perform the Accumulo upgrade to
-1.7, and then start 1.7. Like previous versions, after 1.7.0 is started on a 
1.6 instance, a one-time upgrade will
-happen by the Master which will prevent a downgrade back to 1.6. Upgrades are 
still one way. Upgrades from versions
-prior to 1.6 to 1.7 should follow the below path to 1.6 and then perform the 
upgrade to 1.7 -- direct upgrades to 1.7
-for versions other than 1.6 are untested.
-
-After upgrading to 1.7.0, users will notice the addition of a `replication` 
table in the `accumulo` namespace. This
-table is created and put offline to avoid any additional maintainence if the 
data-center replication feature is not
-in use.
-
-Existing configuration files from 1.6 should be compared against the examples 
provided in 1.7. The 1.6 configuration
-files should all function with 1.7 code, but you will likely want to include a 
new file (hadoop-metrics2-accumulo.properties)
-to enable the new metrics subsystem. Read the section on Hadoop Metrics2 in 
the Administration chapter of the Accumulo User Manual.
-
-For each of the other new features, new configuration properties exist to 
support the feature. Refer to the added
-sections in the User Manual for the feature for information on how to properly 
configure and use the new functionality.
-
-# From 1.5 to 1.6
-
-This happens automatically the first time Accumulo 1.6 is started. If your 
instance previously upgraded from 1.4 to 1.5,
-you must verify that your 1.5 instance has no outstanding local write ahead 
logs. You can do this by ensuring either:
-
- * All of your tables are online and the Monitor shows all tablets hosted
- * The directory for write ahead logs (logger.dir.walog) from 1.4 has no files 
remaining on any tablet server / logger
- hosts
-
-To upgrade from 1.5 to 1.6 you must:
-
- * Verify that there are no outstanding FATE operations
-* Under 1.5 you can list what's in FATE by running 
`$ACCUMULO_HOME/bin/accumulo
-  org.apache.accumulo.server.fate.Admin print`
-* Note that operations in any state will prevent an upgrade. It is safe to 
delete operations with status SUCCESSFUL.
-  For others, you should restart your 1.5 cluster and allow them to finish.
- * Stop the 1.5 instance.
- * Configure 1.6 to use the hdfs directory and zookeepers that 1.5 was using.
- * Copy other 1.5 configuration options as needed.
- * Start Accumulo 1.6.
-
-The upgrade process must make changes to Accumulo's internal state in both
-ZooKeeper and the table metadata. This process may take some time if Tablet
-Servers have to go through recovery. During this time, the Monitor will claim
-that the Master is down and some services may send the Monitor log messages
-about failure to communicate with each other.  These messages are safe to
-ignore. If you need detail on the upgrade's progress you should view the local
-logs on the Tablet Servers and active Master.
-
-### From 1.4 to 1.6
-
-To upgrade from 1.4 to 1.6 you must perform a manual initial step.
-
-Prior to upgrading you must:
-
- * Verify that there are no outstanding FATE operations
- * Under 1.4 you can list what's in FATE by running
-   `$ACCUMULO_HOME/bin/accumulo org.apache.accumulo.server.fate.Admin 
print`
- * Note that operations in any state will prevent an upgrade. It is safe
-   to delete operations with status SUCCESSFUL. For others, you should 
restart
-   your 1.4 cluster and allow them to finish.
- * Stop the 1.4 instance.
- * Configure 1.6 to use

[2/4] accumulo git commit: Merge branch 'mjwall-ACCUMULO-4481' into 1.7

2017-02-09 Thread mjwall

Merge branch 'mjwall-ACCUMULO-4481' 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/13d3f5de
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/13d3f5de
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/13d3f5de

Branch: refs/heads/master
Commit: 13d3f5deba89a5061f231b2cbf7ef1a502174dec
Parents: 78176e5 cfc286b
Author: Michael Wall 
Authored: Thu Feb 9 10:46:31 2017 -0500
Committer: Michael Wall 
Committed: Thu Feb 9 10:46:31 2017 -0500

--
 UPGRADING.md | 106 --
 1 file changed, 106 deletions(-)
--

[2/2] accumulo git commit: Merge branch 'mjwall-ACCUMULO-4481' into 1.7

2017-02-09 Thread mjwall

Merge branch 'mjwall-ACCUMULO-4481' 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/13d3f5de
Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/13d3f5de
Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/13d3f5de

Branch: refs/heads/1.7
Commit: 13d3f5deba89a5061f231b2cbf7ef1a502174dec
Parents: 78176e5 cfc286b
Author: Michael Wall 
Authored: Thu Feb 9 10:46:31 2017 -0500
Committer: Michael Wall 
Committed: Thu Feb 9 10:46:31 2017 -0500

--
 UPGRADING.md | 106 --
 1 file changed, 106 deletions(-)
--

[1/2] accumulo git commit: ACCUMULO-4479 Removing UPGRADING.md in favor

2017-02-09 Thread mjwall

Repository: accumulo
Updated Branches:
  refs/heads/1.7 78176e594 -> 13d3f5deb


ACCUMULO-4479 Removing UPGRADING.md in favor

of adding upgrade instructions to release notes


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

Branch: refs/heads/1.7
Commit: cfc286b7e9c877ee66dbe293eb41a98d9d507af1
Parents: 78176e5
Author: Michael Wall 
Authored: Thu Feb 9 10:34:15 2017 -0500
Committer: Michael Wall 
Committed: Thu Feb 9 10:34:15 2017 -0500

--
 UPGRADING.md | 106 --
 1 file changed, 106 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/cfc286b7/UPGRADING.md
--
diff --git a/UPGRADING.md b/UPGRADING.md
deleted file mode 100644
index e383683..000
--- a/UPGRADING.md
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-Upgrading
-=
-
-# From 1.6 to 1.7
-
-Upgrades from 1.6 to 1.7 are be possible with little effort as no changes were 
made at the data layer and RPC changes
-were made in a backwards-compatible way. The recommended way is to stop 
Accumulo 1.6, perform the Accumulo upgrade to
-1.7, and then start 1.7. Like previous versions, after 1.7.0 is started on a 
1.6 instance, a one-time upgrade will
-happen by the Master which will prevent a downgrade back to 1.6. Upgrades are 
still one way. Upgrades from versions
-prior to 1.6 to 1.7 should follow the below path to 1.6 and then perform the 
upgrade to 1.7 -- direct upgrades to 1.7
-for versions other than 1.6 are untested.
-
-After upgrading to 1.7.0, users will notice the addition of a `replication` 
table in the `accumulo` namespace. This
-table is created and put offline to avoid any additional maintainence if the 
data-center replication feature is not
-in use.
-
-Existing configuration files from 1.6 should be compared against the examples 
provided in 1.7. The 1.6 configuration
-files should all function with 1.7 code, but you will likely want to include a 
new file (hadoop-metrics2-accumulo.properties)
-to enable the new metrics subsystem. Read the section on Hadoop Metrics2 in 
the Administration chapter of the Accumulo User Manual.
-
-For each of the other new features, new configuration properties exist to 
support the feature. Refer to the added
-sections in the User Manual for the feature for information on how to properly 
configure and use the new functionality.
-
-# From 1.5 to 1.6
-
-This happens automatically the first time Accumulo 1.6 is started. If your 
instance previously upgraded from 1.4 to 1.5,
-you must verify that your 1.5 instance has no outstanding local write ahead 
logs. You can do this by ensuring either:
-
- * All of your tables are online and the Monitor shows all tablets hosted
- * The directory for write ahead logs (logger.dir.walog) from 1.4 has no files 
remaining on any tablet server / logger
- hosts
-
-To upgrade from 1.5 to 1.6 you must:
-
- * Verify that there are no outstanding FATE operations
-* Under 1.5 you can list what's in FATE by running 
`$ACCUMULO_HOME/bin/accumulo
-  org.apache.accumulo.server.fate.Admin print`
-* Note that operations in any state will prevent an upgrade. It is safe to 
delete operations with status SUCCESSFUL.
-  For others, you should restart your 1.5 cluster and allow them to finish.
- * Stop the 1.5 instance.
- * Configure 1.6 to use the hdfs directory and zookeepers that 1.5 was using.
- * Copy other 1.5 configuration options as needed.
- * Start Accumulo 1.6.
-
-The upgrade process must make changes to Accumulo's internal state in both
-ZooKeeper and the table metadata. This process may take some time if Tablet
-Servers have to go through recovery. During this time, the Monitor will claim
-that the Master is down and some services may send the Monitor log messages
-about failure to communicate with each other.  These messages are safe to
-ignore. If you need detail on the upgrade's progress you should view the local
-logs on the Tablet Servers and active Master.
-
-### From 1.4 to 1.6
-
-To upgrade from 1.4 to 1.6 you must perform a manual initial step.
-
-Prior to upgrading you must:
-
- * Verify that there are no outstanding FATE operations
- * Under 1.4 you can list what's in FATE by running
-   `$ACCUMULO_HOME/bin/accumulo org.apache.accumulo.server.fate.Admin 
print`
- * Note that operations in any state will prevent an upgrade. It is safe
-   to delete operations with status SUCCESSFUL. For others, you should 
restart
-   your 1.4 cluster and allow them to finish.
- * Stop the 1.4 instance.
- * Configure 1.6 to use

[1/4] accumulo git commit: ACCUMULO-4577: modified exception thrown by Tables.getNamespaceId

2017-02-09 Thread mmiller

Repository: accumulo
Updated Branches:
  refs/heads/master d2e217b13 -> b1beefde8


ACCUMULO-4577: modified exception thrown by Tables.getNamespaceId


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

Branch: refs/heads/master
Commit: 78176e5948bccb2501184bbffad31a8d7d7e6603
Parents: 15ae69c
Author: Mike Miller 
Authored: Thu Feb 2 09:02:57 2017 -0500
Committer: Mike Miller 
Committed: Wed Feb 8 12:24:48 2017 -0500

--
 .../accumulo/core/client/impl/Tables.java   |  4 +-
 .../server/client/ClientServiceHandler.java | 22 +---
 .../server/conf/TableParentConfiguration.java   |  7 ++-
 .../accumulo/master/FateServiceHandler.java | 36 -
 .../master/MasterClientServiceHandler.java  | 16 --
 .../accumulo/master/tableOps/CloneTable.java| 19 +--
 .../accumulo/master/tableOps/ExportTable.java   |  7 ++-
 .../apache/accumulo/tserver/TabletServer.java   | 54 
 8 files changed, 110 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/78176e59/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java 
b/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
index 18971ad..fcf838f 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
@@ -272,7 +272,7 @@ public class Tables {
* @throws IllegalArgumentException
*   if the table doesn't exist in ZooKeeper
*/
-  public static String getNamespaceId(Instance instance, String tableId) 
throws IllegalArgumentException {
+  public static String getNamespaceId(Instance instance, String tableId) 
throws TableNotFoundException {
 checkArgument(instance != null, "instance is null");
 checkArgument(tableId != null, "tableId is null");
 
@@ -281,7 +281,7 @@ public class Tables {
 
 // We might get null out of ZooCache if this tableID doesn't exist
 if (null == n) {
-  throw new IllegalArgumentException("Table with id " + tableId + " does 
not exist");
+  throw new TableNotFoundException(tableId, null, null);
 }
 
 return new String(n, UTF_8);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/78176e59/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
--
diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
 
b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
index fbfb492..3b34f71 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
@@ -194,10 +194,14 @@ public class ClientServiceHandler implements 
ClientService.Iface {
   }
 
   @Override
-  public void grantTablePermission(TInfo tinfo, TCredentials credentials, 
String user, String tableName, byte permission) throws ThriftSecurityException,
-  ThriftTableOperationException {
+  public void grantTablePermission(TInfo tinfo, TCredentials credentials, 
String user, String tableName, byte permission) throws TException {
 String tableId = checkTableId(instance, tableName, 
TableOperation.PERMISSION);
-String namespaceId = Tables.getNamespaceId(instance, tableId);
+String namespaceId;
+try {
+  namespaceId = Tables.getNamespaceId(instance, tableId);
+} catch (TableNotFoundException e) {
+  throw new TException(e);
+}
 
 security.grantTablePermission(credentials, user, tableId, 
TablePermission.getPermissionById(permission), namespaceId);
   }
@@ -215,10 +219,14 @@ public class ClientServiceHandler implements 
ClientService.Iface {
   }
 
   @Override
-  public void revokeTablePermission(TInfo tinfo, TCredentials credentials, 
String user, String tableName, byte permission) throws ThriftSecurityException,
-  ThriftTableOperationException {
+  public void revokeTablePermission(TInfo tinfo, TCredentials credentials, 
String user, String tableName, byte permission) throws TException {
 String tableId = checkTableId(instance, tableName, 
TableOperation.PERMISSION);
-String namespaceId = Tables.getNamespaceId(instance, tableId);
+String namespaceId;
+try {
+  namespaceId = Tables.getNamespaceId(instance, tableId);
+} catch

[4/4] accumulo git commit: Merge branch '1.8'

2017-02-09 Thread mmiller

Merge branch '1.8'


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

Branch: refs/heads/master
Commit: b1beefde8949313ec70d55fdfa241f375c5a9adc
Parents: d2e217b f412042
Author: Mike Miller 
Authored: Thu Feb 9 09:21:35 2017 -0500
Committer: Mike Miller 
Committed: Thu Feb 9 09:21:35 2017 -0500

--
 .../accumulo/core/client/impl/Tables.java   |  4 +-
 .../server/client/ClientServiceHandler.java | 22 +---
 .../server/conf/TableParentConfiguration.java   |  7 ++-
 .../accumulo/master/FateServiceHandler.java | 36 -
 .../master/MasterClientServiceHandler.java  | 16 --
 .../accumulo/master/tableOps/CloneTable.java| 20 +---
 .../accumulo/master/tableOps/ExportTable.java   |  7 ++-
 .../apache/accumulo/tserver/TabletServer.java   | 54 
 8 files changed, 110 insertions(+), 56 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/b1beefde/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b1beefde/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/b1beefde/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
--

[2/4] accumulo git commit: Merge branch 'ACCUMULO-4577_1.7' into 1.8

2017-02-09 Thread mmiller

Merge branch 'ACCUMULO-4577_1.7' into 1.8

Conflicts:
core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java

server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneTable.java

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


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

Branch: refs/heads/master
Commit: a0b2dc864c053a5d03d13d42eb68e5b53a4379eb
Parents: 04847d9 78176e5
Author: Mike Miller 
Authored: Wed Feb 8 14:09:11 2017 -0500
Committer: Mike Miller 
Committed: Wed Feb 8 14:09:11 2017 -0500

--
 .../accumulo/core/client/impl/Tables.java   |  2 +-
 .../server/client/ClientServiceHandler.java | 22 +---
 .../server/conf/TableParentConfiguration.java   |  7 ++-
 .../accumulo/master/FateServiceHandler.java | 36 -
 .../master/MasterClientServiceHandler.java  | 16 --
 .../accumulo/master/tableOps/CloneTable.java| 20 +---
 .../accumulo/master/tableOps/ExportTable.java   |  7 ++-
 .../apache/accumulo/tserver/TabletServer.java   | 54 
 8 files changed, 109 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a0b2dc86/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a0b2dc86/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a0b2dc86/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a0b2dc86/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a0b2dc86/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
--
diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 7751681,6c585d0..a937235
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@@ -61,7 -59,7 +61,8 @@@ import org.apache.accumulo.core.client.
  import org.apache.accumulo.core.client.AccumuloSecurityException;
  import org.apache.accumulo.core.client.Durability;
  import org.apache.accumulo.core.client.Instance;
 +import org.apache.accumulo.core.client.SampleNotPresentException;
+ import org.apache.accumulo.core.client.TableNotFoundException;
  import org.apache.accumulo.core.client.impl.CompressedIterators;
  import org.apache.accumulo.core.client.impl.DurabilityImpl;
  import org.apache.accumulo.core.client.impl.ScannerImpl;
@@@ -465,11 -446,16 +466,17 @@@ public class TabletServer extends Accum
  @Override
  public InitialScan startScan(TInfo tinfo, TCredentials credentials, 
TKeyExtent textent, TRange range, List columns, int batchSize,
  List ssiList, Map> ssio, 
List authorizations, boolean waitForWrites, boolean isolated,
 -long readaheadThreshold) throws NotServingTabletException, 
ThriftSecurityException, 
org.apache.accumulo.core.tabletserver.thrift.TooManyFilesException {
 +long readaheadThreshold, TSamplerConfiguration tSamplerConfig, long 
batchTimeOut, String context) throws NotServingTabletException,
 +ThriftSecurityException, 
org.apache.accumulo.core.tabletserver.thrift.TooManyFilesException, 
TSampleNotPresentException {
  
String tableId = new String(textent.getTable(), UTF_8);
-   if (!security.canScan(credentials, tableId, 
Tables.getNamespaceId(getInstance(), tableId), range, columns, ssiList, ssio, 
authorizations))
+   String namespaceId;
+   try {
+ namespaceId = Tables.getNamespaceId(getInstance(), tableId);
+   } catch (TableNotFoundException e1) {
+ throw new NotServingTabletException(textent);
+   }
+   if (!security.canScan(credentials, tableId, namespaceId, range, 
columns, ssiList, ssio, authorizations))
  throw new ThriftSecurityException(credentials.getPrincipal(), 
SecurityErrorCode.PERMISSION_DENIED);
  
if (!security.userHasAuthorizations(credentials, authorizations))
@@@ -1270,10

[3/4] accumulo git commit: ACCUMULO-4577: Fix merge error

2017-02-09 Thread mmiller

ACCUMULO-4577: Fix merge error


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

Branch: refs/heads/master
Commit: f4120422bcaf8466c5c49054761c4bc10f8fba68
Parents: a0b2dc8
Author: Mike Miller 
Authored: Wed Feb 8 14:36:26 2017 -0500
Committer: Mike Miller 
Committed: Wed Feb 8 14:36:26 2017 -0500

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f4120422/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java 
b/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
index cbf9671..fcf838f 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
@@ -272,7 +272,7 @@ public class Tables {
* @throws IllegalArgumentException
*   if the table doesn't exist in ZooKeeper
*/
-  public static String getNamespaceId(Instance instance, String tableId) 
throws IllegalArgumentException {
+  public static String getNamespaceId(Instance instance, String tableId) 
throws TableNotFoundException {
 checkArgument(instance != null, "instance is null");
 checkArgument(tableId != null, "tableId is null");

[3/3] accumulo git commit: ACCUMULO-4577: Fix merge error

2017-02-09 Thread mmiller

ACCUMULO-4577: Fix merge error


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

Branch: refs/heads/1.8
Commit: f4120422bcaf8466c5c49054761c4bc10f8fba68
Parents: a0b2dc8
Author: Mike Miller 
Authored: Wed Feb 8 14:36:26 2017 -0500
Committer: Mike Miller 
Committed: Wed Feb 8 14:36:26 2017 -0500

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


http://git-wip-us.apache.org/repos/asf/accumulo/blob/f4120422/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java 
b/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
index cbf9671..fcf838f 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
@@ -272,7 +272,7 @@ public class Tables {
* @throws IllegalArgumentException
*   if the table doesn't exist in ZooKeeper
*/
-  public static String getNamespaceId(Instance instance, String tableId) 
throws IllegalArgumentException {
+  public static String getNamespaceId(Instance instance, String tableId) 
throws TableNotFoundException {
 checkArgument(instance != null, "instance is null");
 checkArgument(tableId != null, "tableId is null");

[1/3] accumulo git commit: ACCUMULO-4577: modified exception thrown by Tables.getNamespaceId

2017-02-09 Thread mmiller

Repository: accumulo
Updated Branches:
  refs/heads/1.8 04847d97d -> f4120422b


ACCUMULO-4577: modified exception thrown by Tables.getNamespaceId


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

Branch: refs/heads/1.8
Commit: 78176e5948bccb2501184bbffad31a8d7d7e6603
Parents: 15ae69c
Author: Mike Miller 
Authored: Thu Feb 2 09:02:57 2017 -0500
Committer: Mike Miller 
Committed: Wed Feb 8 12:24:48 2017 -0500

--
 .../accumulo/core/client/impl/Tables.java   |  4 +-
 .../server/client/ClientServiceHandler.java | 22 +---
 .../server/conf/TableParentConfiguration.java   |  7 ++-
 .../accumulo/master/FateServiceHandler.java | 36 -
 .../master/MasterClientServiceHandler.java  | 16 --
 .../accumulo/master/tableOps/CloneTable.java| 19 +--
 .../accumulo/master/tableOps/ExportTable.java   |  7 ++-
 .../apache/accumulo/tserver/TabletServer.java   | 54 
 8 files changed, 110 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/78176e59/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
--
diff --git 
a/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java 
b/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
index 18971ad..fcf838f 100644
--- a/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
+++ b/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
@@ -272,7 +272,7 @@ public class Tables {
* @throws IllegalArgumentException
*   if the table doesn't exist in ZooKeeper
*/
-  public static String getNamespaceId(Instance instance, String tableId) 
throws IllegalArgumentException {
+  public static String getNamespaceId(Instance instance, String tableId) 
throws TableNotFoundException {
 checkArgument(instance != null, "instance is null");
 checkArgument(tableId != null, "tableId is null");
 
@@ -281,7 +281,7 @@ public class Tables {
 
 // We might get null out of ZooCache if this tableID doesn't exist
 if (null == n) {
-  throw new IllegalArgumentException("Table with id " + tableId + " does 
not exist");
+  throw new TableNotFoundException(tableId, null, null);
 }
 
 return new String(n, UTF_8);

http://git-wip-us.apache.org/repos/asf/accumulo/blob/78176e59/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
--
diff --git 
a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
 
b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
index fbfb492..3b34f71 100644
--- 
a/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
+++ 
b/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
@@ -194,10 +194,14 @@ public class ClientServiceHandler implements 
ClientService.Iface {
   }
 
   @Override
-  public void grantTablePermission(TInfo tinfo, TCredentials credentials, 
String user, String tableName, byte permission) throws ThriftSecurityException,
-  ThriftTableOperationException {
+  public void grantTablePermission(TInfo tinfo, TCredentials credentials, 
String user, String tableName, byte permission) throws TException {
 String tableId = checkTableId(instance, tableName, 
TableOperation.PERMISSION);
-String namespaceId = Tables.getNamespaceId(instance, tableId);
+String namespaceId;
+try {
+  namespaceId = Tables.getNamespaceId(instance, tableId);
+} catch (TableNotFoundException e) {
+  throw new TException(e);
+}
 
 security.grantTablePermission(credentials, user, tableId, 
TablePermission.getPermissionById(permission), namespaceId);
   }
@@ -215,10 +219,14 @@ public class ClientServiceHandler implements 
ClientService.Iface {
   }
 
   @Override
-  public void revokeTablePermission(TInfo tinfo, TCredentials credentials, 
String user, String tableName, byte permission) throws ThriftSecurityException,
-  ThriftTableOperationException {
+  public void revokeTablePermission(TInfo tinfo, TCredentials credentials, 
String user, String tableName, byte permission) throws TException {
 String tableId = checkTableId(instance, tableName, 
TableOperation.PERMISSION);
-String namespaceId = Tables.getNamespaceId(instance, tableId);
+String namespaceId;
+try {
+  namespaceId = Tables.getNamespaceId(instance, tableId);
+} catch (TableNotFoundException

[2/3] accumulo git commit: Merge branch 'ACCUMULO-4577_1.7' into 1.8

2017-02-09 Thread mmiller

Merge branch 'ACCUMULO-4577_1.7' into 1.8

Conflicts:
core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java

server/master/src/main/java/org/apache/accumulo/master/tableOps/CloneTable.java

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


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

Branch: refs/heads/1.8
Commit: a0b2dc864c053a5d03d13d42eb68e5b53a4379eb
Parents: 04847d9 78176e5
Author: Mike Miller 
Authored: Wed Feb 8 14:09:11 2017 -0500
Committer: Mike Miller 
Committed: Wed Feb 8 14:09:11 2017 -0500

--
 .../accumulo/core/client/impl/Tables.java   |  2 +-
 .../server/client/ClientServiceHandler.java | 22 +---
 .../server/conf/TableParentConfiguration.java   |  7 ++-
 .../accumulo/master/FateServiceHandler.java | 36 -
 .../master/MasterClientServiceHandler.java  | 16 --
 .../accumulo/master/tableOps/CloneTable.java| 20 +---
 .../accumulo/master/tableOps/ExportTable.java   |  7 ++-
 .../apache/accumulo/tserver/TabletServer.java   | 54 
 8 files changed, 109 insertions(+), 55 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/accumulo/blob/a0b2dc86/core/src/main/java/org/apache/accumulo/core/client/impl/Tables.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a0b2dc86/server/base/src/main/java/org/apache/accumulo/server/client/ClientServiceHandler.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a0b2dc86/server/master/src/main/java/org/apache/accumulo/master/FateServiceHandler.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a0b2dc86/server/master/src/main/java/org/apache/accumulo/master/MasterClientServiceHandler.java
--

http://git-wip-us.apache.org/repos/asf/accumulo/blob/a0b2dc86/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
--
diff --cc 
server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
index 7751681,6c585d0..a937235
--- a/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
+++ b/server/tserver/src/main/java/org/apache/accumulo/tserver/TabletServer.java
@@@ -61,7 -59,7 +61,8 @@@ import org.apache.accumulo.core.client.
  import org.apache.accumulo.core.client.AccumuloSecurityException;
  import org.apache.accumulo.core.client.Durability;
  import org.apache.accumulo.core.client.Instance;
 +import org.apache.accumulo.core.client.SampleNotPresentException;
+ import org.apache.accumulo.core.client.TableNotFoundException;
  import org.apache.accumulo.core.client.impl.CompressedIterators;
  import org.apache.accumulo.core.client.impl.DurabilityImpl;
  import org.apache.accumulo.core.client.impl.ScannerImpl;
@@@ -465,11 -446,16 +466,17 @@@ public class TabletServer extends Accum
  @Override
  public InitialScan startScan(TInfo tinfo, TCredentials credentials, 
TKeyExtent textent, TRange range, List columns, int batchSize,
  List ssiList, Map> ssio, 
List authorizations, boolean waitForWrites, boolean isolated,
 -long readaheadThreshold) throws NotServingTabletException, 
ThriftSecurityException, 
org.apache.accumulo.core.tabletserver.thrift.TooManyFilesException {
 +long readaheadThreshold, TSamplerConfiguration tSamplerConfig, long 
batchTimeOut, String context) throws NotServingTabletException,
 +ThriftSecurityException, 
org.apache.accumulo.core.tabletserver.thrift.TooManyFilesException, 
TSampleNotPresentException {
  
String tableId = new String(textent.getTable(), UTF_8);
-   if (!security.canScan(credentials, tableId, 
Tables.getNamespaceId(getInstance(), tableId), range, columns, ssiList, ssio, 
authorizations))
+   String namespaceId;
+   try {
+ namespaceId = Tables.getNamespaceId(getInstance(), tableId);
+   } catch (TableNotFoundException e1) {
+ throw new NotServingTabletException(textent);
+   }
+   if (!security.canScan(credentials, tableId, namespaceId, range, 
columns, ssiList, ssio, authorizations))
  throw new ThriftSecurityException(credentials.getPrincipal(), 
SecurityErrorCode.PERMISSION_DENIED);
  
if (!security.userHasAuthorizations(credentials, authorizations))
@@@ -1270,10 -1259,16

66 matches

Mail list logo