You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@accumulo.apache.org by ct...@apache.org on 2017/02/09 22:13:20 UTC
[04/10] accumulo git commit: ACCUMULO-4519 regenerate thrift
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: a9bf10ffff62f25d5810816db23ec80d6b06f61b
Parents: 025aacc
Author: Christopher Tubbs <ct...@apache.org>
Authored: Thu Feb 9 16:28:55 2017 -0500
Committer: Christopher Tubbs <ct...@apache.org>
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<int, const char*> _SystemPermission_VALUES_TO_NAMES(::apache::thrift::TEnumIterator(8, _kSystemPermissionValues, _kSystemPermissionNames), ::apache::thrift::TEnumIterator(-1, NULL, NULL));
+const std::map<int, const char*> _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
_VALUES_TO_NAMES = {
0: "GRANT",
@@ -101,6 +105,10 @@ class SystemPermission:
5: "DROP_USER",
6: "ALTER_USER",
7: "SYSTEM",
+ 8: "CREATE_NAMESPACE",
+ 9: "DROP_NAMESPACE",
+ 10: "ALTER_NAMESPACE",
+ 11: "OBTAIN_DELEGATION_TOKEN",
}
_NAMES_TO_VALUES = {
@@ -112,6 +120,10 @@ class SystemPermission:
"DROP_USER": 5,
"ALTER_USER": 6,
"SYSTEM": 7,
+ "CREATE_NAMESPACE": 8,
+ "DROP_NAMESPACE": 9,
+ "ALTER_NAMESPACE": 10,
+ "OBTAIN_DELEGATION_TOKEN": 11,
}
class ScanType:
http://git-wip-us.apache.org/repos/asf/accumulo/blob/a9bf10ff/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 57306d1..522c80c 100644
--- a/proxy/src/main/ruby/proxy_types.rb
+++ b/proxy/src/main/ruby/proxy_types.rb
@@ -52,8 +52,12 @@ module Accumulo
DROP_USER = 5
ALTER_USER = 6
SYSTEM = 7
- VALUE_MAP = {0 => "GRANT", 1 => "CREATE_TABLE", 2 => "DROP_TABLE", 3 => "ALTER_TABLE", 4 => "CREATE_USER", 5 => "DROP_USER", 6 => "ALTER_USER", 7 => "SYSTEM"}
- VALID_VALUES = Set.new([GRANT, CREATE_TABLE, DROP_TABLE, ALTER_TABLE, CREATE_USER, DROP_USER, ALTER_USER, SYSTEM]).freeze
+ CREATE_NAMESPACE = 8
+ DROP_NAMESPACE = 9
+ ALTER_NAMESPACE = 10
+ OBTAIN_DELEGATION_TOKEN = 11
+ VALUE_MAP = {0 => "GRANT", 1 => "CREATE_TABLE", 2 => "DROP_TABLE", 3 => "ALTER_TABLE", 4 => "CREATE_USER", 5 => "DROP_USER", 6 => "ALTER_USER", 7 => "SYSTEM", 8 => "CREATE_NAMESPACE", 9 => "DROP_NAMESPACE", 10 => "ALTER_NAMESPACE", 11 => "OBTAIN_DELEGATION_TOKEN"}
+ VALID_VALUES = Set.new([GRANT, CREATE_TABLE, DROP_TABLE, ALTER_TABLE, CREATE_USER, DROP_USER, ALTER_USER, SYSTEM, CREATE_NAMESPACE, DROP_NAMESPACE, ALTER_NAMESPACE, OBTAIN_DELEGATION_TOKEN]).freeze
end
module ScanType