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 2019/02/21 01:17:48 UTC
[accumulo] 01/01: Merge branch '1.9'
This is an automated email from the ASF dual-hosted git repository.
ctubbsii pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/accumulo.git
commit 30324d7433bb9edb935e81734594296e98b816b4
Merge: 7c88356 d7fa411
Author: Christopher Tubbs <ct...@apache.org>
AuthorDate: Wed Feb 20 20:16:21 2019 -0500
Merge branch '1.9'
.../core/master/thrift/TabletServerStatus.java | 22 +-
core/src/main/thrift/client.thrift | 276 ++++-
core/src/main/thrift/data.thrift | 160 +--
core/src/main/thrift/gc.thrift | 30 +-
core/src/main/thrift/master.thrift | 269 +++-
core/src/main/thrift/replication.thrift | 43 +-
core/src/main/thrift/security.thrift | 34 +-
core/src/main/thrift/tabletserver.thrift | 535 +++++---
core/src/main/thrift/trace.thrift | 4 +-
proxy/src/main/thrift/proxy.thrift | 1284 ++++++++++++++++----
server/tracer/src/main/thrift/tracer.thrift | 37 +-
test/src/main/thrift/test.thrift | 6 +-
12 files changed, 2062 insertions(+), 638 deletions(-)
diff --cc core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
index f5a36e4,c00558c..e55b59a
--- a/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
+++ b/core/src/main/java/org/apache/accumulo/core/master/thrift/TabletServerStatus.java
@@@ -41,15 -68,17 +41,15 @@@ public class TabletServerStatus impleme
private static final org.apache.thrift.protocol.TField FLUSHS_FIELD_DESC = new org.apache.thrift.protocol.TField("flushs", org.apache.thrift.protocol.TType.I64, (short)15);
private static final org.apache.thrift.protocol.TField SYNCS_FIELD_DESC = new org.apache.thrift.protocol.TField("syncs", org.apache.thrift.protocol.TType.I64, (short)16);
private static final org.apache.thrift.protocol.TField BULK_IMPORTS_FIELD_DESC = new org.apache.thrift.protocol.TField("bulkImports", org.apache.thrift.protocol.TType.LIST, (short)17);
- private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)18);
- private static final org.apache.thrift.protocol.TField RESPONSE_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("responseTime", org.apache.thrift.protocol.TType.I64, (short)19);
++ private static final org.apache.thrift.protocol.TField VERSION_FIELD_DESC = new org.apache.thrift.protocol.TField("version", org.apache.thrift.protocol.TType.STRING, (short)19);
+ private static final org.apache.thrift.protocol.TField RESPONSE_TIME_FIELD_DESC = new org.apache.thrift.protocol.TField("responseTime", org.apache.thrift.protocol.TType.I64, (short)18);
- private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
- static {
- schemes.put(StandardScheme.class, new TabletServerStatusStandardSchemeFactory());
- schemes.put(TupleScheme.class, new TabletServerStatusTupleSchemeFactory());
- }
+ private static final org.apache.thrift.scheme.SchemeFactory STANDARD_SCHEME_FACTORY = new TabletServerStatusStandardSchemeFactory();
+ private static final org.apache.thrift.scheme.SchemeFactory TUPLE_SCHEME_FACTORY = new TabletServerStatusTupleSchemeFactory();
- public Map<String,TableInfo> tableMap; // required
+ public java.util.Map<java.lang.String,TableInfo> tableMap; // required
public long lastContact; // required
- public String name; // required
+ public java.lang.String name; // required
public double osLoad; // required
public long holdTime; // required
public long lookups; // required
@@@ -80,13 -108,12 +80,13 @@@
FLUSHS((short)15, "flushs"),
SYNCS((short)16, "syncs"),
BULK_IMPORTS((short)17, "bulkImports"),
- VERSION((short)18, "version"),
- RESPONSE_TIME((short)19, "responseTime");
++ VERSION((short)19, "version"),
+ RESPONSE_TIME((short)18, "responseTime");
- private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
+ private static final java.util.Map<java.lang.String, _Fields> byName = new java.util.HashMap<java.lang.String, _Fields>();
static {
- for (_Fields field : EnumSet.allOf(_Fields.class)) {
+ for (_Fields field : java.util.EnumSet.allOf(_Fields.class)) {
byName.put(field.getFieldName(), field);
}
}
@@@ -124,9 -151,7 +124,9 @@@
return SYNCS;
case 17: // BULK_IMPORTS
return BULK_IMPORTS;
- case 18: // VERSION
++ case 19: // VERSION
+ return VERSION;
- case 19: // RESPONSE_TIME
+ case 18: // RESPONSE_TIME
return RESPONSE_TIME;
default:
return null;
@@@ -1680,15 -1664,7 +1680,15 @@@
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
}
break;
- case 18: // VERSION
++ case 19: // VERSION
+ if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
+ struct.version = iprot.readString();
+ struct.setVersionIsSet(true);
+ } else {
+ org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
+ }
+ break;
- case 19: // RESPONSE_TIME
+ case 18: // RESPONSE_TIME
if (schemeField.type == org.apache.thrift.protocol.TType.I64) {
struct.responseTime = iprot.readI64();
struct.setResponseTimeIsSet(true);
@@@ -1783,14 -1759,9 +1783,14 @@@
}
oprot.writeFieldEnd();
}
+ oprot.writeFieldBegin(RESPONSE_TIME_FIELD_DESC);
+ oprot.writeI64(struct.responseTime);
+ oprot.writeFieldEnd();
+ if (struct.version != null) {
+ oprot.writeFieldBegin(VERSION_FIELD_DESC);
+ oprot.writeString(struct.version);
+ oprot.writeFieldEnd();
+ }
- oprot.writeFieldBegin(RESPONSE_TIME_FIELD_DESC);
- oprot.writeI64(struct.responseTime);
- oprot.writeFieldEnd();
oprot.writeFieldStop();
oprot.writeStructEnd();
}
diff --cc core/src/main/thrift/client.thrift
index caee66d,0a4af7c..91aec2e
--- a/core/src/main/thrift/client.thrift
+++ b/core/src/main/thrift/client.thrift
@@@ -95,10 -94,6 +95,8 @@@ exception ThriftTableOperationExceptio
5:string description
}
- exception ThriftNotActiveServiceException {
-
- }
++exception ThriftNotActiveServiceException {}
+
struct TDiskUsage {
1:list<string> tables
2:i64 usage
@@@ -111,48 -106,253 +109,254 @@@ service ClientService
string getInstanceId()
string getZooKeepers()
+ // deprecated for new bulkImport
- list<string> bulkImportFiles(1:trace.TInfo tinfo, 8:security.TCredentials credentials, 3:i64 tid, 4:string tableId, 5:list<string> files, 6:string errorDir, 7:bool setTime) throws (1:ThriftSecurityException sec, 2:ThriftTableOperationException tope);
+ list<string> bulkImportFiles(
+ 1:trace.TInfo tinfo
+ 8:security.TCredentials credentials
+ 3:i64 tid
+ 4:string tableId
+ 5:list<string> files
+ 6:string errorDir
+ 7:bool setTime
+ ) throws (
+ 1:ThriftSecurityException sec
+ 2:ThriftTableOperationException tope
+ )
// ensures that nobody is working on the transaction id above
- bool isActive(1:trace.TInfo tinfo, 2:i64 tid)
+ bool isActive(
+ 1:trace.TInfo tinfo
+ 2:i64 tid
+ )
- void ping(2:security.TCredentials credentials) throws (1:ThriftSecurityException sec)
+ void ping(
+ 2:security.TCredentials credentials
+ ) throws (
+ 1:ThriftSecurityException sec
+ )
- list<TDiskUsage> getDiskUsage(2:set<string> tables, 1:security.TCredentials credentials) throws (1:ThriftSecurityException sec, 2:ThriftTableOperationException toe)
+ list<TDiskUsage> getDiskUsage(
+ 2:set<string> tables
+ 1:security.TCredentials credentials
+ ) throws (
+ 1:ThriftSecurityException sec
+ 2:ThriftTableOperationException toe
+ )
// user management methods
- set<string> listLocalUsers(2:trace.TInfo tinfo, 3:security.TCredentials credentials) throws (1:ThriftSecurityException sec)
- void createLocalUser(5:trace.TInfo tinfo, 6:security.TCredentials credentials, 2:string principal, 3:binary password) throws (1:ThriftSecurityException sec)
- void dropLocalUser(3:trace.TInfo tinfo, 4:security.TCredentials credentials, 2:string principal) throws (1:ThriftSecurityException sec)
- void changeLocalUserPassword(4:trace.TInfo tinfo, 5:security.TCredentials credentials, 2:string principal, 3:binary password) throws (1:ThriftSecurityException sec)
+ set<string> listLocalUsers(
+ 2:trace.TInfo tinfo
+ 3:security.TCredentials credentials
+ ) throws (
+ 1:ThriftSecurityException sec
+ )
+
+ void createLocalUser(
+ 5:trace.TInfo tinfo
+ 6:security.TCredentials credentials
+ 2:string principal
+ 3:binary password
+ ) throws (
+ 1:ThriftSecurityException sec
+ )
+
+ void dropLocalUser(
+ 3:trace.TInfo tinfo
+ 4:security.TCredentials credentials
+ 2:string principal
+ ) throws (
+ 1:ThriftSecurityException sec
+ )
+
+ void changeLocalUserPassword(
+ 4:trace.TInfo tinfo
+ 5:security.TCredentials credentials
+ 2:string principal
+ 3:binary password
+ ) throws (
+ 1:ThriftSecurityException sec
+ )
// authentication-related methods
- bool authenticate(1:trace.TInfo tinfo, 2:security.TCredentials credentials) throws (1:ThriftSecurityException sec)
- bool authenticateUser(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:security.TCredentials toAuth) throws (1:ThriftSecurityException sec)
+ bool authenticate(
+ 1:trace.TInfo tinfo
+ 2:security.TCredentials credentials
+ ) throws (
+ 1:ThriftSecurityException sec
+ )
+
+ bool authenticateUser(
+ 1:trace.TInfo tinfo
+ 2:security.TCredentials credentials
+ 3:security.TCredentials toAuth
+ ) throws (
+ 1:ThriftSecurityException sec
+ )
// authorization-related methods
- void changeAuthorizations(4:trace.TInfo tinfo, 5:security.TCredentials credentials, 2:string principal, 3:list<binary> authorizations) throws (1:ThriftSecurityException sec)
- list<binary> getUserAuthorizations(3:trace.TInfo tinfo, 4:security.TCredentials credentials, 2:string principal) throws (1:ThriftSecurityException sec)
+ void changeAuthorizations(
+ 4:trace.TInfo tinfo
+ 5:security.TCredentials credentials
+ 2:string principal
+ 3:list<binary> authorizations
+ ) throws (
+ 1:ThriftSecurityException sec
+ )
+
+ list<binary> getUserAuthorizations(
+ 3:trace.TInfo tinfo
+ 4:security.TCredentials credentials
+ 2:string principal
+ ) throws (
+ 1:ThriftSecurityException sec
+ )
// permissions-related methods
- bool hasSystemPermission(4:trace.TInfo tinfo, 5:security.TCredentials credentials, 2:string principal, 3:i8 sysPerm) throws (1:ThriftSecurityException sec)
- bool hasTablePermission(5:trace.TInfo tinfo, 6:security.TCredentials credentials, 2:string principal, 3:string tableName, 4:i8 tblPerm) throws (1:ThriftSecurityException sec, 2:ThriftTableOperationException tope)
- bool hasNamespacePermission(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:string principal, 4:string ns, 5:i8 tblNspcPerm) throws (1:ThriftSecurityException sec, 2:ThriftTableOperationException tope)
- void grantSystemPermission(4:trace.TInfo tinfo, 5:security.TCredentials credentials, 2:string principal, 3:i8 permission) throws (1:ThriftSecurityException sec)
- void revokeSystemPermission(4:trace.TInfo tinfo, 5:security.TCredentials credentials, 2:string principal, 3:i8 permission) throws (1:ThriftSecurityException sec)
- void grantTablePermission(5:trace.TInfo tinfo, 6:security.TCredentials credentials, 2:string principal, 3:string tableName, 4:i8 permission) throws (1:ThriftSecurityException sec, 2:ThriftTableOperationException tope)
- void revokeTablePermission(5:trace.TInfo tinfo, 6:security.TCredentials credentials, 2:string principal, 3:string tableName, 4:i8 permission) throws (1:ThriftSecurityException sec, 2:ThriftTableOperationException tope)
- void grantNamespacePermission(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:string principal, 4:string ns, 5:i8 permission) throws (1:ThriftSecurityException sec, 2:ThriftTableOperationException tope)
- void revokeNamespacePermission(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:string principal, 4:string ns, 5:i8 permission) throws (1:ThriftSecurityException sec, 2:ThriftTableOperationException tope)
+ bool hasSystemPermission(
+ 4:trace.TInfo tinfo
+ 5:security.TCredentials credentials
+ 2:string principal
- 3:byte sysPerm
++ 3:i8 sysPerm
+ ) throws (
+ 1:ThriftSecurityException sec
+ )
+
+ bool hasTablePermission(
+ 5:trace.TInfo tinfo
+ 6:security.TCredentials credentials
+ 2:string principal
+ 3:string tableName
- 4:byte tblPerm
++ 4:i8 tblPerm
+ ) throws (
+ 1:ThriftSecurityException sec
+ 2:ThriftTableOperationException tope
+ )
+
+ bool hasNamespacePermission(
+ 1:trace.TInfo tinfo
+ 2:security.TCredentials credentials
+ 3:string principal
+ 4:string ns
- 5:byte tblNspcPerm
++ 5:i8 tblNspcPerm
+ ) throws (
+ 1:ThriftSecurityException sec
+ 2:ThriftTableOperationException tope
+ )
+
+ void grantSystemPermission(
+ 4:trace.TInfo tinfo
+ 5:security.TCredentials credentials
+ 2:string principal
- 3:byte permission
++ 3:i8 permission
+ ) throws (
+ 1:ThriftSecurityException sec
+ )
+
+ void revokeSystemPermission(
+ 4:trace.TInfo tinfo
+ 5:security.TCredentials credentials
+ 2:string principal
- 3:byte permission
++ 3:i8 permission
+ ) throws (
+ 1:ThriftSecurityException sec
+ )
+
+ void grantTablePermission(
+ 5:trace.TInfo tinfo
+ 6:security.TCredentials credentials
+ 2:string principal
+ 3:string tableName
- 4:byte permission
++ 4:i8 permission
+ ) throws (
+ 1:ThriftSecurityException sec
+ 2:ThriftTableOperationException tope
+ )
+
+ void revokeTablePermission(
+ 5:trace.TInfo tinfo
+ 6:security.TCredentials credentials
+ 2:string principal
+ 3:string tableName
- 4:byte permission
++ 4:i8 permission
+ ) throws (
+ 1:ThriftSecurityException sec
+ 2:ThriftTableOperationException tope
+ )
+
+ void grantNamespacePermission(
+ 1:trace.TInfo tinfo
+ 2:security.TCredentials credentials
+ 3:string principal
+ 4:string ns
- 5:byte permission
++ 5:i8 permission
+ ) throws (
+ 1:ThriftSecurityException sec
+ 2:ThriftTableOperationException tope
+ )
+
+ void revokeNamespacePermission(
+ 1:trace.TInfo tinfo
+ 2:security.TCredentials credentials
+ 3:string principal
+ 4:string ns
- 5:byte permission
++ 5:i8 permission
+ ) throws (
+ 1:ThriftSecurityException sec
+ 2:ThriftTableOperationException tope
+ )
// configuration methods
- map<string, string> getConfiguration(2:trace.TInfo tinfo, 3:security.TCredentials credentials, 1:ConfigurationType type);
- map<string, string> getTableConfiguration(1:trace.TInfo tinfo, 3:security.TCredentials credentials, 2:string tableName) throws (1:ThriftTableOperationException tope);
- map<string, string> getNamespaceConfiguration(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:string ns) throws (1:ThriftTableOperationException tope);
- bool checkClass(1:trace.TInfo tinfo, 4:security.TCredentials credentials, 2:string className, 3:string interfaceMatch);
- bool checkTableClass(1:trace.TInfo tinfo, 5:security.TCredentials credentials, 2:string tableId, 3:string className, 4:string interfaceMatch) throws (1:ThriftSecurityException sec, 2:ThriftTableOperationException tope);
- bool checkNamespaceClass(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:string namespaceId, 4:string className, 5:string interfaceMatch) throws (1:ThriftSecurityException sec, 2:ThriftTableOperationException tope);
+ map<string, string> getConfiguration(
+ 2:trace.TInfo tinfo
+ 3:security.TCredentials credentials
+ 1:ConfigurationType type
+ )
+
+ map<string, string> getTableConfiguration(
+ 1:trace.TInfo tinfo
+ 3:security.TCredentials credentials
+ 2:string tableName
+ ) throws (
+ 1:ThriftTableOperationException tope
+ )
+
+ map<string, string> getNamespaceConfiguration(
+ 1:trace.TInfo tinfo
+ 2:security.TCredentials credentials
+ 3:string ns
+ ) throws (
+ 1:ThriftTableOperationException tope
+ )
+
+ bool checkClass(
+ 1:trace.TInfo tinfo
+ 4:security.TCredentials credentials
+ 2:string className
+ 3:string interfaceMatch
+ )
+
+ bool checkTableClass(
+ 1:trace.TInfo tinfo
+ 5:security.TCredentials credentials
+ 2:string tableId
+ 3:string className
+ 4:string interfaceMatch
+ ) throws (
+ 1:ThriftSecurityException sec
+ 2:ThriftTableOperationException tope
+ )
+
+ bool checkNamespaceClass(
+ 1:trace.TInfo tinfo
+ 2:security.TCredentials credentials
+ 3:string namespaceId
+ 4:string className
+ 5:string interfaceMatch
+ ) throws (
+ 1:ThriftSecurityException sec
+ 2:ThriftTableOperationException tope
+ )
+
}
// Only used for a unit test
diff --cc core/src/main/thrift/data.thrift
index a99d8ad,001dba6..7a0004b
--- a/core/src/main/thrift/data.thrift
+++ b/core/src/main/thrift/data.thrift
@@@ -144,47 -144,13 +144,47 @@@ struct TConditionalMutation
}
struct TConditionalSession {
- 1:i64 sessionId;
- 2:string tserverLock;
- 3:i64 ttl;
+ 1:i64 sessionId
+ 2:string tserverLock
+ 3:i64 ttl
}
+struct TSummarizerConfiguration {
+ 1:string classname
+ 2:map<string, string> options
+ 3:string configId
+}
+
+struct TSummary {
- 1:map<string, i64> summary
- 2:TSummarizerConfiguration config
- 3:i64 filesContaining
- 4:i64 filesExceeding
- 5:i64 filesLarge
++ 1:map<string, i64> summary
++ 2:TSummarizerConfiguration config
++ 3:i64 filesContaining
++ 4:i64 filesExceeding
++ 5:i64 filesLarge
+}
+
+struct TSummaries {
- 1:bool finished
- 2:i64 sessionId
- 3:i64 totalFiles
- 4:i64 deletedFiles
- 5:list<TSummary> summaries
++ 1:bool finished
++ 2:i64 sessionId
++ 3:i64 totalFiles
++ 4:i64 deletedFiles
++ 5:list<TSummary> summaries
+}
+
+struct TRowRange {
+ 1:binary startRow
+ 2:binary endRow
+}
+
+struct TSummaryRequest {
+ 1:string tableId
+ 2:TRowRange bounds
+ 3:list<TSummarizerConfiguration> summarizers
+ 4:string summarizerPattern
+}
+
- typedef map<TKeyExtent,list<TConditionalMutation>> CMBatch
+ typedef map<TKeyExtent, list<TConditionalMutation>> CMBatch
- typedef map<TKeyExtent,list<TMutation>> UpdateBatch
+ typedef map<TKeyExtent, list<TMutation>> UpdateBatch
typedef map<TKeyExtent, map<string, MapFileInfo>> TabletFiles
diff --cc core/src/main/thrift/master.thrift
index 761ef1e,9f8af05..d9693d6
--- a/core/src/main/thrift/master.thrift
+++ b/core/src/main/thrift/master.thrift
@@@ -85,8 -86,7 +86,8 @@@ struct TabletServerStatus
15:i64 flushs
16:i64 syncs
17:list<BulkImportStatus> bulkImports
- 18:string version
- 19:i64 responseTime
++ 19:string version
+ 18:i64 responseTime
}
enum MasterState {
@@@ -162,48 -161,210 +163,232 @@@ enum FateOperation
}
service FateService {
+
// register a fate operation by reserving an opid
- i64 beginFateOperation(2:trace.TInfo tinfo, 1:security.TCredentials credentials) throws (1:client.ThriftSecurityException sec, 2:client.ThriftNotActiveServiceException tnase)
+ i64 beginFateOperation(
+ 2:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ ) throws (
+ 1:client.ThriftSecurityException sec
++ 2:client.ThriftNotActiveServiceException tnase
+ )
+
// initiate execution of the fate operation; set autoClean to true if not waiting for completion
- void executeFateOperation(7:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:i64 opid, 3:FateOperation op, 4:list<binary> arguments, 5:map<string, string> options, 6:bool autoClean) throws (1:client.ThriftSecurityException sec, 2:client.ThriftTableOperationException tope, 3:client.ThriftNotActiveServiceException tnase)
+ void executeFateOperation(
+ 7:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 2:i64 opid
+ 3:FateOperation op
+ 4:list<binary> arguments
+ 5:map<string, string> options
+ 6:bool autoClean
+ ) throws (
+ 1:client.ThriftSecurityException sec
+ 2:client.ThriftTableOperationException tope
++ 3:client.ThriftNotActiveServiceException tnase
+ )
+
// wait for completion of the operation and get the returned exception, if any
- string waitForFateOperation(3:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:i64 opid) throws (1:client.ThriftSecurityException sec, 2:client.ThriftTableOperationException tope, 3:client.ThriftNotActiveServiceException tnase)
+ string waitForFateOperation(
+ 3:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 2:i64 opid
+ ) throws (
+ 1:client.ThriftSecurityException sec
+ 2:client.ThriftTableOperationException tope
++ 3:client.ThriftNotActiveServiceException tnase
+ )
+
// clean up fate operation if autoClean was not set, after waiting
- void finishFateOperation(3:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:i64 opid) throws (1:client.ThriftSecurityException sec, 2:client.ThriftNotActiveServiceException tnase)
+ void finishFateOperation(
+ 3:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 2:i64 opid
+ ) throws (
+ 1:client.ThriftSecurityException sec
++ 2:client.ThriftNotActiveServiceException tnase
+ )
+
}
service MasterClientService extends FateService {
// table management methods
- i64 initiateFlush(3:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string tableName) throws (1:client.ThriftSecurityException sec, 2:client.ThriftTableOperationException tope, 3:client.ThriftNotActiveServiceException tnase)
- void waitForFlush(5:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string tableName, 6:binary startRow, 7:binary endRow, 3:i64 flushID, 4:i64 maxLoops) throws (1:client.ThriftSecurityException sec, 2:client.ThriftTableOperationException tope, 3:client.ThriftNotActiveServiceException tnase)
+ i64 initiateFlush(
+ 3:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 2:string tableName
+ ) throws (
+ 1:client.ThriftSecurityException sec
+ 2:client.ThriftTableOperationException tope
++ 3:client.ThriftNotActiveServiceException tnase
+ )
+
+ void waitForFlush(
+ 5:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 2:string tableName
+ 6:binary startRow
+ 7:binary endRow
+ 3:i64 flushID
+ 4:i64 maxLoops
+ ) throws (
+ 1:client.ThriftSecurityException sec
+ 2:client.ThriftTableOperationException tope
++ 3:client.ThriftNotActiveServiceException tnase
+ )
+
+ void setTableProperty(
+ 5:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 2:string tableName
+ 3:string property
+ 4:string value
+ ) throws (
+ 1:client.ThriftSecurityException sec
+ 2:client.ThriftTableOperationException tope
++ 3:client.ThriftNotActiveServiceException tnase
+ )
- void setTableProperty(5:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string tableName, 3:string property, 4:string value) throws (1:client.ThriftSecurityException sec, 2:client.ThriftTableOperationException tope, 3:client.ThriftNotActiveServiceException tnase)
- void removeTableProperty(4:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string tableName, 3:string property) throws (1:client.ThriftSecurityException sec, 2:client.ThriftTableOperationException tope, 3:client.ThriftNotActiveServiceException tnase)
+ void removeTableProperty(
+ 4:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 2:string tableName
+ 3:string property
+ ) throws (
+ 1:client.ThriftSecurityException sec
+ 2:client.ThriftTableOperationException tope
++ 3:client.ThriftNotActiveServiceException tnase
+ )
- void setNamespaceProperty(5:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string ns, 3:string property, 4:string value) throws (1:client.ThriftSecurityException sec, 2:client.ThriftTableOperationException tope, 3:client.ThriftNotActiveServiceException tnase)
- void removeNamespaceProperty(4:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string ns, 3:string property) throws (1:client.ThriftSecurityException sec, 2:client.ThriftTableOperationException tope, 3:client.ThriftNotActiveServiceException tnase)
+ void setNamespaceProperty(
+ 5:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 2:string ns
+ 3:string property
+ 4:string value
+ ) throws (
+ 1:client.ThriftSecurityException sec
+ 2:client.ThriftTableOperationException tope
++ 3:client.ThriftNotActiveServiceException tnase
+ )
+
+ void removeNamespaceProperty(
+ 4:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 2:string ns
+ 3:string property
+ ) throws (
+ 1:client.ThriftSecurityException sec
+ 2:client.ThriftTableOperationException tope
++ 3:client.ThriftNotActiveServiceException tnase
+ )
// system management methods
- void setMasterGoalState(3:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:MasterGoalState state) throws (1:client.ThriftSecurityException sec, 2:client.ThriftNotActiveServiceException tnase);
- void shutdown(3:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:bool stopTabletServers) throws (1:client.ThriftSecurityException sec, 2:client.ThriftNotActiveServiceException tnase)
- void shutdownTabletServer(3:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string tabletServer, 4:bool force) throws (1: client.ThriftSecurityException sec, 2:client.ThriftNotActiveServiceException tnase)
- void setSystemProperty(4:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string property, 3:string value) throws (1:client.ThriftSecurityException sec, 2:client.ThriftNotActiveServiceException tnase)
- void removeSystemProperty(3:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string property) throws (1:client.ThriftSecurityException sec, 2:client.ThriftNotActiveServiceException tnase)
+ void setMasterGoalState(
+ 3:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 2:MasterGoalState state
+ ) throws (
+ 1:client.ThriftSecurityException sec
++ 2:client.ThriftNotActiveServiceException tnase
+ )
+
+ void shutdown(
+ 3:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 2:bool stopTabletServers
+ ) throws (
+ 1:client.ThriftSecurityException sec
++ 2:client.ThriftNotActiveServiceException tnase
+ )
+
+ void shutdownTabletServer(
+ 3:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 2:string tabletServer
+ 4:bool force
+ ) throws (
+ 1: client.ThriftSecurityException sec
++ 2:client.ThriftNotActiveServiceException tnase
+ )
+
+ void setSystemProperty(
+ 4:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 2:string property
+ 3:string value
+ ) throws (
+ 1:client.ThriftSecurityException sec
++ 2:client.ThriftNotActiveServiceException tnase
+ )
+
+ void removeSystemProperty(
+ 3:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 2:string property
+ ) throws (
+ 1:client.ThriftSecurityException sec
++ 2:client.ThriftNotActiveServiceException tnase
+ )
// system monitoring methods
- MasterMonitorInfo getMasterStats(2:trace.TInfo tinfo, 1:security.TCredentials credentials) throws (1:client.ThriftSecurityException sec, 2:client.ThriftNotActiveServiceException tnase)
- void waitForBalance(1:trace.TInfo tinfo) throws (1:client.ThriftNotActiveServiceException tnase)
+ MasterMonitorInfo getMasterStats(
+ 2:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ ) throws (
+ 1:client.ThriftSecurityException sec
++ 2:client.ThriftNotActiveServiceException tnase
+ )
+
+ void waitForBalance(
+ 1:trace.TInfo tinfo
++ ) throws (
++ 1:client.ThriftNotActiveServiceException tnase
+ )
// tablet server reporting
- oneway void reportSplitExtent(4:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string serverName, 3:TabletSplit split)
- oneway void reportTabletStatus(5:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string serverName, 3:TabletLoadState status, 4:data.TKeyExtent tablet)
+ oneway void reportSplitExtent(
+ 4:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 2:string serverName
+ 3:TabletSplit split
+ )
- list<string> getActiveTservers(1:trace.TInfo tinfo, 2:security.TCredentials credentials) throws (1:client.ThriftSecurityException sec, 2:client.ThriftNotActiveServiceException tnase)
+ oneway void reportTabletStatus(
+ 5:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 2:string serverName
+ 3:TabletLoadState status
+ 4:data.TKeyExtent tablet
+ )
+
+ list<string> getActiveTservers(
+ 1:trace.TInfo tinfo
+ 2:security.TCredentials credentials
+ ) throws (
+ 1:client.ThriftSecurityException sec
++ 2:client.ThriftNotActiveServiceException tnase
+ )
// Delegation token request
- security.TDelegationToken getDelegationToken(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:security.TDelegationTokenConfig cfg) throws (1:client.ThriftSecurityException sec, 2:client.ThriftNotActiveServiceException tnase)
+ security.TDelegationToken getDelegationToken(
+ 1:trace.TInfo tinfo
+ 2:security.TCredentials credentials
+ 3:security.TDelegationTokenConfig cfg
+ ) throws (
+ 1:client.ThriftSecurityException sec
++ 2:client.ThriftNotActiveServiceException tnase
+ )
// Determine when all provided logs are replicated
- bool drainReplicationTable(1:trace.TInfo tfino, 2:security.TCredentials credentials, 3:string tableName, 4:set<string> logsToWatch) throws (1:client.ThriftNotActiveServiceException tnase)
+ bool drainReplicationTable(
+ 1:trace.TInfo tfino
+ 2:security.TCredentials credentials
+ 3:string tableName
+ 4:set<string> logsToWatch
++ ) throws (
++ 1:client.ThriftNotActiveServiceException tnase
+ )
+
}
diff --cc core/src/main/thrift/security.thrift
index b76ec9c,b011720..20947c4
--- a/core/src/main/thrift/security.thrift
+++ b/core/src/main/thrift/security.thrift
@@@ -14,14 -14,14 +14,14 @@@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-namespace java org.apache.accumulo.core.security.thrift
-namespace cpp org.apache.accumulo.core.security.thrift
+namespace java org.apache.accumulo.core.securityImpl.thrift
+namespace cpp org.apache.accumulo.core.securityImpl.thrift
struct TCredentials {
- 1:string principal,
- 2:string tokenClassName,
- 3:binary token,
- 4:string instanceId
+ 1:string principal
+ 2:string tokenClassName
+ 3:binary token
+ 4:string instanceId
}
struct TAuthenticationTokenIdentifier {
diff --cc core/src/main/thrift/tabletserver.thrift
index 8439a82,6d73f9f..0c562b8
--- a/core/src/main/thrift/tabletserver.thrift
+++ b/core/src/main/thrift/tabletserver.thrift
@@@ -154,91 -157,277 +157,323 @@@ enum TUnloadTabletGoal
}
service TabletClientService extends client.ClientService {
+
// scan a range of keys
- data.InitialScan startScan(11:trace.TInfo tinfo,
- 1:security.TCredentials credentials,
- 2:data.TKeyExtent extent,
- 3:data.TRange range,
- 4:list<data.TColumn> columns,
- 5:i32 batchSize,
- 6:list<data.IterInfo> ssiList,
- 7:map<string, map<string, string>> ssio,
- 8:list<binary> authorizations
- 9:bool waitForWrites,
- 10:bool isolated,
- 12:i64 readaheadThreshold,
- 13:TSamplerConfiguration samplerConfig,
- 14:i64 batchTimeOut,
- 15:string classLoaderContext, /* name of the classloader context */
- 16:map<string,string> executionHints) throws (1:client.ThriftSecurityException sec, 2:NotServingTabletException nste, 3:TooManyFilesException tmfe, 4:TSampleNotPresentException tsnpe),
-
- data.ScanResult continueScan(2:trace.TInfo tinfo, 1:data.ScanID scanID) throws (1:NoSuchScanIDException nssi, 2:NotServingTabletException nste, 3:TooManyFilesException tmfe, 4:TSampleNotPresentException tsnpe),
- oneway void closeScan(2:trace.TInfo tinfo, 1:data.ScanID scanID),
+ data.InitialScan startScan(
+ 11:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 2:data.TKeyExtent extent
+ 3:data.TRange range
+ 4:list<data.TColumn> columns
+ 5:i32 batchSize
+ 6:list<data.IterInfo> ssiList
+ 7:map<string, map<string, string>> ssio
+ 8:list<binary> authorizations
+ 9:bool waitForWrites
+ 10:bool isolated
+ 12:i64 readaheadThreshold
+ 13:TSamplerConfiguration samplerConfig
+ 14:i64 batchTimeOut
+ // name of the classloader context
+ 15:string classLoaderContext
++ 16:map<string, string> executionHints
+ ) throws (
+ 1:client.ThriftSecurityException sec
+ 2:NotServingTabletException nste
+ 3:TooManyFilesException tmfe
+ 4:TSampleNotPresentException tsnpe
+ )
+
+ data.ScanResult continueScan(
+ 2:trace.TInfo tinfo
+ 1:data.ScanID scanID
+ ) throws (
+ 1:NoSuchScanIDException nssi
+ 2:NotServingTabletException nste
+ 3:TooManyFilesException tmfe
+ 4:TSampleNotPresentException tsnpe
+ )
+
+ oneway void closeScan(
+ 2:trace.TInfo tinfo
+ 1:data.ScanID scanID
+ )
// scan over a series of ranges
- data.InitialMultiScan startMultiScan(8:trace.TInfo tinfo,
- 1:security.TCredentials credentials,
- 2:data.ScanBatch batch,
- 3:list<data.TColumn> columns,
- 4:list<data.IterInfo> ssiList,
- 5:map<string, map<string, string>> ssio,
- 6:list<binary> authorizations,
- 7:bool waitForWrites,
- 9:TSamplerConfiguration samplerConfig,
- 10:i64 batchTimeOut,
- 11:string classLoaderContext, /* name of the classloader context */
- 12:map<string, string> executionHints) throws (1:client.ThriftSecurityException sec, 2:TSampleNotPresentException tsnpe),
- data.MultiScanResult continueMultiScan(2:trace.TInfo tinfo, 1:data.ScanID scanID) throws (1:NoSuchScanIDException nssi, 2:TSampleNotPresentException tsnpe),
- void closeMultiScan(2:trace.TInfo tinfo, 1:data.ScanID scanID) throws (1:NoSuchScanIDException nssi),
-
+ data.InitialMultiScan startMultiScan(
+ 8:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 2:data.ScanBatch batch
+ 3:list<data.TColumn> columns
+ 4:list<data.IterInfo> ssiList
+ 5:map<string, map<string, string>> ssio
+ 6:list<binary> authorizations
+ 7:bool waitForWrites
+ 9:TSamplerConfiguration samplerConfig
+ 10:i64 batchTimeOut
+ // name of the classloader context
+ 11:string classLoaderContext
++ 12:map<string, string> executionHints
+ ) throws (
+ 1:client.ThriftSecurityException sec
+ 2:TSampleNotPresentException tsnpe
+ )
+
+ data.MultiScanResult continueMultiScan(
+ 2:trace.TInfo tinfo
+ 1:data.ScanID scanID
+ ) throws (
+ 1:NoSuchScanIDException nssi
+ 2:TSampleNotPresentException tsnpe
+ )
+
+ void closeMultiScan(
+ 2:trace.TInfo tinfo
+ 1:data.ScanID scanID
+ ) throws (
+ 1:NoSuchScanIDException nssi
+ )
+
//the following calls support a batch update to multiple tablets on a tablet server
- data.UpdateID startUpdate(2:trace.TInfo tinfo, 1:security.TCredentials credentials, 3:TDurability durability) throws (1:client.ThriftSecurityException sec),
- oneway void applyUpdates(1:trace.TInfo tinfo, 2:data.UpdateID updateID, 3:data.TKeyExtent keyExtent, 4:list<data.TMutation> mutations),
- data.UpdateErrors closeUpdate(2:trace.TInfo tinfo, 1:data.UpdateID updateID) throws (1:NoSuchScanIDException nssi),
+ data.UpdateID startUpdate(
+ 2:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 3:TDurability durability
+ ) throws (
+ 1:client.ThriftSecurityException sec
+ )
+
+ oneway void applyUpdates(
+ 1:trace.TInfo tinfo
+ 2:data.UpdateID updateID
+ 3:data.TKeyExtent keyExtent
+ 4:list<data.TMutation> mutations
+ )
+
+ data.UpdateErrors closeUpdate(
+ 2:trace.TInfo tinfo
+ 1:data.UpdateID updateID
+ ) throws (
+ 1:NoSuchScanIDException nssi
+ )
//the following call supports making a single update to a tablet
- void update(4:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:data.TKeyExtent keyExtent, 3:data.TMutation mutation, 5:TDurability durability)
- throws (1:client.ThriftSecurityException sec,
- 2:NotServingTabletException nste,
- 3:ConstraintViolationException cve),
-
- data.TConditionalSession startConditionalUpdate(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:list<binary> authorizations, 4:string tableID, 5:TDurability durability, 6:string classLoaderContext)
- throws (1:client.ThriftSecurityException sec);
-
- list<data.TCMResult> conditionalUpdate(1:trace.TInfo tinfo, 2:data.UpdateID sessID, 3:data.CMBatch mutations, 4:list<string> symbols)
- throws (1:NoSuchScanIDException nssi);
- void invalidateConditionalUpdate(1:trace.TInfo tinfo, 2:data.UpdateID sessID);
- oneway void closeConditionalUpdate(1:trace.TInfo tinfo, 2:data.UpdateID sessID);
+ void update(
+ 4:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 2:data.TKeyExtent keyExtent
+ 3:data.TMutation mutation
+ 5:TDurability durability
+ ) throws (
+ 1:client.ThriftSecurityException sec
+ 2:NotServingTabletException nste
+ 3:ConstraintViolationException cve
+ )
+
+ data.TConditionalSession startConditionalUpdate(
+ 1:trace.TInfo tinfo
+ 2:security.TCredentials credentials
+ 3:list<binary> authorizations
+ 4:string tableID
+ 5:TDurability durability
+ 6:string classLoaderContext
+ ) throws (
+ 1:client.ThriftSecurityException sec
+ )
+
+ list<data.TCMResult> conditionalUpdate(
+ 1:trace.TInfo tinfo
+ 2:data.UpdateID sessID
+ 3:data.CMBatch mutations
+ 4:list<string> symbols
+ ) throws (
+ 1:NoSuchScanIDException nssi
+ )
+
+ void invalidateConditionalUpdate(
+ 1:trace.TInfo tinfo
+ 2:data.UpdateID sessID
+ )
+
+ oneway void closeConditionalUpdate(
+ 1:trace.TInfo tinfo
+ 2:data.UpdateID sessID
+ )
// on success, returns an empty list
- list<data.TKeyExtent> bulkImport(3:trace.TInfo tinfo, 1:security.TCredentials credentials, 4:i64 tid, 2:data.TabletFiles files, 5:bool setTime) throws (1:client.ThriftSecurityException sec),
-
- oneway void loadFiles(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:i64 tid, 4:string dir, 5:map<data.TKeyExtent, map<string, data.MapFileInfo>> files, 6:bool setTime);
-
- void splitTablet(4:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:data.TKeyExtent extent, 3:binary splitPoint) throws (1:client.ThriftSecurityException sec, 2:NotServingTabletException nste)
-
- oneway void loadTablet(5:trace.TInfo tinfo, 1:security.TCredentials credentials, 4:string lock, 2:data.TKeyExtent extent),
- oneway void unloadTablet(5:trace.TInfo tinfo, 1:security.TCredentials credentials, 4:string lock, 2:data.TKeyExtent extent, 6:TUnloadTabletGoal goal, 7:i64 requestTime),
- oneway void flush(4:trace.TInfo tinfo, 1:security.TCredentials credentials, 3:string lock, 2:string tableId, 5:binary startRow, 6:binary endRow),
- oneway void flushTablet(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:string lock, 4:data.TKeyExtent extent),
- oneway void chop(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:string lock, 4:data.TKeyExtent extent),
- oneway void compact(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:string lock, 4:string tableId, 5:binary startRow, 6:binary endRow),
-
- master.TabletServerStatus getTabletServerStatus(3:trace.TInfo tinfo, 1:security.TCredentials credentials) throws (1:client.ThriftSecurityException sec)
- list<TabletStats> getTabletStats(3:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string tableId) throws (1:client.ThriftSecurityException sec)
- TabletStats getHistoricalStats(2:trace.TInfo tinfo, 1:security.TCredentials credentials) throws (1:client.ThriftSecurityException sec)
- void halt(3:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string lock) throws (1:client.ThriftSecurityException sec)
- oneway void fastHalt(3:trace.TInfo tinfo, 1:security.TCredentials credentials, 2:string lock);
-
- list<ActiveScan> getActiveScans(2:trace.TInfo tinfo, 1:security.TCredentials credentials) throws (1:client.ThriftSecurityException sec)
- list<ActiveCompaction> getActiveCompactions(2:trace.TInfo tinfo, 1:security.TCredentials credentials) throws (1:client.ThriftSecurityException sec)
- oneway void removeLogs(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:list<string> filenames)
- list<string> getActiveLogs(1:trace.TInfo tinfo, 2:security.TCredentials credentials)
-
- data.TSummaries startGetSummaries(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:data.TSummaryRequest request) throws (1:client.ThriftSecurityException sec, 2:client.ThriftTableOperationException tope)
- data.TSummaries startGetSummariesForPartition(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:data.TSummaryRequest request, 4:i32 modulus, 5:i32 remainder) throws (1:client.ThriftSecurityException sec)
- data.TSummaries startGetSummariesFromFiles(1:trace.TInfo tinfo, 2:security.TCredentials credentials, 3:data.TSummaryRequest request, 4:map<string,list<data.TRowRange>> files) throws (1:client.ThriftSecurityException sec)
- data.TSummaries contiuneGetSummaries(1:trace.TInfo tinfo, 2:i64 sessionId) throws (1:NoSuchScanIDException nssi)
+ list<data.TKeyExtent> bulkImport(
+ 3:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 4:i64 tid
+ 2:data.TabletFiles files
+ 5:bool setTime
+ ) throws (
+ 1:client.ThriftSecurityException sec
+ )
+
++ oneway void loadFiles(
++ 1:trace.TInfo tinfo
++ 2:security.TCredentials credentials
++ 3:i64 tid
++ 4:string dir
++ 5:map<data.TKeyExtent, map<string, data.MapFileInfo>> files
++ 6:bool setTime
++ )
++
+ void splitTablet(
+ 4:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 2:data.TKeyExtent extent
+ 3:binary splitPoint
+ ) throws (
+ 1:client.ThriftSecurityException sec
+ 2:NotServingTabletException nste
+ )
+
+ oneway void loadTablet(
+ 5:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 4:string lock
+ 2:data.TKeyExtent extent
+ )
+
+ oneway void unloadTablet(
+ 5:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 4:string lock
+ 2:data.TKeyExtent extent
+ 6:TUnloadTabletGoal goal
+ 7:i64 requestTime
+ )
+
+ oneway void flush(
+ 4:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 3:string lock
+ 2:string tableId
+ 5:binary startRow
+ 6:binary endRow
+ )
+
+ oneway void flushTablet(
+ 1:trace.TInfo tinfo
+ 2:security.TCredentials credentials
+ 3:string lock
+ 4:data.TKeyExtent extent
+ )
+
+ oneway void chop(
+ 1:trace.TInfo tinfo
+ 2:security.TCredentials credentials
+ 3:string lock
+ 4:data.TKeyExtent extent
+ )
+
+ oneway void compact(
+ 1:trace.TInfo tinfo
+ 2:security.TCredentials credentials
+ 3:string lock
+ 4:string tableId
+ 5:binary startRow
+ 6:binary endRow
+ )
+
+ master.TabletServerStatus getTabletServerStatus(
+ 3:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ ) throws (
+ 1:client.ThriftSecurityException sec
+ )
+
+ list<TabletStats> getTabletStats(
+ 3:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 2:string tableId
+ ) throws (
+ 1:client.ThriftSecurityException sec
+ )
+
+ TabletStats getHistoricalStats(
+ 2:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ ) throws (
+ 1:client.ThriftSecurityException sec
+ )
+
+ void halt(
+ 3:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 2:string lock
+ ) throws (
+ 1:client.ThriftSecurityException sec
+ )
+
+ oneway void fastHalt(
+ 3:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ 2:string lock
+ )
+
+ list<ActiveScan> getActiveScans(
+ 2:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ ) throws (
+ 1:client.ThriftSecurityException sec
+ )
+
+ list<ActiveCompaction> getActiveCompactions(
+ 2:trace.TInfo tinfo
+ 1:security.TCredentials credentials
+ ) throws (
+ 1:client.ThriftSecurityException sec
+ )
+
+ oneway void removeLogs(
+ 1:trace.TInfo tinfo
+ 2:security.TCredentials credentials
+ 3:list<string> filenames
+ )
+
+ list<string> getActiveLogs(
+ 1:trace.TInfo tinfo
+ 2:security.TCredentials credentials
+ )
+
++ data.TSummaries startGetSummaries(
++ 1:trace.TInfo tinfo
++ 2:security.TCredentials credentials
++ 3:data.TSummaryRequest request
++ ) throws (
++ 1:client.ThriftSecurityException sec
++ 2:client.ThriftTableOperationException tope
++ )
++
++ data.TSummaries startGetSummariesForPartition(
++ 1:trace.TInfo tinfo
++ 2:security.TCredentials credentials
++ 3:data.TSummaryRequest request
++ 4:i32 modulus
++ 5:i32 remainder
++ ) throws (
++ 1:client.ThriftSecurityException sec
++ )
++
++ data.TSummaries startGetSummariesFromFiles(
++ 1:trace.TInfo tinfo
++ 2:security.TCredentials credentials
++ 3:data.TSummaryRequest request
++ 4:map<string, list<data.TRowRange>> files
++ ) throws (
++ 1:client.ThriftSecurityException sec
++ )
++
++ data.TSummaries contiuneGetSummaries(
++ 1:trace.TInfo tinfo
++ 2:i64 sessionId
++ ) throws (
++ 1:NoSuchScanIDException nssi
++ )
++
}
typedef i32 TabletID
diff --cc test/src/main/thrift/test.thrift
index 7e4d955,0000000..fe74462
mode 100644,000000..100644
--- a/test/src/main/thrift/test.thrift
+++ b/test/src/main/thrift/test.thrift
@@@ -1,30 -1,0 +1,30 @@@
+/*
+* 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.
+*/
-
+namespace java org.apache.accumulo.test.rpc.thrift
+
- service SimpleThriftService
- {
++service SimpleThriftService {
++
+ string echoPass(1:string value)
+ oneway void onewayPass(1:string value)
+
+ string echoFail(1:string value)
+ oneway void onewayFail(1:string value)
+
+ string echoRuntimeFail(1:string value)
+ oneway void onewayRuntimeFail(1:string value)
++
+}