diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..d2a31d6 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,7 @@ +FROM python:3.8.17-slim + +LABEL org.opencontainers.image.source=https://github.com/NationalSecurityAgency/accumulo-python3 + +COPY . /app + +RUN pip install /app diff --git a/README.md b/README.md index dc76eef..b0b2397 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,12 @@ Library features include: import accumulo from accumulo import Mutation, RangePrefix, ScanOptions -connector = accumulo.AccumuloProxyConnectionContext().create_connector('user', 'secret') +# The accumulo proxy now authenticates with accumulo by itself. +# This client then authenticates with the proxy using a configured 'sharedSecret', +# shared between the client and proxy +sharedSecret = "sharedSecret" + +connector = accumulo.AccumuloProxyConnectionContext().create_connector(sharedSecret) # Create the table 'tmp' if it does not already exist. if not connector.table_exists('tmp'): @@ -32,7 +37,7 @@ with connector.create_scanner('tmp', ScanOptions(range=RangePrefix('User.1'))) a print(r.row, r.cf, r.value_bytes) ``` -__Note__. This library is a work in progress. It has been tested with Accumulo 1.9 and Python 3.8. +__Note__. This library is a work in progress. It has been tested with Accumulo 2.1.1 and Python 3.8. ## Installation @@ -53,6 +58,14 @@ development. pip install -e . ``` +### Docker Image + +Alternatively, build a docker image + +``` +docker build . -t accumulo-proxy-client +``` + ## Background Native integration with Accumulo is powered by [Apache Thrift](https://thrift.apache.org/). This library embeds @@ -98,8 +111,7 @@ higher-level functionality in this library. Use the `client` property of an `Acc access these bindings. ```python -login = proxy_connection.client.login('user', {'password': 'secret'}) -proxy_connection.client.changeUserAuthorizations(login, 'user', [b'ADMIN']) +proxy_connection.client.changeUserAuthorizations('sharedSecret', 'user', [b'ADMIN']) ``` ### Creating a blocking connector @@ -111,9 +123,9 @@ Use the `AccumuloProxyConnectionContext` class to create a blocking connector in ```python from accumulo import AccumuloProxyConnectionContext - +sharedSecret = "sharedSecret" context = AccumuloProxyConnectionContext(proxy_connection) -connector = context.create_connector('user', 'secret') +connector = context.create_connector(sharedSecret) ``` ### Perform some basic table operations @@ -243,7 +255,7 @@ with connector.create_scanner( 'tmp', ScanOptions( # Binary and non-binary arguments are accepted - range=Range(start_key=Key('sk', b'cf')) + range=Range(start_key=Key('aStartKey', b'cf')) ) ) as scanner: pass @@ -251,7 +263,7 @@ with connector.create_scanner( with connector.create_scanner( 'tmp', ScanOptions( - range=Range(end_key=Key('ek', b'cf'), is_end_key_inclusive=True) + range=Range(end_key=Key('endKey', b'cf'), is_end_key_inclusive=True) ) ) as scanner: pass @@ -259,7 +271,7 @@ with connector.create_scanner( with connector.create_scanner( 'tmp', ScanOptions( - range=Range(start_key=Key('sk', b'cf'), end_key=Key('ek', 'cf', 'cq')) + range=Range(start_key=Key('aStartKey', b'cf'), end_key=Key('endKey', 'cf', 'cq')) ) ) as scanner: pass @@ -280,7 +292,7 @@ with connector.create_batch_scanner( ### Use an iterator -`ScanOptions` and `BatchScanOptions` both support an `iterator_settings` keyword argument. +`ScanOptions` and `BatchScanOptions` both support an `iterators` keyword argument. ```python from accumulo import IteratorSetting @@ -288,7 +300,7 @@ from accumulo import IteratorSetting with connector.create_scanner( 'tmp', ScanOptions( - iterator_settings=[ + iterators=[ IteratorSetting(priority=30, name='iter', iterator_class='my.iterator', properties={}) ] ) @@ -311,7 +323,7 @@ connector, we will use the `AccumuloProxyConnectionPoolContextAsync` class. ```python from accumulo import AccumuloProxyConnectionPoolContextAsync -async_conn = await AccumuloProxyConnectionPoolContextAsync().create_connector('user', 'secret') +async_conn = await AccumuloProxyConnectionPoolContextAsync().create_connector('sharedSecret') ``` Unlike the blocking connector, the non-blocking connector uses a pool of proxy connection objects, and uses a @@ -335,7 +347,7 @@ executor = AsyncAccumuloConnectorPoolExecutor( ) # A default executor is created if one is not provided. context = AccumuloProxyConnectionPoolContextAsync(executor) -async_conn = await AccumuloProxyConnectionPoolContextAsync().create_connector('user', 'secret') +async_conn = await AccumuloProxyConnectionPoolContextAsync().create_connector('sharedSecret') ``` #### Using writers @@ -370,5 +382,5 @@ the binding function from a proxy client instance. ```python # executor.run(gettern_fn, *args) -await executor.run(lambda c: c.tableExists, login, 'tmp') +await executor.run(lambda c: c.tableExists, 'sharedSecret', 'tmp') ``` diff --git a/accumulo/core/client.py b/accumulo/core/client.py index 0b05a1d..816f335 100644 --- a/accumulo/core/client.py +++ b/accumulo/core/client.py @@ -5,14 +5,14 @@ class AccumuloContextBase: - def create_connector(self, user: str, auth: str): + def create_connector(self, shared_secret: bytes): raise NotImplementedError class AccumuloConnectorBase: - def __init__(self, login: bytes): - self.login = login + def __init__(self, shared_secret: bytes): + self.shared_secret = shared_secret def create_scanner(self, table: str, options: ScanOptions): raise NotImplementedError diff --git a/accumulo/core/client_async.py b/accumulo/core/client_async.py index 1885205..e9f99d0 100644 --- a/accumulo/core/client_async.py +++ b/accumulo/core/client_async.py @@ -133,8 +133,8 @@ def context(self): class AsyncAccumuloConnector(AccumuloConnectorBase): - def __init__(self, proxy_connection_pool_executor: AsyncAccumuloConnectorPoolExecutor, login: bytes): - super().__init__(login) + def __init__(self, proxy_connection_pool_executor: AsyncAccumuloConnectorPoolExecutor, shared_secret: bytes): + super().__init__(shared_secret) self.proxy_connection_pool_executor = proxy_connection_pool_executor async def create_scanner(self, table: str, opts: Optional[ScanOptions] = None): @@ -142,7 +142,7 @@ async def create_scanner(self, table: str, opts: Optional[ScanOptions] = None): opts = ScanOptions() opts = TTypeFactory.scan_options(opts) resource_id = await self.proxy_connection_pool_executor.run(AccumuloProxyClientFunctionGetters.create_scanner, - self.login, table, opts) + self.shared_secret, table, opts) return AsyncAccumuloScanner(self.proxy_connection_pool_executor, resource_id) async def create_batch_scanner(self, table: str, opts: Optional[BatchScanOptions] = None): @@ -150,7 +150,7 @@ async def create_batch_scanner(self, table: str, opts: Optional[BatchScanOptions opts = BatchScanOptions() opts = TTypeFactory.batch_scan_options(opts) resource_id = await self.proxy_connection_pool_executor.run( - AccumuloProxyClientFunctionGetters.create_batch_scanner, self.login, table, opts) + AccumuloProxyClientFunctionGetters.create_batch_scanner, self.shared_secret, table, opts) return AsyncAccumuloScanner(self.proxy_connection_pool_executor, resource_id) async def create_writer(self, table: str, opts: Optional[WriterOptions] = None): @@ -158,12 +158,12 @@ async def create_writer(self, table: str, opts: Optional[WriterOptions] = None): opts = WriterOptions() opts = TTypeFactory.writer_options(opts) resource_id = await self.proxy_connection_pool_executor.run(AccumuloProxyClientFunctionGetters.create_writer, - self.login, table, opts) + self.shared_secret, table, opts) return AsyncAccumuloWriter(self.proxy_connection_pool_executor, resource_id) async def change_user_authorizations(self, user: str, auths: Types.T_AUTHORIZATION_SET): await self.proxy_connection_pool_executor.run(AccumuloProxyClientFunctionGetters.change_user_authorizations, - self.login, user, auths) + self.shared_secret, user, auths) async def get_user_authorizations(self, user: str) -> Types.T_AUTHORIZATION_SET: auths = await self.proxy_connection_pool_executor.run( @@ -171,12 +171,12 @@ async def get_user_authorizations(self, user: str) -> Types.T_AUTHORIZATION_SET: return AuthorizationSet(auths) async def create_table(self, table: str, version_iter: bool = True, time_type: Types.T_TIME_TYPE = TimeType.MILLIS): - await self.proxy_connection_pool_executor.run(AccumuloProxyClientFunctionGetters.create_table, self.login, + await self.proxy_connection_pool_executor.run(AccumuloProxyClientFunctionGetters.create_table, self.shared_secret, table, version_iter, time_type) async def table_exists(self, table: str) -> bool: return await self.proxy_connection_pool_executor.run(AccumuloProxyClientFunctionGetters.table_exists, - self.login, table) + self.shared_secret, table) class AsyncAccumuloConnectorResource: @@ -237,18 +237,12 @@ def __init__(self, proxy_connection_pool_executor: Optional[AsyncAccumuloConnect proxy_connection_pool_executor = AsyncAccumuloConnectorPoolExecutor() self.proxy_connection_pool_executor = proxy_connection_pool_executor - async def create_connector(self, user: str, password: str) -> AsyncAccumuloConnector: - login = await self.proxy_connection_pool_executor.run(AccumuloProxyClientFunctionGetters.login, user, - {'password': password}) - return AsyncAccumuloConnector(self.proxy_connection_pool_executor, login) + async def create_connector(self, shared_secret: bytes) -> AsyncAccumuloConnector: + return AsyncAccumuloConnector(self.proxy_connection_pool_executor, shared_secret) class AccumuloProxyClientFunctionGetters: - @staticmethod - def login(c: AccumuloProxy.Client): - return c.login - @staticmethod def create_scanner(c: AccumuloProxy.Client): return c.createScanner diff --git a/accumulo/core/client_sync.py b/accumulo/core/client_sync.py index 9041740..f1fb8a9 100644 --- a/accumulo/core/client_sync.py +++ b/accumulo/core/client_sync.py @@ -15,54 +15,53 @@ def __init__(self, proxy_connection: Optional[AccumuloProxyConnection] = None): proxy_connection = AccumuloProxyConnection() self.proxy_connection = proxy_connection - def create_connector(self, user: str, auth: str): - login = self.proxy_connection.client.login(user, {'password': auth}) - return AccumuloConnector(self.proxy_connection.client, login) + def create_connector(self, shared_secret: bytes): + return AccumuloConnector(self.proxy_connection.client, shared_secret) class AccumuloConnector(AccumuloConnectorBase): - def __init__(self, proxy_client: AccumuloProxy.Client, login: bytes): - super().__init__(login) + def __init__(self, proxy_client: AccumuloProxy.Client, shared_secret: bytes): + super().__init__(shared_secret) self.proxy_client = proxy_client def create_scanner(self, table: str, opts: Optional[ScanOptions] = None): if opts is None: opts = ScanOptions() opts = TTypeFactory.scan_options(opts) - return AccumuloScanner(self.proxy_client, self.login, self.proxy_client.createScanner(self.login, table, opts)) + return AccumuloScanner(self.proxy_client, self.shared_secret, self.proxy_client.createScanner(self.shared_secret, table, opts)) def create_batch_scanner(self, table: str, opts: Optional[BatchScanOptions] = None): if opts is None: opts = BatchScanOptions() opts = TTypeFactory.batch_scan_options(opts) - return AccumuloScanner(self.proxy_client, self.login, self.proxy_client.createBatchScanner(self.login, table, + return AccumuloScanner(self.proxy_client, self.shared_secret, self.proxy_client.createBatchScanner(self.shared_secret, table, opts)) def create_writer(self, table: str, opts: Optional[WriterOptions] = None): if opts is None: opts = WriterOptions() opts = TTypeFactory.writer_options(opts) - return AccumuloWriter(self.proxy_client, self.login, self.proxy_client.createWriter(self.login, table, opts)) + return AccumuloWriter(self.proxy_client, self.shared_secret, self.proxy_client.createWriter(self.shared_secret, table, opts)) def change_user_authorizations(self, user: str, auths: Types.T_AUTHORIZATION_SET): - self.proxy_client.changeUserAuthorizations(self.login, user, auths) + self.proxy_client.changeUserAuthorizations(self.shared_secret, user, auths) def get_user_authorizations(self, user: str) -> Types.T_AUTHORIZATION_SET: - return AuthorizationSet(self.proxy_client.getUserAuthorizations(self.login, user)) + return AuthorizationSet(self.proxy_client.getUserAuthorizations(self.shared_secret, user)) def create_table(self, table: str, version_iter: bool = True, time_type: Types.T_TIME_TYPE = TimeType.MILLIS): - self.proxy_client.createTable(self.login, table, version_iter, time_type) + self.proxy_client.createTable(self.shared_secret, table, version_iter, time_type) def table_exists(self, table: str) -> bool: - return self.proxy_client.tableExists(self.login, table) + return self.proxy_client.tableExists(self.shared_secret, table) class AccumuloConnectorResource: - def __init__(self, client: AccumuloProxy.Client, login: bytes, resource_id: str): + def __init__(self, client: AccumuloProxy.Client, shared_secret: bytes, resource_id: str): self.client = client - self.login = login + self.shared_secret = shared_secret self.resource_id = resource_id def close(self): diff --git a/accumulo/thrift/AccumuloProxy-remote b/accumulo/thrift/AccumuloProxy-remote index 642f66f..ff2d83b 100644 --- a/accumulo/thrift/AccumuloProxy-remote +++ b/accumulo/thrift/AccumuloProxy-remote @@ -1,20 +1,22 @@ -# 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 +# 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 +# https://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. +# 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. #!/usr/bin/env python # -# Autogenerated by Thrift Compiler (0.12.0) +# Autogenerated by Thrift Compiler (0.17.0) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # @@ -38,106 +40,105 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help': print('Usage: ' + sys.argv[0] + ' [-h host[:port]] [-u url] [-f[ramed]] [-s[sl]] [-novalidate] [-ca_certs certs] [-keyfile keyfile] [-certfile certfile] 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(' getSiteConfiguration(string login)') - print(' getSystemConfiguration(string login)') - print(' getTabletServers(string login)') - print(' void removeProperty(string login, string property)') - print(' void setProperty(string login, string property, string value)') - print(' bool testClassLoad(string login, string className, string asTypeName)') - print(' bool authenticateUser(string login, string user, properties)') - print(' void changeUserAuthorizations(string login, string user, authorizations)') - print(' void changeLocalUserPassword(string login, string user, string password)') - print(' void createLocalUser(string login, string user, string password)') - print(' void dropLocalUser(string login, string user)') - print(' getUserAuthorizations(string login, string user)') - print(' void grantSystemPermission(string login, string user, SystemPermission perm)') - print(' void grantTablePermission(string login, string user, string table, TablePermission perm)') - print(' bool hasSystemPermission(string login, string user, SystemPermission perm)') - print(' bool hasTablePermission(string login, string user, string table, TablePermission perm)') - print(' listLocalUsers(string login)') - print(' void revokeSystemPermission(string login, string user, SystemPermission perm)') - print(' void revokeTablePermission(string login, string user, string table, TablePermission perm)') - print(' void grantNamespacePermission(string login, string user, string namespaceName, NamespacePermission perm)') - print(' bool hasNamespacePermission(string login, string user, string namespaceName, NamespacePermission perm)') - print(' void revokeNamespacePermission(string login, string user, string namespaceName, NamespacePermission perm)') - print(' string createBatchScanner(string login, string tableName, BatchScanOptions options)') - print(' string createScanner(string login, string tableName, ScanOptions options)') + print(' i32 addConstraint(string sharedSecret, string tableName, string constraintClassName)') + print(' void addSplits(string sharedSecret, string tableName, splits)') + print(' void attachIterator(string sharedSecret, string tableName, IteratorSetting setting, scopes)') + print(' void checkIteratorConflicts(string sharedSecret, string tableName, IteratorSetting setting, scopes)') + print(' void clearLocatorCache(string sharedSecret, string tableName)') + print(' void cloneTable(string sharedSecret, string tableName, string newTableName, bool flush, propertiesToSet, propertiesToExclude)') + print(' void compactTable(string sharedSecret, string tableName, string startRow, string endRow, iterators, bool flush, bool wait, PluginConfig selectorConfig, PluginConfig configurerConfig)') + print(' void cancelCompaction(string sharedSecret, string tableName)') + print(' void createTable(string sharedSecret, string tableName, bool versioningIter, TimeType type)') + print(' void deleteTable(string sharedSecret, string tableName)') + print(' void deleteRows(string sharedSecret, string tableName, string startRow, string endRow)') + print(' void exportTable(string sharedSecret, string tableName, string exportDir)') + print(' void flushTable(string sharedSecret, string tableName, string startRow, string endRow, bool wait)') + print(' getDiskUsage(string sharedSecret, tables)') + print(' getLocalityGroups(string sharedSecret, string tableName)') + print(' IteratorSetting getIteratorSetting(string sharedSecret, string tableName, string iteratorName, IteratorScope scope)') + print(' string getMaxRow(string sharedSecret, string tableName, auths, string startRow, bool startInclusive, string endRow, bool endInclusive)') + print(' getTableProperties(string sharedSecret, string tableName)') + print(' void importDirectory(string sharedSecret, string tableName, string importDir, string failureDir, bool setTime)') + print(' void importTable(string sharedSecret, string tableName, string importDir)') + print(' listSplits(string sharedSecret, string tableName, i32 maxSplits)') + print(' listTables(string sharedSecret)') + print(' listIterators(string sharedSecret, string tableName)') + print(' listConstraints(string sharedSecret, string tableName)') + print(' void mergeTablets(string sharedSecret, string tableName, string startRow, string endRow)') + print(' void offlineTable(string sharedSecret, string tableName, bool wait)') + print(' void onlineTable(string sharedSecret, string tableName, bool wait)') + print(' void removeConstraint(string sharedSecret, string tableName, i32 constraint)') + print(' void removeIterator(string sharedSecret, string tableName, string iterName, scopes)') + print(' void removeTableProperty(string sharedSecret, string tableName, string property)') + print(' void renameTable(string sharedSecret, string oldTableName, string newTableName)') + print(' void setLocalityGroups(string sharedSecret, string tableName, groups)') + print(' void setTableProperty(string sharedSecret, string tableName, string property, string value)') + print(' splitRangeByTablets(string sharedSecret, string tableName, Range range, i32 maxSplits)') + print(' bool tableExists(string sharedSecret, string tableName)') + print(' tableIdMap(string sharedSecret)') + print(' bool testTableClassLoad(string sharedSecret, string tableName, string className, string asTypeName)') + print(' void pingTabletServer(string sharedSecret, string tserver)') + print(' getActiveScans(string sharedSecret, string tserver)') + print(' getActiveCompactions(string sharedSecret, string tserver)') + print(' getSiteConfiguration(string sharedSecret)') + print(' getSystemConfiguration(string sharedSecret)') + print(' getTabletServers(string sharedSecret)') + print(' void removeProperty(string sharedSecret, string property)') + print(' void setProperty(string sharedSecret, string property, string value)') + print(' bool testClassLoad(string sharedSecret, string className, string asTypeName)') + print(' bool authenticateUser(string sharedSecret, string user, properties)') + print(' void changeUserAuthorizations(string sharedSecret, string user, authorizations)') + print(' void changeLocalUserPassword(string sharedSecret, string user, string password)') + print(' void createLocalUser(string sharedSecret, string user, string password)') + print(' void dropLocalUser(string sharedSecret, string user)') + print(' getUserAuthorizations(string sharedSecret, string user)') + print(' void grantSystemPermission(string sharedSecret, string user, SystemPermission perm)') + print(' void grantTablePermission(string sharedSecret, string user, string table, TablePermission perm)') + print(' bool hasSystemPermission(string sharedSecret, string user, SystemPermission perm)') + print(' bool hasTablePermission(string sharedSecret, string user, string table, TablePermission perm)') + print(' listLocalUsers(string sharedSecret)') + print(' void revokeSystemPermission(string sharedSecret, string user, SystemPermission perm)') + print(' void revokeTablePermission(string sharedSecret, string user, string table, TablePermission perm)') + print(' void grantNamespacePermission(string sharedSecret, string user, string namespaceName, NamespacePermission perm)') + print(' bool hasNamespacePermission(string sharedSecret, string user, string namespaceName, NamespacePermission perm)') + print(' void revokeNamespacePermission(string sharedSecret, string user, string namespaceName, NamespacePermission perm)') + print(' string createBatchScanner(string sharedSecret, string tableName, BatchScanOptions options)') + print(' string createScanner(string sharedSecret, string tableName, ScanOptions options)') print(' bool hasNext(string scanner)') print(' KeyValueAndPeek nextEntry(string scanner)') print(' ScanResult nextK(string scanner, i32 k)') print(' void closeScanner(string scanner)') - print(' void updateAndFlush(string login, string tableName, cells)') - print(' string createWriter(string login, string tableName, WriterOptions opts)') + print(' void updateAndFlush(string sharedSecret, string tableName, cells)') + print(' string createWriter(string sharedSecret, string tableName, WriterOptions opts)') print(' void update(string writer, cells)') print(' void flush(string writer)') print(' void closeWriter(string writer)') - print(' ConditionalStatus updateRowConditionally(string login, string tableName, string row, ConditionalUpdates updates)') - print(' string createConditionalWriter(string login, string tableName, ConditionalWriterOptions options)') + print(' ConditionalStatus updateRowConditionally(string sharedSecret, string tableName, string row, ConditionalUpdates updates)') + print(' string createConditionalWriter(string sharedSecret, string tableName, ConditionalWriterOptions options)') print(' updateRowsConditionally(string conditionalWriter, updates)') print(' void closeConditionalWriter(string conditionalWriter)') print(' Range getRowRange(string row)') print(' Key getFollowing(Key key, PartialKey part)') print(' string systemNamespace()') print(' string defaultNamespace()') - print(' listNamespaces(string login)') - print(' bool namespaceExists(string login, string namespaceName)') - print(' void createNamespace(string login, string namespaceName)') - print(' void deleteNamespace(string login, string namespaceName)') - print(' void renameNamespace(string login, string oldNamespaceName, string newNamespaceName)') - print(' void setNamespaceProperty(string login, string namespaceName, string property, string value)') - print(' void removeNamespaceProperty(string login, string namespaceName, string property)') - print(' getNamespaceProperties(string login, string namespaceName)') - print(' namespaceIdMap(string login)') - print(' void attachNamespaceIterator(string login, string namespaceName, IteratorSetting setting, scopes)') - print(' void removeNamespaceIterator(string login, string namespaceName, string name, scopes)') - print(' IteratorSetting getNamespaceIteratorSetting(string login, string namespaceName, string name, IteratorScope scope)') - print(' listNamespaceIterators(string login, string namespaceName)') - print(' void checkNamespaceIteratorConflicts(string login, string namespaceName, IteratorSetting setting, scopes)') - print(' i32 addNamespaceConstraint(string login, string namespaceName, string constraintClassName)') - print(' void removeNamespaceConstraint(string login, string namespaceName, i32 id)') - print(' listNamespaceConstraints(string login, string namespaceName)') - print(' bool testNamespaceClassLoad(string login, string namespaceName, string className, string asTypeName)') + print(' listNamespaces(string sharedSecret)') + print(' bool namespaceExists(string sharedSecret, string namespaceName)') + print(' void createNamespace(string sharedSecret, string namespaceName)') + print(' void deleteNamespace(string sharedSecret, string namespaceName)') + print(' void renameNamespace(string sharedSecret, string oldNamespaceName, string newNamespaceName)') + print(' void setNamespaceProperty(string sharedSecret, string namespaceName, string property, string value)') + print(' void removeNamespaceProperty(string sharedSecret, string namespaceName, string property)') + print(' getNamespaceProperties(string sharedSecret, string namespaceName)') + print(' namespaceIdMap(string sharedSecret)') + print(' void attachNamespaceIterator(string sharedSecret, string namespaceName, IteratorSetting setting, scopes)') + print(' void removeNamespaceIterator(string sharedSecret, string namespaceName, string name, scopes)') + print(' IteratorSetting getNamespaceIteratorSetting(string sharedSecret, string namespaceName, string name, IteratorScope scope)') + print(' listNamespaceIterators(string sharedSecret, string namespaceName)') + print(' void checkNamespaceIteratorConflicts(string sharedSecret, string namespaceName, IteratorSetting setting, scopes)') + print(' i32 addNamespaceConstraint(string sharedSecret, string namespaceName, string constraintClassName)') + print(' void removeNamespaceConstraint(string sharedSecret, string namespaceName, i32 id)') + print(' listNamespaceConstraints(string sharedSecret, string namespaceName)') + print(' bool testNamespaceClassLoad(string sharedSecret, string namespaceName, string className, string asTypeName)') print('') sys.exit(0) @@ -217,13 +218,7 @@ protocol = TBinaryProtocol(transport) client = AccumuloProxy.Client(protocol) transport.open() -if cmd == 'login': - if len(args) != 2: - print('login requires 2 args') - sys.exit(1) - pp.pprint(client.login(args[0], eval(args[1]),)) - -elif cmd == 'addConstraint': +if cmd == 'addConstraint': if len(args) != 3: print('addConstraint requires 3 args') sys.exit(1) @@ -260,10 +255,10 @@ elif cmd == 'cloneTable': pp.pprint(client.cloneTable(args[0], args[1], args[2], eval(args[3]), eval(args[4]), eval(args[5]),)) elif cmd == 'compactTable': - if len(args) != 8: - print('compactTable requires 8 args') + if len(args) != 9: + print('compactTable requires 9 args') sys.exit(1) - pp.pprint(client.compactTable(args[0], args[1], args[2], args[3], eval(args[4]), eval(args[5]), eval(args[6]), eval(args[7]),)) + pp.pprint(client.compactTable(args[0], args[1], args[2], args[3], eval(args[4]), eval(args[5]), eval(args[6]), eval(args[7]), eval(args[8]),)) elif cmd == 'cancelCompaction': if len(args) != 2: diff --git a/accumulo/thrift/AccumuloProxy.py b/accumulo/thrift/AccumuloProxy.py index 0cf9111..d1f70ae 100644 --- a/accumulo/thrift/AccumuloProxy.py +++ b/accumulo/thrift/AccumuloProxy.py @@ -1,19 +1,21 @@ -# 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 +# 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 +# https://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. +# 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. # -# Autogenerated by Thrift Compiler (0.12.0) +# Autogenerated by Thrift Compiler (0.17.0) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # @@ -33,39 +35,30 @@ class Iface(object): - def login(self, principal, loginProperties): + def addConstraint(self, sharedSecret, tableName, constraintClassName): """ Parameters: - - principal - - loginProperties - - """ - pass - - def addConstraint(self, login, tableName, constraintClassName): - """ - Parameters: - - login + - sharedSecret - tableName - constraintClassName """ pass - def addSplits(self, login, tableName, splits): + def addSplits(self, sharedSecret, tableName, splits): """ Parameters: - - login + - sharedSecret - tableName - splits """ pass - def attachIterator(self, login, tableName, setting, scopes): + def attachIterator(self, sharedSecret, tableName, setting, scopes): """ Parameters: - - login + - sharedSecret - tableName - setting - scopes @@ -73,10 +66,10 @@ def attachIterator(self, login, tableName, setting, scopes): """ pass - def checkIteratorConflicts(self, login, tableName, setting, scopes): + def checkIteratorConflicts(self, sharedSecret, tableName, setting, scopes): """ Parameters: - - login + - sharedSecret - tableName - setting - scopes @@ -84,19 +77,19 @@ def checkIteratorConflicts(self, login, tableName, setting, scopes): """ pass - def clearLocatorCache(self, login, tableName): + def clearLocatorCache(self, sharedSecret, tableName): """ Parameters: - - login + - sharedSecret - tableName """ pass - def cloneTable(self, login, tableName, newTableName, flush, propertiesToSet, propertiesToExclude): + def cloneTable(self, sharedSecret, tableName, newTableName, flush, propertiesToSet, propertiesToExclude): """ Parameters: - - login + - sharedSecret - tableName - newTableName - flush @@ -106,34 +99,35 @@ def cloneTable(self, login, tableName, newTableName, flush, propertiesToSet, pro """ pass - def compactTable(self, login, tableName, startRow, endRow, iterators, flush, wait, compactionStrategy): + def compactTable(self, sharedSecret, tableName, startRow, endRow, iterators, flush, wait, selectorConfig, configurerConfig): """ Parameters: - - login + - sharedSecret - tableName - startRow - endRow - iterators - flush - wait - - compactionStrategy + - selectorConfig + - configurerConfig """ pass - def cancelCompaction(self, login, tableName): + def cancelCompaction(self, sharedSecret, tableName): """ Parameters: - - login + - sharedSecret - tableName """ pass - def createTable(self, login, tableName, versioningIter, type): + def createTable(self, sharedSecret, tableName, versioningIter, type): """ Parameters: - - login + - sharedSecret - tableName - versioningIter - type @@ -141,19 +135,19 @@ def createTable(self, login, tableName, versioningIter, type): """ pass - def deleteTable(self, login, tableName): + def deleteTable(self, sharedSecret, tableName): """ Parameters: - - login + - sharedSecret - tableName """ pass - def deleteRows(self, login, tableName, startRow, endRow): + def deleteRows(self, sharedSecret, tableName, startRow, endRow): """ Parameters: - - login + - sharedSecret - tableName - startRow - endRow @@ -161,20 +155,20 @@ def deleteRows(self, login, tableName, startRow, endRow): """ pass - def exportTable(self, login, tableName, exportDir): + def exportTable(self, sharedSecret, tableName, exportDir): """ Parameters: - - login + - sharedSecret - tableName - exportDir """ pass - def flushTable(self, login, tableName, startRow, endRow, wait): + def flushTable(self, sharedSecret, tableName, startRow, endRow, wait): """ Parameters: - - login + - sharedSecret - tableName - startRow - endRow @@ -183,28 +177,28 @@ def flushTable(self, login, tableName, startRow, endRow, wait): """ pass - def getDiskUsage(self, login, tables): + def getDiskUsage(self, sharedSecret, tables): """ Parameters: - - login + - sharedSecret - tables """ pass - def getLocalityGroups(self, login, tableName): + def getLocalityGroups(self, sharedSecret, tableName): """ Parameters: - - login + - sharedSecret - tableName """ pass - def getIteratorSetting(self, login, tableName, iteratorName, scope): + def getIteratorSetting(self, sharedSecret, tableName, iteratorName, scope): """ Parameters: - - login + - sharedSecret - tableName - iteratorName - scope @@ -212,10 +206,10 @@ def getIteratorSetting(self, login, tableName, iteratorName, scope): """ pass - def getMaxRow(self, login, tableName, auths, startRow, startInclusive, endRow, endInclusive): + def getMaxRow(self, sharedSecret, tableName, auths, startRow, startInclusive, endRow, endInclusive): """ Parameters: - - login + - sharedSecret - tableName - auths - startRow @@ -226,19 +220,19 @@ def getMaxRow(self, login, tableName, auths, startRow, startInclusive, endRow, e """ pass - def getTableProperties(self, login, tableName): + def getTableProperties(self, sharedSecret, tableName): """ Parameters: - - login + - sharedSecret - tableName """ pass - def importDirectory(self, login, tableName, importDir, failureDir, setTime): + def importDirectory(self, sharedSecret, tableName, importDir, failureDir, setTime): """ Parameters: - - login + - sharedSecret - tableName - importDir - failureDir @@ -247,56 +241,56 @@ def importDirectory(self, login, tableName, importDir, failureDir, setTime): """ pass - def importTable(self, login, tableName, importDir): + def importTable(self, sharedSecret, tableName, importDir): """ Parameters: - - login + - sharedSecret - tableName - importDir """ pass - def listSplits(self, login, tableName, maxSplits): + def listSplits(self, sharedSecret, tableName, maxSplits): """ Parameters: - - login + - sharedSecret - tableName - maxSplits """ pass - def listTables(self, login): + def listTables(self, sharedSecret): """ Parameters: - - login + - sharedSecret """ pass - def listIterators(self, login, tableName): + def listIterators(self, sharedSecret, tableName): """ Parameters: - - login + - sharedSecret - tableName """ pass - def listConstraints(self, login, tableName): + def listConstraints(self, sharedSecret, tableName): """ Parameters: - - login + - sharedSecret - tableName """ pass - def mergeTablets(self, login, tableName, startRow, endRow): + def mergeTablets(self, sharedSecret, tableName, startRow, endRow): """ Parameters: - - login + - sharedSecret - tableName - startRow - endRow @@ -304,40 +298,40 @@ def mergeTablets(self, login, tableName, startRow, endRow): """ pass - def offlineTable(self, login, tableName, wait): + def offlineTable(self, sharedSecret, tableName, wait): """ Parameters: - - login + - sharedSecret - tableName - wait """ pass - def onlineTable(self, login, tableName, wait): + def onlineTable(self, sharedSecret, tableName, wait): """ Parameters: - - login + - sharedSecret - tableName - wait """ pass - def removeConstraint(self, login, tableName, constraint): + def removeConstraint(self, sharedSecret, tableName, constraint): """ Parameters: - - login + - sharedSecret - tableName - constraint """ pass - def removeIterator(self, login, tableName, iterName, scopes): + def removeIterator(self, sharedSecret, tableName, iterName, scopes): """ Parameters: - - login + - sharedSecret - tableName - iterName - scopes @@ -345,40 +339,40 @@ def removeIterator(self, login, tableName, iterName, scopes): """ pass - def removeTableProperty(self, login, tableName, property): + def removeTableProperty(self, sharedSecret, tableName, property): """ Parameters: - - login + - sharedSecret - tableName - property """ pass - def renameTable(self, login, oldTableName, newTableName): + def renameTable(self, sharedSecret, oldTableName, newTableName): """ Parameters: - - login + - sharedSecret - oldTableName - newTableName """ pass - def setLocalityGroups(self, login, tableName, groups): + def setLocalityGroups(self, sharedSecret, tableName, groups): """ Parameters: - - login + - sharedSecret - tableName - groups """ pass - def setTableProperty(self, login, tableName, property, value): + def setTableProperty(self, sharedSecret, tableName, property, value): """ Parameters: - - login + - sharedSecret - tableName - property - value @@ -386,10 +380,10 @@ def setTableProperty(self, login, tableName, property, value): """ pass - def splitRangeByTablets(self, login, tableName, range, maxSplits): + def splitRangeByTablets(self, sharedSecret, tableName, range, maxSplits): """ Parameters: - - login + - sharedSecret - tableName - range - maxSplits @@ -397,27 +391,27 @@ def splitRangeByTablets(self, login, tableName, range, maxSplits): """ pass - def tableExists(self, login, tableName): + def tableExists(self, sharedSecret, tableName): """ Parameters: - - login + - sharedSecret - tableName """ pass - def tableIdMap(self, login): + def tableIdMap(self, sharedSecret): """ Parameters: - - login + - sharedSecret """ pass - def testTableClassLoad(self, login, tableName, className, asTypeName): + def testTableClassLoad(self, sharedSecret, tableName, className, asTypeName): """ Parameters: - - login + - sharedSecret - tableName - className - asTypeName @@ -425,158 +419,158 @@ def testTableClassLoad(self, login, tableName, className, asTypeName): """ pass - def pingTabletServer(self, login, tserver): + def pingTabletServer(self, sharedSecret, tserver): """ Parameters: - - login + - sharedSecret - tserver """ pass - def getActiveScans(self, login, tserver): + def getActiveScans(self, sharedSecret, tserver): """ Parameters: - - login + - sharedSecret - tserver """ pass - def getActiveCompactions(self, login, tserver): + def getActiveCompactions(self, sharedSecret, tserver): """ Parameters: - - login + - sharedSecret - tserver """ pass - def getSiteConfiguration(self, login): + def getSiteConfiguration(self, sharedSecret): """ Parameters: - - login + - sharedSecret """ pass - def getSystemConfiguration(self, login): + def getSystemConfiguration(self, sharedSecret): """ Parameters: - - login + - sharedSecret """ pass - def getTabletServers(self, login): + def getTabletServers(self, sharedSecret): """ Parameters: - - login + - sharedSecret """ pass - def removeProperty(self, login, property): + def removeProperty(self, sharedSecret, property): """ Parameters: - - login + - sharedSecret - property """ pass - def setProperty(self, login, property, value): + def setProperty(self, sharedSecret, property, value): """ Parameters: - - login + - sharedSecret - property - value """ pass - def testClassLoad(self, login, className, asTypeName): + def testClassLoad(self, sharedSecret, className, asTypeName): """ Parameters: - - login + - sharedSecret - className - asTypeName """ pass - def authenticateUser(self, login, user, properties): + def authenticateUser(self, sharedSecret, user, properties): """ Parameters: - - login + - sharedSecret - user - properties """ pass - def changeUserAuthorizations(self, login, user, authorizations): + def changeUserAuthorizations(self, sharedSecret, user, authorizations): """ Parameters: - - login + - sharedSecret - user - authorizations """ pass - def changeLocalUserPassword(self, login, user, password): + def changeLocalUserPassword(self, sharedSecret, user, password): """ Parameters: - - login + - sharedSecret - user - password """ pass - def createLocalUser(self, login, user, password): + def createLocalUser(self, sharedSecret, user, password): """ Parameters: - - login + - sharedSecret - user - password """ pass - def dropLocalUser(self, login, user): + def dropLocalUser(self, sharedSecret, user): """ Parameters: - - login + - sharedSecret - user """ pass - def getUserAuthorizations(self, login, user): + def getUserAuthorizations(self, sharedSecret, user): """ Parameters: - - login + - sharedSecret - user """ pass - def grantSystemPermission(self, login, user, perm): + def grantSystemPermission(self, sharedSecret, user, perm): """ Parameters: - - login + - sharedSecret - user - perm """ pass - def grantTablePermission(self, login, user, table, perm): + def grantTablePermission(self, sharedSecret, user, table, perm): """ Parameters: - - login + - sharedSecret - user - table - perm @@ -584,20 +578,20 @@ def grantTablePermission(self, login, user, table, perm): """ pass - def hasSystemPermission(self, login, user, perm): + def hasSystemPermission(self, sharedSecret, user, perm): """ Parameters: - - login + - sharedSecret - user - perm """ pass - def hasTablePermission(self, login, user, table, perm): + def hasTablePermission(self, sharedSecret, user, table, perm): """ Parameters: - - login + - sharedSecret - user - table - perm @@ -605,28 +599,28 @@ def hasTablePermission(self, login, user, table, perm): """ pass - def listLocalUsers(self, login): + def listLocalUsers(self, sharedSecret): """ Parameters: - - login + - sharedSecret """ pass - def revokeSystemPermission(self, login, user, perm): + def revokeSystemPermission(self, sharedSecret, user, perm): """ Parameters: - - login + - sharedSecret - user - perm """ pass - def revokeTablePermission(self, login, user, table, perm): + def revokeTablePermission(self, sharedSecret, user, table, perm): """ Parameters: - - login + - sharedSecret - user - table - perm @@ -634,10 +628,10 @@ def revokeTablePermission(self, login, user, table, perm): """ pass - def grantNamespacePermission(self, login, user, namespaceName, perm): + def grantNamespacePermission(self, sharedSecret, user, namespaceName, perm): """ Parameters: - - login + - sharedSecret - user - namespaceName - perm @@ -645,10 +639,10 @@ def grantNamespacePermission(self, login, user, namespaceName, perm): """ pass - def hasNamespacePermission(self, login, user, namespaceName, perm): + def hasNamespacePermission(self, sharedSecret, user, namespaceName, perm): """ Parameters: - - login + - sharedSecret - user - namespaceName - perm @@ -656,10 +650,10 @@ def hasNamespacePermission(self, login, user, namespaceName, perm): """ pass - def revokeNamespacePermission(self, login, user, namespaceName, perm): + def revokeNamespacePermission(self, sharedSecret, user, namespaceName, perm): """ Parameters: - - login + - sharedSecret - user - namespaceName - perm @@ -667,20 +661,20 @@ def revokeNamespacePermission(self, login, user, namespaceName, perm): """ pass - def createBatchScanner(self, login, tableName, options): + def createBatchScanner(self, sharedSecret, tableName, options): """ Parameters: - - login + - sharedSecret - tableName - options """ pass - def createScanner(self, login, tableName, options): + def createScanner(self, sharedSecret, tableName, options): """ Parameters: - - login + - sharedSecret - tableName - options @@ -720,20 +714,20 @@ def closeScanner(self, scanner): """ pass - def updateAndFlush(self, login, tableName, cells): + def updateAndFlush(self, sharedSecret, tableName, cells): """ Parameters: - - login + - sharedSecret - tableName - cells """ pass - def createWriter(self, login, tableName, opts): + def createWriter(self, sharedSecret, tableName, opts): """ Parameters: - - login + - sharedSecret - tableName - opts @@ -765,10 +759,10 @@ def closeWriter(self, writer): """ pass - def updateRowConditionally(self, login, tableName, row, updates): + def updateRowConditionally(self, sharedSecret, tableName, row, updates): """ Parameters: - - login + - sharedSecret - tableName - row - updates @@ -776,10 +770,10 @@ def updateRowConditionally(self, login, tableName, row, updates): """ pass - def createConditionalWriter(self, login, tableName, options): + def createConditionalWriter(self, sharedSecret, tableName, options): """ Parameters: - - login + - sharedSecret - tableName - options @@ -826,55 +820,55 @@ def systemNamespace(self): def defaultNamespace(self): pass - def listNamespaces(self, login): + def listNamespaces(self, sharedSecret): """ Parameters: - - login + - sharedSecret """ pass - def namespaceExists(self, login, namespaceName): + def namespaceExists(self, sharedSecret, namespaceName): """ Parameters: - - login + - sharedSecret - namespaceName """ pass - def createNamespace(self, login, namespaceName): + def createNamespace(self, sharedSecret, namespaceName): """ Parameters: - - login + - sharedSecret - namespaceName """ pass - def deleteNamespace(self, login, namespaceName): + def deleteNamespace(self, sharedSecret, namespaceName): """ Parameters: - - login + - sharedSecret - namespaceName """ pass - def renameNamespace(self, login, oldNamespaceName, newNamespaceName): + def renameNamespace(self, sharedSecret, oldNamespaceName, newNamespaceName): """ Parameters: - - login + - sharedSecret - oldNamespaceName - newNamespaceName """ pass - def setNamespaceProperty(self, login, namespaceName, property, value): + def setNamespaceProperty(self, sharedSecret, namespaceName, property, value): """ Parameters: - - login + - sharedSecret - namespaceName - property - value @@ -882,37 +876,37 @@ def setNamespaceProperty(self, login, namespaceName, property, value): """ pass - def removeNamespaceProperty(self, login, namespaceName, property): + def removeNamespaceProperty(self, sharedSecret, namespaceName, property): """ Parameters: - - login + - sharedSecret - namespaceName - property """ pass - def getNamespaceProperties(self, login, namespaceName): + def getNamespaceProperties(self, sharedSecret, namespaceName): """ Parameters: - - login + - sharedSecret - namespaceName """ pass - def namespaceIdMap(self, login): + def namespaceIdMap(self, sharedSecret): """ Parameters: - - login + - sharedSecret """ pass - def attachNamespaceIterator(self, login, namespaceName, setting, scopes): + def attachNamespaceIterator(self, sharedSecret, namespaceName, setting, scopes): """ Parameters: - - login + - sharedSecret - namespaceName - setting - scopes @@ -920,10 +914,10 @@ def attachNamespaceIterator(self, login, namespaceName, setting, scopes): """ pass - def removeNamespaceIterator(self, login, namespaceName, name, scopes): + def removeNamespaceIterator(self, sharedSecret, namespaceName, name, scopes): """ Parameters: - - login + - sharedSecret - namespaceName - name - scopes @@ -931,10 +925,10 @@ def removeNamespaceIterator(self, login, namespaceName, name, scopes): """ pass - def getNamespaceIteratorSetting(self, login, namespaceName, name, scope): + def getNamespaceIteratorSetting(self, sharedSecret, namespaceName, name, scope): """ Parameters: - - login + - sharedSecret - namespaceName - name - scope @@ -942,19 +936,19 @@ def getNamespaceIteratorSetting(self, login, namespaceName, name, scope): """ pass - def listNamespaceIterators(self, login, namespaceName): + def listNamespaceIterators(self, sharedSecret, namespaceName): """ Parameters: - - login + - sharedSecret - namespaceName """ pass - def checkNamespaceIteratorConflicts(self, login, namespaceName, setting, scopes): + def checkNamespaceIteratorConflicts(self, sharedSecret, namespaceName, setting, scopes): """ Parameters: - - login + - sharedSecret - namespaceName - setting - scopes @@ -962,39 +956,39 @@ def checkNamespaceIteratorConflicts(self, login, namespaceName, setting, scopes) """ pass - def addNamespaceConstraint(self, login, namespaceName, constraintClassName): + def addNamespaceConstraint(self, sharedSecret, namespaceName, constraintClassName): """ Parameters: - - login + - sharedSecret - namespaceName - constraintClassName """ pass - def removeNamespaceConstraint(self, login, namespaceName, id): + def removeNamespaceConstraint(self, sharedSecret, namespaceName, id): """ Parameters: - - login + - sharedSecret - namespaceName - id """ pass - def listNamespaceConstraints(self, login, namespaceName): + def listNamespaceConstraints(self, sharedSecret, namespaceName): """ Parameters: - - login + - sharedSecret - namespaceName """ pass - def testNamespaceClassLoad(self, login, namespaceName, className, asTypeName): + def testNamespaceClassLoad(self, sharedSecret, namespaceName, className, asTypeName): """ Parameters: - - login + - sharedSecret - namespaceName - className - asTypeName @@ -1010,57 +1004,21 @@ def __init__(self, iprot, oprot=None): self._oprot = oprot self._seqid = 0 - def login(self, principal, loginProperties): - """ - Parameters: - - principal - - loginProperties - - """ - self.send_login(principal, loginProperties) - return self.recv_login() - - def send_login(self, principal, loginProperties): - self._oprot.writeMessageBegin('login', TMessageType.CALL, self._seqid) - args = login_args() - args.principal = principal - args.loginProperties = loginProperties - args.write(self._oprot) - self._oprot.writeMessageEnd() - self._oprot.trans.flush() - - def recv_login(self): - iprot = self._iprot - (fname, mtype, rseqid) = iprot.readMessageBegin() - if mtype == TMessageType.EXCEPTION: - x = TApplicationException() - x.read(iprot) - iprot.readMessageEnd() - raise x - result = login_result() - result.read(iprot) - iprot.readMessageEnd() - if result.success is not None: - return result.success - if result.ouch2 is not None: - raise result.ouch2 - raise TApplicationException(TApplicationException.MISSING_RESULT, "login failed: unknown result") - - def addConstraint(self, login, tableName, constraintClassName): + def addConstraint(self, sharedSecret, tableName, constraintClassName): """ Parameters: - - login + - sharedSecret - tableName - constraintClassName """ - self.send_addConstraint(login, tableName, constraintClassName) + self.send_addConstraint(sharedSecret, tableName, constraintClassName) return self.recv_addConstraint() - def send_addConstraint(self, login, tableName, constraintClassName): + def send_addConstraint(self, sharedSecret, tableName, constraintClassName): self._oprot.writeMessageBegin('addConstraint', TMessageType.CALL, self._seqid) args = addConstraint_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.constraintClassName = constraintClassName args.write(self._oprot) @@ -1088,21 +1046,21 @@ def recv_addConstraint(self): raise result.ouch3 raise TApplicationException(TApplicationException.MISSING_RESULT, "addConstraint failed: unknown result") - def addSplits(self, login, tableName, splits): + def addSplits(self, sharedSecret, tableName, splits): """ Parameters: - - login + - sharedSecret - tableName - splits """ - self.send_addSplits(login, tableName, splits) + self.send_addSplits(sharedSecret, tableName, splits) self.recv_addSplits() - def send_addSplits(self, login, tableName, splits): + def send_addSplits(self, sharedSecret, tableName, splits): self._oprot.writeMessageBegin('addSplits', TMessageType.CALL, self._seqid) args = addSplits_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.splits = splits args.write(self._oprot) @@ -1128,22 +1086,22 @@ def recv_addSplits(self): raise result.ouch3 return - def attachIterator(self, login, tableName, setting, scopes): + def attachIterator(self, sharedSecret, tableName, setting, scopes): """ Parameters: - - login + - sharedSecret - tableName - setting - scopes """ - self.send_attachIterator(login, tableName, setting, scopes) + self.send_attachIterator(sharedSecret, tableName, setting, scopes) self.recv_attachIterator() - def send_attachIterator(self, login, tableName, setting, scopes): + def send_attachIterator(self, sharedSecret, tableName, setting, scopes): self._oprot.writeMessageBegin('attachIterator', TMessageType.CALL, self._seqid) args = attachIterator_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.setting = setting args.scopes = scopes @@ -1170,22 +1128,22 @@ def recv_attachIterator(self): raise result.ouch3 return - def checkIteratorConflicts(self, login, tableName, setting, scopes): + def checkIteratorConflicts(self, sharedSecret, tableName, setting, scopes): """ Parameters: - - login + - sharedSecret - tableName - setting - scopes """ - self.send_checkIteratorConflicts(login, tableName, setting, scopes) + self.send_checkIteratorConflicts(sharedSecret, tableName, setting, scopes) self.recv_checkIteratorConflicts() - def send_checkIteratorConflicts(self, login, tableName, setting, scopes): + def send_checkIteratorConflicts(self, sharedSecret, tableName, setting, scopes): self._oprot.writeMessageBegin('checkIteratorConflicts', TMessageType.CALL, self._seqid) args = checkIteratorConflicts_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.setting = setting args.scopes = scopes @@ -1212,20 +1170,20 @@ def recv_checkIteratorConflicts(self): raise result.ouch3 return - def clearLocatorCache(self, login, tableName): + def clearLocatorCache(self, sharedSecret, tableName): """ Parameters: - - login + - sharedSecret - tableName """ - self.send_clearLocatorCache(login, tableName) + self.send_clearLocatorCache(sharedSecret, tableName) self.recv_clearLocatorCache() - def send_clearLocatorCache(self, login, tableName): + def send_clearLocatorCache(self, sharedSecret, tableName): self._oprot.writeMessageBegin('clearLocatorCache', TMessageType.CALL, self._seqid) args = clearLocatorCache_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.write(self._oprot) self._oprot.writeMessageEnd() @@ -1246,10 +1204,10 @@ def recv_clearLocatorCache(self): raise result.ouch1 return - def cloneTable(self, login, tableName, newTableName, flush, propertiesToSet, propertiesToExclude): + def cloneTable(self, sharedSecret, tableName, newTableName, flush, propertiesToSet, propertiesToExclude): """ Parameters: - - login + - sharedSecret - tableName - newTableName - flush @@ -1257,13 +1215,13 @@ def cloneTable(self, login, tableName, newTableName, flush, propertiesToSet, pro - propertiesToExclude """ - self.send_cloneTable(login, tableName, newTableName, flush, propertiesToSet, propertiesToExclude) + self.send_cloneTable(sharedSecret, tableName, newTableName, flush, propertiesToSet, propertiesToExclude) self.recv_cloneTable() - def send_cloneTable(self, login, tableName, newTableName, flush, propertiesToSet, propertiesToExclude): + def send_cloneTable(self, sharedSecret, tableName, newTableName, flush, propertiesToSet, propertiesToExclude): self._oprot.writeMessageBegin('cloneTable', TMessageType.CALL, self._seqid) args = cloneTable_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.newTableName = newTableName args.flush = flush @@ -1294,33 +1252,35 @@ def recv_cloneTable(self): raise result.ouch4 return - def compactTable(self, login, tableName, startRow, endRow, iterators, flush, wait, compactionStrategy): + def compactTable(self, sharedSecret, tableName, startRow, endRow, iterators, flush, wait, selectorConfig, configurerConfig): """ Parameters: - - login + - sharedSecret - tableName - startRow - endRow - iterators - flush - wait - - compactionStrategy + - selectorConfig + - configurerConfig """ - self.send_compactTable(login, tableName, startRow, endRow, iterators, flush, wait, compactionStrategy) + self.send_compactTable(sharedSecret, tableName, startRow, endRow, iterators, flush, wait, selectorConfig, configurerConfig) self.recv_compactTable() - def send_compactTable(self, login, tableName, startRow, endRow, iterators, flush, wait, compactionStrategy): + def send_compactTable(self, sharedSecret, tableName, startRow, endRow, iterators, flush, wait, selectorConfig, configurerConfig): self._oprot.writeMessageBegin('compactTable', TMessageType.CALL, self._seqid) args = compactTable_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.startRow = startRow args.endRow = endRow args.iterators = iterators args.flush = flush args.wait = wait - args.compactionStrategy = compactionStrategy + args.selectorConfig = selectorConfig + args.configurerConfig = configurerConfig args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() @@ -1344,20 +1304,20 @@ def recv_compactTable(self): raise result.ouch3 return - def cancelCompaction(self, login, tableName): + def cancelCompaction(self, sharedSecret, tableName): """ Parameters: - - login + - sharedSecret - tableName """ - self.send_cancelCompaction(login, tableName) + self.send_cancelCompaction(sharedSecret, tableName) self.recv_cancelCompaction() - def send_cancelCompaction(self, login, tableName): + def send_cancelCompaction(self, sharedSecret, tableName): self._oprot.writeMessageBegin('cancelCompaction', TMessageType.CALL, self._seqid) args = cancelCompaction_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.write(self._oprot) self._oprot.writeMessageEnd() @@ -1382,22 +1342,22 @@ def recv_cancelCompaction(self): raise result.ouch3 return - def createTable(self, login, tableName, versioningIter, type): + def createTable(self, sharedSecret, tableName, versioningIter, type): """ Parameters: - - login + - sharedSecret - tableName - versioningIter - type """ - self.send_createTable(login, tableName, versioningIter, type) + self.send_createTable(sharedSecret, tableName, versioningIter, type) self.recv_createTable() - def send_createTable(self, login, tableName, versioningIter, type): + def send_createTable(self, sharedSecret, tableName, versioningIter, type): self._oprot.writeMessageBegin('createTable', TMessageType.CALL, self._seqid) args = createTable_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.versioningIter = versioningIter args.type = type @@ -1424,20 +1384,20 @@ def recv_createTable(self): raise result.ouch3 return - def deleteTable(self, login, tableName): + def deleteTable(self, sharedSecret, tableName): """ Parameters: - - login + - sharedSecret - tableName """ - self.send_deleteTable(login, tableName) + self.send_deleteTable(sharedSecret, tableName) self.recv_deleteTable() - def send_deleteTable(self, login, tableName): + def send_deleteTable(self, sharedSecret, tableName): self._oprot.writeMessageBegin('deleteTable', TMessageType.CALL, self._seqid) args = deleteTable_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.write(self._oprot) self._oprot.writeMessageEnd() @@ -1462,22 +1422,22 @@ def recv_deleteTable(self): raise result.ouch3 return - def deleteRows(self, login, tableName, startRow, endRow): + def deleteRows(self, sharedSecret, tableName, startRow, endRow): """ Parameters: - - login + - sharedSecret - tableName - startRow - endRow """ - self.send_deleteRows(login, tableName, startRow, endRow) + self.send_deleteRows(sharedSecret, tableName, startRow, endRow) self.recv_deleteRows() - def send_deleteRows(self, login, tableName, startRow, endRow): + def send_deleteRows(self, sharedSecret, tableName, startRow, endRow): self._oprot.writeMessageBegin('deleteRows', TMessageType.CALL, self._seqid) args = deleteRows_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.startRow = startRow args.endRow = endRow @@ -1504,21 +1464,21 @@ def recv_deleteRows(self): raise result.ouch3 return - def exportTable(self, login, tableName, exportDir): + def exportTable(self, sharedSecret, tableName, exportDir): """ Parameters: - - login + - sharedSecret - tableName - exportDir """ - self.send_exportTable(login, tableName, exportDir) + self.send_exportTable(sharedSecret, tableName, exportDir) self.recv_exportTable() - def send_exportTable(self, login, tableName, exportDir): + def send_exportTable(self, sharedSecret, tableName, exportDir): self._oprot.writeMessageBegin('exportTable', TMessageType.CALL, self._seqid) args = exportTable_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.exportDir = exportDir args.write(self._oprot) @@ -1544,23 +1504,23 @@ def recv_exportTable(self): raise result.ouch3 return - def flushTable(self, login, tableName, startRow, endRow, wait): + def flushTable(self, sharedSecret, tableName, startRow, endRow, wait): """ Parameters: - - login + - sharedSecret - tableName - startRow - endRow - wait """ - self.send_flushTable(login, tableName, startRow, endRow, wait) + self.send_flushTable(sharedSecret, tableName, startRow, endRow, wait) self.recv_flushTable() - def send_flushTable(self, login, tableName, startRow, endRow, wait): + def send_flushTable(self, sharedSecret, tableName, startRow, endRow, wait): self._oprot.writeMessageBegin('flushTable', TMessageType.CALL, self._seqid) args = flushTable_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.startRow = startRow args.endRow = endRow @@ -1588,20 +1548,20 @@ def recv_flushTable(self): raise result.ouch3 return - def getDiskUsage(self, login, tables): + def getDiskUsage(self, sharedSecret, tables): """ Parameters: - - login + - sharedSecret - tables """ - self.send_getDiskUsage(login, tables) + self.send_getDiskUsage(sharedSecret, tables) return self.recv_getDiskUsage() - def send_getDiskUsage(self, login, tables): + def send_getDiskUsage(self, sharedSecret, tables): self._oprot.writeMessageBegin('getDiskUsage', TMessageType.CALL, self._seqid) args = getDiskUsage_args() - args.login = login + args.sharedSecret = sharedSecret args.tables = tables args.write(self._oprot) self._oprot.writeMessageEnd() @@ -1628,20 +1588,20 @@ def recv_getDiskUsage(self): raise result.ouch3 raise TApplicationException(TApplicationException.MISSING_RESULT, "getDiskUsage failed: unknown result") - def getLocalityGroups(self, login, tableName): + def getLocalityGroups(self, sharedSecret, tableName): """ Parameters: - - login + - sharedSecret - tableName """ - self.send_getLocalityGroups(login, tableName) + self.send_getLocalityGroups(sharedSecret, tableName) return self.recv_getLocalityGroups() - def send_getLocalityGroups(self, login, tableName): + def send_getLocalityGroups(self, sharedSecret, tableName): self._oprot.writeMessageBegin('getLocalityGroups', TMessageType.CALL, self._seqid) args = getLocalityGroups_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.write(self._oprot) self._oprot.writeMessageEnd() @@ -1668,22 +1628,22 @@ def recv_getLocalityGroups(self): raise result.ouch3 raise TApplicationException(TApplicationException.MISSING_RESULT, "getLocalityGroups failed: unknown result") - def getIteratorSetting(self, login, tableName, iteratorName, scope): + def getIteratorSetting(self, sharedSecret, tableName, iteratorName, scope): """ Parameters: - - login + - sharedSecret - tableName - iteratorName - scope """ - self.send_getIteratorSetting(login, tableName, iteratorName, scope) + self.send_getIteratorSetting(sharedSecret, tableName, iteratorName, scope) return self.recv_getIteratorSetting() - def send_getIteratorSetting(self, login, tableName, iteratorName, scope): + def send_getIteratorSetting(self, sharedSecret, tableName, iteratorName, scope): self._oprot.writeMessageBegin('getIteratorSetting', TMessageType.CALL, self._seqid) args = getIteratorSetting_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.iteratorName = iteratorName args.scope = scope @@ -1712,10 +1672,10 @@ def recv_getIteratorSetting(self): raise result.ouch3 raise TApplicationException(TApplicationException.MISSING_RESULT, "getIteratorSetting failed: unknown result") - def getMaxRow(self, login, tableName, auths, startRow, startInclusive, endRow, endInclusive): + def getMaxRow(self, sharedSecret, tableName, auths, startRow, startInclusive, endRow, endInclusive): """ Parameters: - - login + - sharedSecret - tableName - auths - startRow @@ -1724,13 +1684,13 @@ def getMaxRow(self, login, tableName, auths, startRow, startInclusive, endRow, e - endInclusive """ - self.send_getMaxRow(login, tableName, auths, startRow, startInclusive, endRow, endInclusive) + self.send_getMaxRow(sharedSecret, tableName, auths, startRow, startInclusive, endRow, endInclusive) return self.recv_getMaxRow() - def send_getMaxRow(self, login, tableName, auths, startRow, startInclusive, endRow, endInclusive): + def send_getMaxRow(self, sharedSecret, tableName, auths, startRow, startInclusive, endRow, endInclusive): self._oprot.writeMessageBegin('getMaxRow', TMessageType.CALL, self._seqid) args = getMaxRow_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.auths = auths args.startRow = startRow @@ -1762,20 +1722,20 @@ def recv_getMaxRow(self): raise result.ouch3 raise TApplicationException(TApplicationException.MISSING_RESULT, "getMaxRow failed: unknown result") - def getTableProperties(self, login, tableName): + def getTableProperties(self, sharedSecret, tableName): """ Parameters: - - login + - sharedSecret - tableName """ - self.send_getTableProperties(login, tableName) + self.send_getTableProperties(sharedSecret, tableName) return self.recv_getTableProperties() - def send_getTableProperties(self, login, tableName): + def send_getTableProperties(self, sharedSecret, tableName): self._oprot.writeMessageBegin('getTableProperties', TMessageType.CALL, self._seqid) args = getTableProperties_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.write(self._oprot) self._oprot.writeMessageEnd() @@ -1802,23 +1762,23 @@ def recv_getTableProperties(self): raise result.ouch3 raise TApplicationException(TApplicationException.MISSING_RESULT, "getTableProperties failed: unknown result") - def importDirectory(self, login, tableName, importDir, failureDir, setTime): + def importDirectory(self, sharedSecret, tableName, importDir, failureDir, setTime): """ Parameters: - - login + - sharedSecret - tableName - importDir - failureDir - setTime """ - self.send_importDirectory(login, tableName, importDir, failureDir, setTime) + self.send_importDirectory(sharedSecret, tableName, importDir, failureDir, setTime) self.recv_importDirectory() - def send_importDirectory(self, login, tableName, importDir, failureDir, setTime): + def send_importDirectory(self, sharedSecret, tableName, importDir, failureDir, setTime): self._oprot.writeMessageBegin('importDirectory', TMessageType.CALL, self._seqid) args = importDirectory_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.importDir = importDir args.failureDir = failureDir @@ -1846,21 +1806,21 @@ def recv_importDirectory(self): raise result.ouch4 return - def importTable(self, login, tableName, importDir): + def importTable(self, sharedSecret, tableName, importDir): """ Parameters: - - login + - sharedSecret - tableName - importDir """ - self.send_importTable(login, tableName, importDir) + self.send_importTable(sharedSecret, tableName, importDir) self.recv_importTable() - def send_importTable(self, login, tableName, importDir): + def send_importTable(self, sharedSecret, tableName, importDir): self._oprot.writeMessageBegin('importTable', TMessageType.CALL, self._seqid) args = importTable_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.importDir = importDir args.write(self._oprot) @@ -1886,21 +1846,21 @@ def recv_importTable(self): raise result.ouch3 return - def listSplits(self, login, tableName, maxSplits): + def listSplits(self, sharedSecret, tableName, maxSplits): """ Parameters: - - login + - sharedSecret - tableName - maxSplits """ - self.send_listSplits(login, tableName, maxSplits) + self.send_listSplits(sharedSecret, tableName, maxSplits) return self.recv_listSplits() - def send_listSplits(self, login, tableName, maxSplits): + def send_listSplits(self, sharedSecret, tableName, maxSplits): self._oprot.writeMessageBegin('listSplits', TMessageType.CALL, self._seqid) args = listSplits_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.maxSplits = maxSplits args.write(self._oprot) @@ -1928,19 +1888,19 @@ def recv_listSplits(self): raise result.ouch3 raise TApplicationException(TApplicationException.MISSING_RESULT, "listSplits failed: unknown result") - def listTables(self, login): + def listTables(self, sharedSecret): """ Parameters: - - login + - sharedSecret """ - self.send_listTables(login) + self.send_listTables(sharedSecret) return self.recv_listTables() - def send_listTables(self, login): + def send_listTables(self, sharedSecret): self._oprot.writeMessageBegin('listTables', TMessageType.CALL, self._seqid) args = listTables_args() - args.login = login + args.sharedSecret = sharedSecret args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() @@ -1960,20 +1920,20 @@ def recv_listTables(self): return result.success raise TApplicationException(TApplicationException.MISSING_RESULT, "listTables failed: unknown result") - def listIterators(self, login, tableName): + def listIterators(self, sharedSecret, tableName): """ Parameters: - - login + - sharedSecret - tableName """ - self.send_listIterators(login, tableName) + self.send_listIterators(sharedSecret, tableName) return self.recv_listIterators() - def send_listIterators(self, login, tableName): + def send_listIterators(self, sharedSecret, tableName): self._oprot.writeMessageBegin('listIterators', TMessageType.CALL, self._seqid) args = listIterators_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.write(self._oprot) self._oprot.writeMessageEnd() @@ -2000,20 +1960,20 @@ def recv_listIterators(self): raise result.ouch3 raise TApplicationException(TApplicationException.MISSING_RESULT, "listIterators failed: unknown result") - def listConstraints(self, login, tableName): + def listConstraints(self, sharedSecret, tableName): """ Parameters: - - login + - sharedSecret - tableName """ - self.send_listConstraints(login, tableName) + self.send_listConstraints(sharedSecret, tableName) return self.recv_listConstraints() - def send_listConstraints(self, login, tableName): + def send_listConstraints(self, sharedSecret, tableName): self._oprot.writeMessageBegin('listConstraints', TMessageType.CALL, self._seqid) args = listConstraints_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.write(self._oprot) self._oprot.writeMessageEnd() @@ -2040,22 +2000,22 @@ def recv_listConstraints(self): raise result.ouch3 raise TApplicationException(TApplicationException.MISSING_RESULT, "listConstraints failed: unknown result") - def mergeTablets(self, login, tableName, startRow, endRow): + def mergeTablets(self, sharedSecret, tableName, startRow, endRow): """ Parameters: - - login + - sharedSecret - tableName - startRow - endRow """ - self.send_mergeTablets(login, tableName, startRow, endRow) + self.send_mergeTablets(sharedSecret, tableName, startRow, endRow) self.recv_mergeTablets() - def send_mergeTablets(self, login, tableName, startRow, endRow): + def send_mergeTablets(self, sharedSecret, tableName, startRow, endRow): self._oprot.writeMessageBegin('mergeTablets', TMessageType.CALL, self._seqid) args = mergeTablets_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.startRow = startRow args.endRow = endRow @@ -2082,21 +2042,21 @@ def recv_mergeTablets(self): raise result.ouch3 return - def offlineTable(self, login, tableName, wait): + def offlineTable(self, sharedSecret, tableName, wait): """ Parameters: - - login + - sharedSecret - tableName - wait """ - self.send_offlineTable(login, tableName, wait) + self.send_offlineTable(sharedSecret, tableName, wait) self.recv_offlineTable() - def send_offlineTable(self, login, tableName, wait): + def send_offlineTable(self, sharedSecret, tableName, wait): self._oprot.writeMessageBegin('offlineTable', TMessageType.CALL, self._seqid) args = offlineTable_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.wait = wait args.write(self._oprot) @@ -2122,21 +2082,21 @@ def recv_offlineTable(self): raise result.ouch3 return - def onlineTable(self, login, tableName, wait): + def onlineTable(self, sharedSecret, tableName, wait): """ Parameters: - - login + - sharedSecret - tableName - wait """ - self.send_onlineTable(login, tableName, wait) + self.send_onlineTable(sharedSecret, tableName, wait) self.recv_onlineTable() - def send_onlineTable(self, login, tableName, wait): + def send_onlineTable(self, sharedSecret, tableName, wait): self._oprot.writeMessageBegin('onlineTable', TMessageType.CALL, self._seqid) args = onlineTable_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.wait = wait args.write(self._oprot) @@ -2162,21 +2122,21 @@ def recv_onlineTable(self): raise result.ouch3 return - def removeConstraint(self, login, tableName, constraint): + def removeConstraint(self, sharedSecret, tableName, constraint): """ Parameters: - - login + - sharedSecret - tableName - constraint """ - self.send_removeConstraint(login, tableName, constraint) + self.send_removeConstraint(sharedSecret, tableName, constraint) self.recv_removeConstraint() - def send_removeConstraint(self, login, tableName, constraint): + def send_removeConstraint(self, sharedSecret, tableName, constraint): self._oprot.writeMessageBegin('removeConstraint', TMessageType.CALL, self._seqid) args = removeConstraint_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.constraint = constraint args.write(self._oprot) @@ -2202,22 +2162,22 @@ def recv_removeConstraint(self): raise result.ouch3 return - def removeIterator(self, login, tableName, iterName, scopes): + def removeIterator(self, sharedSecret, tableName, iterName, scopes): """ Parameters: - - login + - sharedSecret - tableName - iterName - scopes """ - self.send_removeIterator(login, tableName, iterName, scopes) + self.send_removeIterator(sharedSecret, tableName, iterName, scopes) self.recv_removeIterator() - def send_removeIterator(self, login, tableName, iterName, scopes): + def send_removeIterator(self, sharedSecret, tableName, iterName, scopes): self._oprot.writeMessageBegin('removeIterator', TMessageType.CALL, self._seqid) args = removeIterator_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.iterName = iterName args.scopes = scopes @@ -2244,21 +2204,21 @@ def recv_removeIterator(self): raise result.ouch3 return - def removeTableProperty(self, login, tableName, property): + def removeTableProperty(self, sharedSecret, tableName, property): """ Parameters: - - login + - sharedSecret - tableName - property """ - self.send_removeTableProperty(login, tableName, property) + self.send_removeTableProperty(sharedSecret, tableName, property) self.recv_removeTableProperty() - def send_removeTableProperty(self, login, tableName, property): + def send_removeTableProperty(self, sharedSecret, tableName, property): self._oprot.writeMessageBegin('removeTableProperty', TMessageType.CALL, self._seqid) args = removeTableProperty_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.property = property args.write(self._oprot) @@ -2284,21 +2244,21 @@ def recv_removeTableProperty(self): raise result.ouch3 return - def renameTable(self, login, oldTableName, newTableName): + def renameTable(self, sharedSecret, oldTableName, newTableName): """ Parameters: - - login + - sharedSecret - oldTableName - newTableName """ - self.send_renameTable(login, oldTableName, newTableName) + self.send_renameTable(sharedSecret, oldTableName, newTableName) self.recv_renameTable() - def send_renameTable(self, login, oldTableName, newTableName): + def send_renameTable(self, sharedSecret, oldTableName, newTableName): self._oprot.writeMessageBegin('renameTable', TMessageType.CALL, self._seqid) args = renameTable_args() - args.login = login + args.sharedSecret = sharedSecret args.oldTableName = oldTableName args.newTableName = newTableName args.write(self._oprot) @@ -2326,21 +2286,21 @@ def recv_renameTable(self): raise result.ouch4 return - def setLocalityGroups(self, login, tableName, groups): + def setLocalityGroups(self, sharedSecret, tableName, groups): """ Parameters: - - login + - sharedSecret - tableName - groups """ - self.send_setLocalityGroups(login, tableName, groups) + self.send_setLocalityGroups(sharedSecret, tableName, groups) self.recv_setLocalityGroups() - def send_setLocalityGroups(self, login, tableName, groups): + def send_setLocalityGroups(self, sharedSecret, tableName, groups): self._oprot.writeMessageBegin('setLocalityGroups', TMessageType.CALL, self._seqid) args = setLocalityGroups_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.groups = groups args.write(self._oprot) @@ -2366,22 +2326,22 @@ def recv_setLocalityGroups(self): raise result.ouch3 return - def setTableProperty(self, login, tableName, property, value): + def setTableProperty(self, sharedSecret, tableName, property, value): """ Parameters: - - login + - sharedSecret - tableName - property - value """ - self.send_setTableProperty(login, tableName, property, value) + self.send_setTableProperty(sharedSecret, tableName, property, value) self.recv_setTableProperty() - def send_setTableProperty(self, login, tableName, property, value): + def send_setTableProperty(self, sharedSecret, tableName, property, value): self._oprot.writeMessageBegin('setTableProperty', TMessageType.CALL, self._seqid) args = setTableProperty_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.property = property args.value = value @@ -2408,22 +2368,22 @@ def recv_setTableProperty(self): raise result.ouch3 return - def splitRangeByTablets(self, login, tableName, range, maxSplits): + def splitRangeByTablets(self, sharedSecret, tableName, range, maxSplits): """ Parameters: - - login + - sharedSecret - tableName - range - maxSplits """ - self.send_splitRangeByTablets(login, tableName, range, maxSplits) + self.send_splitRangeByTablets(sharedSecret, tableName, range, maxSplits) return self.recv_splitRangeByTablets() - def send_splitRangeByTablets(self, login, tableName, range, maxSplits): + def send_splitRangeByTablets(self, sharedSecret, tableName, range, maxSplits): self._oprot.writeMessageBegin('splitRangeByTablets', TMessageType.CALL, self._seqid) args = splitRangeByTablets_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.range = range args.maxSplits = maxSplits @@ -2452,20 +2412,20 @@ def recv_splitRangeByTablets(self): raise result.ouch3 raise TApplicationException(TApplicationException.MISSING_RESULT, "splitRangeByTablets failed: unknown result") - def tableExists(self, login, tableName): + def tableExists(self, sharedSecret, tableName): """ Parameters: - - login + - sharedSecret - tableName """ - self.send_tableExists(login, tableName) + self.send_tableExists(sharedSecret, tableName) return self.recv_tableExists() - def send_tableExists(self, login, tableName): + def send_tableExists(self, sharedSecret, tableName): self._oprot.writeMessageBegin('tableExists', TMessageType.CALL, self._seqid) args = tableExists_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.write(self._oprot) self._oprot.writeMessageEnd() @@ -2486,19 +2446,19 @@ def recv_tableExists(self): return result.success raise TApplicationException(TApplicationException.MISSING_RESULT, "tableExists failed: unknown result") - def tableIdMap(self, login): + def tableIdMap(self, sharedSecret): """ Parameters: - - login + - sharedSecret """ - self.send_tableIdMap(login) + self.send_tableIdMap(sharedSecret) return self.recv_tableIdMap() - def send_tableIdMap(self, login): + def send_tableIdMap(self, sharedSecret): self._oprot.writeMessageBegin('tableIdMap', TMessageType.CALL, self._seqid) args = tableIdMap_args() - args.login = login + args.sharedSecret = sharedSecret args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() @@ -2518,22 +2478,22 @@ def recv_tableIdMap(self): return result.success raise TApplicationException(TApplicationException.MISSING_RESULT, "tableIdMap failed: unknown result") - def testTableClassLoad(self, login, tableName, className, asTypeName): + def testTableClassLoad(self, sharedSecret, tableName, className, asTypeName): """ Parameters: - - login + - sharedSecret - tableName - className - asTypeName """ - self.send_testTableClassLoad(login, tableName, className, asTypeName) + self.send_testTableClassLoad(sharedSecret, tableName, className, asTypeName) return self.recv_testTableClassLoad() - def send_testTableClassLoad(self, login, tableName, className, asTypeName): + def send_testTableClassLoad(self, sharedSecret, tableName, className, asTypeName): self._oprot.writeMessageBegin('testTableClassLoad', TMessageType.CALL, self._seqid) args = testTableClassLoad_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.className = className args.asTypeName = asTypeName @@ -2562,20 +2522,20 @@ def recv_testTableClassLoad(self): raise result.ouch3 raise TApplicationException(TApplicationException.MISSING_RESULT, "testTableClassLoad failed: unknown result") - def pingTabletServer(self, login, tserver): + def pingTabletServer(self, sharedSecret, tserver): """ Parameters: - - login + - sharedSecret - tserver """ - self.send_pingTabletServer(login, tserver) + self.send_pingTabletServer(sharedSecret, tserver) self.recv_pingTabletServer() - def send_pingTabletServer(self, login, tserver): + def send_pingTabletServer(self, sharedSecret, tserver): self._oprot.writeMessageBegin('pingTabletServer', TMessageType.CALL, self._seqid) args = pingTabletServer_args() - args.login = login + args.sharedSecret = sharedSecret args.tserver = tserver args.write(self._oprot) self._oprot.writeMessageEnd() @@ -2598,20 +2558,20 @@ def recv_pingTabletServer(self): raise result.ouch2 return - def getActiveScans(self, login, tserver): + def getActiveScans(self, sharedSecret, tserver): """ Parameters: - - login + - sharedSecret - tserver """ - self.send_getActiveScans(login, tserver) + self.send_getActiveScans(sharedSecret, tserver) return self.recv_getActiveScans() - def send_getActiveScans(self, login, tserver): + def send_getActiveScans(self, sharedSecret, tserver): self._oprot.writeMessageBegin('getActiveScans', TMessageType.CALL, self._seqid) args = getActiveScans_args() - args.login = login + args.sharedSecret = sharedSecret args.tserver = tserver args.write(self._oprot) self._oprot.writeMessageEnd() @@ -2636,20 +2596,20 @@ def recv_getActiveScans(self): raise result.ouch2 raise TApplicationException(TApplicationException.MISSING_RESULT, "getActiveScans failed: unknown result") - def getActiveCompactions(self, login, tserver): + def getActiveCompactions(self, sharedSecret, tserver): """ Parameters: - - login + - sharedSecret - tserver """ - self.send_getActiveCompactions(login, tserver) + self.send_getActiveCompactions(sharedSecret, tserver) return self.recv_getActiveCompactions() - def send_getActiveCompactions(self, login, tserver): + def send_getActiveCompactions(self, sharedSecret, tserver): self._oprot.writeMessageBegin('getActiveCompactions', TMessageType.CALL, self._seqid) args = getActiveCompactions_args() - args.login = login + args.sharedSecret = sharedSecret args.tserver = tserver args.write(self._oprot) self._oprot.writeMessageEnd() @@ -2674,19 +2634,19 @@ def recv_getActiveCompactions(self): raise result.ouch2 raise TApplicationException(TApplicationException.MISSING_RESULT, "getActiveCompactions failed: unknown result") - def getSiteConfiguration(self, login): + def getSiteConfiguration(self, sharedSecret): """ Parameters: - - login + - sharedSecret """ - self.send_getSiteConfiguration(login) + self.send_getSiteConfiguration(sharedSecret) return self.recv_getSiteConfiguration() - def send_getSiteConfiguration(self, login): + def send_getSiteConfiguration(self, sharedSecret): self._oprot.writeMessageBegin('getSiteConfiguration', TMessageType.CALL, self._seqid) args = getSiteConfiguration_args() - args.login = login + args.sharedSecret = sharedSecret args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() @@ -2710,19 +2670,19 @@ def recv_getSiteConfiguration(self): raise result.ouch2 raise TApplicationException(TApplicationException.MISSING_RESULT, "getSiteConfiguration failed: unknown result") - def getSystemConfiguration(self, login): + def getSystemConfiguration(self, sharedSecret): """ Parameters: - - login + - sharedSecret """ - self.send_getSystemConfiguration(login) + self.send_getSystemConfiguration(sharedSecret) return self.recv_getSystemConfiguration() - def send_getSystemConfiguration(self, login): + def send_getSystemConfiguration(self, sharedSecret): self._oprot.writeMessageBegin('getSystemConfiguration', TMessageType.CALL, self._seqid) args = getSystemConfiguration_args() - args.login = login + args.sharedSecret = sharedSecret args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() @@ -2746,19 +2706,19 @@ def recv_getSystemConfiguration(self): raise result.ouch2 raise TApplicationException(TApplicationException.MISSING_RESULT, "getSystemConfiguration failed: unknown result") - def getTabletServers(self, login): + def getTabletServers(self, sharedSecret): """ Parameters: - - login + - sharedSecret """ - self.send_getTabletServers(login) + self.send_getTabletServers(sharedSecret) return self.recv_getTabletServers() - def send_getTabletServers(self, login): + def send_getTabletServers(self, sharedSecret): self._oprot.writeMessageBegin('getTabletServers', TMessageType.CALL, self._seqid) args = getTabletServers_args() - args.login = login + args.sharedSecret = sharedSecret args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() @@ -2778,20 +2738,20 @@ def recv_getTabletServers(self): return result.success raise TApplicationException(TApplicationException.MISSING_RESULT, "getTabletServers failed: unknown result") - def removeProperty(self, login, property): + def removeProperty(self, sharedSecret, property): """ Parameters: - - login + - sharedSecret - property """ - self.send_removeProperty(login, property) + self.send_removeProperty(sharedSecret, property) self.recv_removeProperty() - def send_removeProperty(self, login, property): + def send_removeProperty(self, sharedSecret, property): self._oprot.writeMessageBegin('removeProperty', TMessageType.CALL, self._seqid) args = removeProperty_args() - args.login = login + args.sharedSecret = sharedSecret args.property = property args.write(self._oprot) self._oprot.writeMessageEnd() @@ -2814,21 +2774,21 @@ def recv_removeProperty(self): raise result.ouch2 return - def setProperty(self, login, property, value): + def setProperty(self, sharedSecret, property, value): """ Parameters: - - login + - sharedSecret - property - value """ - self.send_setProperty(login, property, value) + self.send_setProperty(sharedSecret, property, value) self.recv_setProperty() - def send_setProperty(self, login, property, value): + def send_setProperty(self, sharedSecret, property, value): self._oprot.writeMessageBegin('setProperty', TMessageType.CALL, self._seqid) args = setProperty_args() - args.login = login + args.sharedSecret = sharedSecret args.property = property args.value = value args.write(self._oprot) @@ -2852,21 +2812,21 @@ def recv_setProperty(self): raise result.ouch2 return - def testClassLoad(self, login, className, asTypeName): + def testClassLoad(self, sharedSecret, className, asTypeName): """ Parameters: - - login + - sharedSecret - className - asTypeName """ - self.send_testClassLoad(login, className, asTypeName) + self.send_testClassLoad(sharedSecret, className, asTypeName) return self.recv_testClassLoad() - def send_testClassLoad(self, login, className, asTypeName): + def send_testClassLoad(self, sharedSecret, className, asTypeName): self._oprot.writeMessageBegin('testClassLoad', TMessageType.CALL, self._seqid) args = testClassLoad_args() - args.login = login + args.sharedSecret = sharedSecret args.className = className args.asTypeName = asTypeName args.write(self._oprot) @@ -2892,21 +2852,21 @@ def recv_testClassLoad(self): raise result.ouch2 raise TApplicationException(TApplicationException.MISSING_RESULT, "testClassLoad failed: unknown result") - def authenticateUser(self, login, user, properties): + def authenticateUser(self, sharedSecret, user, properties): """ Parameters: - - login + - sharedSecret - user - properties """ - self.send_authenticateUser(login, user, properties) + self.send_authenticateUser(sharedSecret, user, properties) return self.recv_authenticateUser() - def send_authenticateUser(self, login, user, properties): + def send_authenticateUser(self, sharedSecret, user, properties): self._oprot.writeMessageBegin('authenticateUser', TMessageType.CALL, self._seqid) args = authenticateUser_args() - args.login = login + args.sharedSecret = sharedSecret args.user = user args.properties = properties args.write(self._oprot) @@ -2932,21 +2892,21 @@ def recv_authenticateUser(self): raise result.ouch2 raise TApplicationException(TApplicationException.MISSING_RESULT, "authenticateUser failed: unknown result") - def changeUserAuthorizations(self, login, user, authorizations): + def changeUserAuthorizations(self, sharedSecret, user, authorizations): """ Parameters: - - login + - sharedSecret - user - authorizations """ - self.send_changeUserAuthorizations(login, user, authorizations) + self.send_changeUserAuthorizations(sharedSecret, user, authorizations) self.recv_changeUserAuthorizations() - def send_changeUserAuthorizations(self, login, user, authorizations): + def send_changeUserAuthorizations(self, sharedSecret, user, authorizations): self._oprot.writeMessageBegin('changeUserAuthorizations', TMessageType.CALL, self._seqid) args = changeUserAuthorizations_args() - args.login = login + args.sharedSecret = sharedSecret args.user = user args.authorizations = authorizations args.write(self._oprot) @@ -2970,21 +2930,21 @@ def recv_changeUserAuthorizations(self): raise result.ouch2 return - def changeLocalUserPassword(self, login, user, password): + def changeLocalUserPassword(self, sharedSecret, user, password): """ Parameters: - - login + - sharedSecret - user - password """ - self.send_changeLocalUserPassword(login, user, password) + self.send_changeLocalUserPassword(sharedSecret, user, password) self.recv_changeLocalUserPassword() - def send_changeLocalUserPassword(self, login, user, password): + def send_changeLocalUserPassword(self, sharedSecret, user, password): self._oprot.writeMessageBegin('changeLocalUserPassword', TMessageType.CALL, self._seqid) args = changeLocalUserPassword_args() - args.login = login + args.sharedSecret = sharedSecret args.user = user args.password = password args.write(self._oprot) @@ -3008,21 +2968,21 @@ def recv_changeLocalUserPassword(self): raise result.ouch2 return - def createLocalUser(self, login, user, password): + def createLocalUser(self, sharedSecret, user, password): """ Parameters: - - login + - sharedSecret - user - password """ - self.send_createLocalUser(login, user, password) + self.send_createLocalUser(sharedSecret, user, password) self.recv_createLocalUser() - def send_createLocalUser(self, login, user, password): + def send_createLocalUser(self, sharedSecret, user, password): self._oprot.writeMessageBegin('createLocalUser', TMessageType.CALL, self._seqid) args = createLocalUser_args() - args.login = login + args.sharedSecret = sharedSecret args.user = user args.password = password args.write(self._oprot) @@ -3046,20 +3006,20 @@ def recv_createLocalUser(self): raise result.ouch2 return - def dropLocalUser(self, login, user): + def dropLocalUser(self, sharedSecret, user): """ Parameters: - - login + - sharedSecret - user """ - self.send_dropLocalUser(login, user) + self.send_dropLocalUser(sharedSecret, user) self.recv_dropLocalUser() - def send_dropLocalUser(self, login, user): + def send_dropLocalUser(self, sharedSecret, user): self._oprot.writeMessageBegin('dropLocalUser', TMessageType.CALL, self._seqid) args = dropLocalUser_args() - args.login = login + args.sharedSecret = sharedSecret args.user = user args.write(self._oprot) self._oprot.writeMessageEnd() @@ -3082,20 +3042,20 @@ def recv_dropLocalUser(self): raise result.ouch2 return - def getUserAuthorizations(self, login, user): + def getUserAuthorizations(self, sharedSecret, user): """ Parameters: - - login + - sharedSecret - user """ - self.send_getUserAuthorizations(login, user) + self.send_getUserAuthorizations(sharedSecret, user) return self.recv_getUserAuthorizations() - def send_getUserAuthorizations(self, login, user): + def send_getUserAuthorizations(self, sharedSecret, user): self._oprot.writeMessageBegin('getUserAuthorizations', TMessageType.CALL, self._seqid) args = getUserAuthorizations_args() - args.login = login + args.sharedSecret = sharedSecret args.user = user args.write(self._oprot) self._oprot.writeMessageEnd() @@ -3120,21 +3080,21 @@ def recv_getUserAuthorizations(self): raise result.ouch2 raise TApplicationException(TApplicationException.MISSING_RESULT, "getUserAuthorizations failed: unknown result") - def grantSystemPermission(self, login, user, perm): + def grantSystemPermission(self, sharedSecret, user, perm): """ Parameters: - - login + - sharedSecret - user - perm """ - self.send_grantSystemPermission(login, user, perm) + self.send_grantSystemPermission(sharedSecret, user, perm) self.recv_grantSystemPermission() - def send_grantSystemPermission(self, login, user, perm): + def send_grantSystemPermission(self, sharedSecret, user, perm): self._oprot.writeMessageBegin('grantSystemPermission', TMessageType.CALL, self._seqid) args = grantSystemPermission_args() - args.login = login + args.sharedSecret = sharedSecret args.user = user args.perm = perm args.write(self._oprot) @@ -3158,22 +3118,22 @@ def recv_grantSystemPermission(self): raise result.ouch2 return - def grantTablePermission(self, login, user, table, perm): + def grantTablePermission(self, sharedSecret, user, table, perm): """ Parameters: - - login + - sharedSecret - user - table - perm """ - self.send_grantTablePermission(login, user, table, perm) + self.send_grantTablePermission(sharedSecret, user, table, perm) self.recv_grantTablePermission() - def send_grantTablePermission(self, login, user, table, perm): + def send_grantTablePermission(self, sharedSecret, user, table, perm): self._oprot.writeMessageBegin('grantTablePermission', TMessageType.CALL, self._seqid) args = grantTablePermission_args() - args.login = login + args.sharedSecret = sharedSecret args.user = user args.table = table args.perm = perm @@ -3200,21 +3160,21 @@ def recv_grantTablePermission(self): raise result.ouch3 return - def hasSystemPermission(self, login, user, perm): + def hasSystemPermission(self, sharedSecret, user, perm): """ Parameters: - - login + - sharedSecret - user - perm """ - self.send_hasSystemPermission(login, user, perm) + self.send_hasSystemPermission(sharedSecret, user, perm) return self.recv_hasSystemPermission() - def send_hasSystemPermission(self, login, user, perm): + def send_hasSystemPermission(self, sharedSecret, user, perm): self._oprot.writeMessageBegin('hasSystemPermission', TMessageType.CALL, self._seqid) args = hasSystemPermission_args() - args.login = login + args.sharedSecret = sharedSecret args.user = user args.perm = perm args.write(self._oprot) @@ -3240,22 +3200,22 @@ def recv_hasSystemPermission(self): raise result.ouch2 raise TApplicationException(TApplicationException.MISSING_RESULT, "hasSystemPermission failed: unknown result") - def hasTablePermission(self, login, user, table, perm): + def hasTablePermission(self, sharedSecret, user, table, perm): """ Parameters: - - login + - sharedSecret - user - table - perm """ - self.send_hasTablePermission(login, user, table, perm) + self.send_hasTablePermission(sharedSecret, user, table, perm) return self.recv_hasTablePermission() - def send_hasTablePermission(self, login, user, table, perm): + def send_hasTablePermission(self, sharedSecret, user, table, perm): self._oprot.writeMessageBegin('hasTablePermission', TMessageType.CALL, self._seqid) args = hasTablePermission_args() - args.login = login + args.sharedSecret = sharedSecret args.user = user args.table = table args.perm = perm @@ -3284,19 +3244,19 @@ def recv_hasTablePermission(self): raise result.ouch3 raise TApplicationException(TApplicationException.MISSING_RESULT, "hasTablePermission failed: unknown result") - def listLocalUsers(self, login): + def listLocalUsers(self, sharedSecret): """ Parameters: - - login + - sharedSecret """ - self.send_listLocalUsers(login) + self.send_listLocalUsers(sharedSecret) return self.recv_listLocalUsers() - def send_listLocalUsers(self, login): + def send_listLocalUsers(self, sharedSecret): self._oprot.writeMessageBegin('listLocalUsers', TMessageType.CALL, self._seqid) args = listLocalUsers_args() - args.login = login + args.sharedSecret = sharedSecret args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() @@ -3322,21 +3282,21 @@ def recv_listLocalUsers(self): raise result.ouch3 raise TApplicationException(TApplicationException.MISSING_RESULT, "listLocalUsers failed: unknown result") - def revokeSystemPermission(self, login, user, perm): + def revokeSystemPermission(self, sharedSecret, user, perm): """ Parameters: - - login + - sharedSecret - user - perm """ - self.send_revokeSystemPermission(login, user, perm) + self.send_revokeSystemPermission(sharedSecret, user, perm) self.recv_revokeSystemPermission() - def send_revokeSystemPermission(self, login, user, perm): + def send_revokeSystemPermission(self, sharedSecret, user, perm): self._oprot.writeMessageBegin('revokeSystemPermission', TMessageType.CALL, self._seqid) args = revokeSystemPermission_args() - args.login = login + args.sharedSecret = sharedSecret args.user = user args.perm = perm args.write(self._oprot) @@ -3360,22 +3320,22 @@ def recv_revokeSystemPermission(self): raise result.ouch2 return - def revokeTablePermission(self, login, user, table, perm): + def revokeTablePermission(self, sharedSecret, user, table, perm): """ Parameters: - - login + - sharedSecret - user - table - perm """ - self.send_revokeTablePermission(login, user, table, perm) + self.send_revokeTablePermission(sharedSecret, user, table, perm) self.recv_revokeTablePermission() - def send_revokeTablePermission(self, login, user, table, perm): + def send_revokeTablePermission(self, sharedSecret, user, table, perm): self._oprot.writeMessageBegin('revokeTablePermission', TMessageType.CALL, self._seqid) args = revokeTablePermission_args() - args.login = login + args.sharedSecret = sharedSecret args.user = user args.table = table args.perm = perm @@ -3402,22 +3362,22 @@ def recv_revokeTablePermission(self): raise result.ouch3 return - def grantNamespacePermission(self, login, user, namespaceName, perm): + def grantNamespacePermission(self, sharedSecret, user, namespaceName, perm): """ Parameters: - - login + - sharedSecret - user - namespaceName - perm """ - self.send_grantNamespacePermission(login, user, namespaceName, perm) + self.send_grantNamespacePermission(sharedSecret, user, namespaceName, perm) self.recv_grantNamespacePermission() - def send_grantNamespacePermission(self, login, user, namespaceName, perm): + def send_grantNamespacePermission(self, sharedSecret, user, namespaceName, perm): self._oprot.writeMessageBegin('grantNamespacePermission', TMessageType.CALL, self._seqid) args = grantNamespacePermission_args() - args.login = login + args.sharedSecret = sharedSecret args.user = user args.namespaceName = namespaceName args.perm = perm @@ -3442,22 +3402,22 @@ def recv_grantNamespacePermission(self): raise result.ouch2 return - def hasNamespacePermission(self, login, user, namespaceName, perm): + def hasNamespacePermission(self, sharedSecret, user, namespaceName, perm): """ Parameters: - - login + - sharedSecret - user - namespaceName - perm """ - self.send_hasNamespacePermission(login, user, namespaceName, perm) + self.send_hasNamespacePermission(sharedSecret, user, namespaceName, perm) return self.recv_hasNamespacePermission() - def send_hasNamespacePermission(self, login, user, namespaceName, perm): + def send_hasNamespacePermission(self, sharedSecret, user, namespaceName, perm): self._oprot.writeMessageBegin('hasNamespacePermission', TMessageType.CALL, self._seqid) args = hasNamespacePermission_args() - args.login = login + args.sharedSecret = sharedSecret args.user = user args.namespaceName = namespaceName args.perm = perm @@ -3484,22 +3444,22 @@ def recv_hasNamespacePermission(self): raise result.ouch2 raise TApplicationException(TApplicationException.MISSING_RESULT, "hasNamespacePermission failed: unknown result") - def revokeNamespacePermission(self, login, user, namespaceName, perm): + def revokeNamespacePermission(self, sharedSecret, user, namespaceName, perm): """ Parameters: - - login + - sharedSecret - user - namespaceName - perm """ - self.send_revokeNamespacePermission(login, user, namespaceName, perm) + self.send_revokeNamespacePermission(sharedSecret, user, namespaceName, perm) self.recv_revokeNamespacePermission() - def send_revokeNamespacePermission(self, login, user, namespaceName, perm): + def send_revokeNamespacePermission(self, sharedSecret, user, namespaceName, perm): self._oprot.writeMessageBegin('revokeNamespacePermission', TMessageType.CALL, self._seqid) args = revokeNamespacePermission_args() - args.login = login + args.sharedSecret = sharedSecret args.user = user args.namespaceName = namespaceName args.perm = perm @@ -3524,21 +3484,21 @@ def recv_revokeNamespacePermission(self): raise result.ouch2 return - def createBatchScanner(self, login, tableName, options): + def createBatchScanner(self, sharedSecret, tableName, options): """ Parameters: - - login + - sharedSecret - tableName - options """ - self.send_createBatchScanner(login, tableName, options) + self.send_createBatchScanner(sharedSecret, tableName, options) return self.recv_createBatchScanner() - def send_createBatchScanner(self, login, tableName, options): + def send_createBatchScanner(self, sharedSecret, tableName, options): self._oprot.writeMessageBegin('createBatchScanner', TMessageType.CALL, self._seqid) args = createBatchScanner_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.options = options args.write(self._oprot) @@ -3566,21 +3526,21 @@ def recv_createBatchScanner(self): raise result.ouch3 raise TApplicationException(TApplicationException.MISSING_RESULT, "createBatchScanner failed: unknown result") - def createScanner(self, login, tableName, options): + def createScanner(self, sharedSecret, tableName, options): """ Parameters: - - login + - sharedSecret - tableName - options """ - self.send_createScanner(login, tableName, options) + self.send_createScanner(sharedSecret, tableName, options) return self.recv_createScanner() - def send_createScanner(self, login, tableName, options): + def send_createScanner(self, sharedSecret, tableName, options): self._oprot.writeMessageBegin('createScanner', TMessageType.CALL, self._seqid) args = createScanner_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.options = options args.write(self._oprot) @@ -3752,21 +3712,21 @@ def recv_closeScanner(self): raise result.ouch1 return - def updateAndFlush(self, login, tableName, cells): + def updateAndFlush(self, sharedSecret, tableName, cells): """ Parameters: - - login + - sharedSecret - tableName - cells """ - self.send_updateAndFlush(login, tableName, cells) + self.send_updateAndFlush(sharedSecret, tableName, cells) self.recv_updateAndFlush() - def send_updateAndFlush(self, login, tableName, cells): + def send_updateAndFlush(self, sharedSecret, tableName, cells): self._oprot.writeMessageBegin('updateAndFlush', TMessageType.CALL, self._seqid) args = updateAndFlush_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.cells = cells args.write(self._oprot) @@ -3794,21 +3754,21 @@ def recv_updateAndFlush(self): raise result.ouch4 return - def createWriter(self, login, tableName, opts): + def createWriter(self, sharedSecret, tableName, opts): """ Parameters: - - login + - sharedSecret - tableName - opts """ - self.send_createWriter(login, tableName, opts) + self.send_createWriter(sharedSecret, tableName, opts) return self.recv_createWriter() - def send_createWriter(self, login, tableName, opts): + def send_createWriter(self, sharedSecret, tableName, opts): self._oprot.writeMessageBegin('createWriter', TMessageType.CALL, self._seqid) args = createWriter_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.opts = opts args.write(self._oprot) @@ -3922,22 +3882,22 @@ def recv_closeWriter(self): raise result.ouch2 return - def updateRowConditionally(self, login, tableName, row, updates): + def updateRowConditionally(self, sharedSecret, tableName, row, updates): """ Parameters: - - login + - sharedSecret - tableName - row - updates """ - self.send_updateRowConditionally(login, tableName, row, updates) + self.send_updateRowConditionally(sharedSecret, tableName, row, updates) return self.recv_updateRowConditionally() - def send_updateRowConditionally(self, login, tableName, row, updates): + def send_updateRowConditionally(self, sharedSecret, tableName, row, updates): self._oprot.writeMessageBegin('updateRowConditionally', TMessageType.CALL, self._seqid) args = updateRowConditionally_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.row = row args.updates = updates @@ -3966,21 +3926,21 @@ def recv_updateRowConditionally(self): raise result.ouch3 raise TApplicationException(TApplicationException.MISSING_RESULT, "updateRowConditionally failed: unknown result") - def createConditionalWriter(self, login, tableName, options): + def createConditionalWriter(self, sharedSecret, tableName, options): """ Parameters: - - login + - sharedSecret - tableName - options """ - self.send_createConditionalWriter(login, tableName, options) + self.send_createConditionalWriter(sharedSecret, tableName, options) return self.recv_createConditionalWriter() - def send_createConditionalWriter(self, login, tableName, options): + def send_createConditionalWriter(self, sharedSecret, tableName, options): self._oprot.writeMessageBegin('createConditionalWriter', TMessageType.CALL, self._seqid) args = createConditionalWriter_args() - args.login = login + args.sharedSecret = sharedSecret args.tableName = tableName args.options = options args.write(self._oprot) @@ -4196,19 +4156,19 @@ def recv_defaultNamespace(self): return result.success raise TApplicationException(TApplicationException.MISSING_RESULT, "defaultNamespace failed: unknown result") - def listNamespaces(self, login): + def listNamespaces(self, sharedSecret): """ Parameters: - - login + - sharedSecret """ - self.send_listNamespaces(login) + self.send_listNamespaces(sharedSecret) return self.recv_listNamespaces() - def send_listNamespaces(self, login): + def send_listNamespaces(self, sharedSecret): self._oprot.writeMessageBegin('listNamespaces', TMessageType.CALL, self._seqid) args = listNamespaces_args() - args.login = login + args.sharedSecret = sharedSecret args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() @@ -4232,20 +4192,20 @@ def recv_listNamespaces(self): raise result.ouch2 raise TApplicationException(TApplicationException.MISSING_RESULT, "listNamespaces failed: unknown result") - def namespaceExists(self, login, namespaceName): + def namespaceExists(self, sharedSecret, namespaceName): """ Parameters: - - login + - sharedSecret - namespaceName """ - self.send_namespaceExists(login, namespaceName) + self.send_namespaceExists(sharedSecret, namespaceName) return self.recv_namespaceExists() - def send_namespaceExists(self, login, namespaceName): + def send_namespaceExists(self, sharedSecret, namespaceName): self._oprot.writeMessageBegin('namespaceExists', TMessageType.CALL, self._seqid) args = namespaceExists_args() - args.login = login + args.sharedSecret = sharedSecret args.namespaceName = namespaceName args.write(self._oprot) self._oprot.writeMessageEnd() @@ -4270,20 +4230,20 @@ def recv_namespaceExists(self): raise result.ouch2 raise TApplicationException(TApplicationException.MISSING_RESULT, "namespaceExists failed: unknown result") - def createNamespace(self, login, namespaceName): + def createNamespace(self, sharedSecret, namespaceName): """ Parameters: - - login + - sharedSecret - namespaceName """ - self.send_createNamespace(login, namespaceName) + self.send_createNamespace(sharedSecret, namespaceName) self.recv_createNamespace() - def send_createNamespace(self, login, namespaceName): + def send_createNamespace(self, sharedSecret, namespaceName): self._oprot.writeMessageBegin('createNamespace', TMessageType.CALL, self._seqid) args = createNamespace_args() - args.login = login + args.sharedSecret = sharedSecret args.namespaceName = namespaceName args.write(self._oprot) self._oprot.writeMessageEnd() @@ -4308,20 +4268,20 @@ def recv_createNamespace(self): raise result.ouch3 return - def deleteNamespace(self, login, namespaceName): + def deleteNamespace(self, sharedSecret, namespaceName): """ Parameters: - - login + - sharedSecret - namespaceName """ - self.send_deleteNamespace(login, namespaceName) + self.send_deleteNamespace(sharedSecret, namespaceName) self.recv_deleteNamespace() - def send_deleteNamespace(self, login, namespaceName): + def send_deleteNamespace(self, sharedSecret, namespaceName): self._oprot.writeMessageBegin('deleteNamespace', TMessageType.CALL, self._seqid) args = deleteNamespace_args() - args.login = login + args.sharedSecret = sharedSecret args.namespaceName = namespaceName args.write(self._oprot) self._oprot.writeMessageEnd() @@ -4348,21 +4308,21 @@ def recv_deleteNamespace(self): raise result.ouch4 return - def renameNamespace(self, login, oldNamespaceName, newNamespaceName): + def renameNamespace(self, sharedSecret, oldNamespaceName, newNamespaceName): """ Parameters: - - login + - sharedSecret - oldNamespaceName - newNamespaceName """ - self.send_renameNamespace(login, oldNamespaceName, newNamespaceName) + self.send_renameNamespace(sharedSecret, oldNamespaceName, newNamespaceName) self.recv_renameNamespace() - def send_renameNamespace(self, login, oldNamespaceName, newNamespaceName): + def send_renameNamespace(self, sharedSecret, oldNamespaceName, newNamespaceName): self._oprot.writeMessageBegin('renameNamespace', TMessageType.CALL, self._seqid) args = renameNamespace_args() - args.login = login + args.sharedSecret = sharedSecret args.oldNamespaceName = oldNamespaceName args.newNamespaceName = newNamespaceName args.write(self._oprot) @@ -4390,22 +4350,22 @@ def recv_renameNamespace(self): raise result.ouch4 return - def setNamespaceProperty(self, login, namespaceName, property, value): + def setNamespaceProperty(self, sharedSecret, namespaceName, property, value): """ Parameters: - - login + - sharedSecret - namespaceName - property - value """ - self.send_setNamespaceProperty(login, namespaceName, property, value) + self.send_setNamespaceProperty(sharedSecret, namespaceName, property, value) self.recv_setNamespaceProperty() - def send_setNamespaceProperty(self, login, namespaceName, property, value): + def send_setNamespaceProperty(self, sharedSecret, namespaceName, property, value): self._oprot.writeMessageBegin('setNamespaceProperty', TMessageType.CALL, self._seqid) args = setNamespaceProperty_args() - args.login = login + args.sharedSecret = sharedSecret args.namespaceName = namespaceName args.property = property args.value = value @@ -4432,21 +4392,21 @@ def recv_setNamespaceProperty(self): raise result.ouch3 return - def removeNamespaceProperty(self, login, namespaceName, property): + def removeNamespaceProperty(self, sharedSecret, namespaceName, property): """ Parameters: - - login + - sharedSecret - namespaceName - property """ - self.send_removeNamespaceProperty(login, namespaceName, property) + self.send_removeNamespaceProperty(sharedSecret, namespaceName, property) self.recv_removeNamespaceProperty() - def send_removeNamespaceProperty(self, login, namespaceName, property): + def send_removeNamespaceProperty(self, sharedSecret, namespaceName, property): self._oprot.writeMessageBegin('removeNamespaceProperty', TMessageType.CALL, self._seqid) args = removeNamespaceProperty_args() - args.login = login + args.sharedSecret = sharedSecret args.namespaceName = namespaceName args.property = property args.write(self._oprot) @@ -4472,20 +4432,20 @@ def recv_removeNamespaceProperty(self): raise result.ouch3 return - def getNamespaceProperties(self, login, namespaceName): + def getNamespaceProperties(self, sharedSecret, namespaceName): """ Parameters: - - login + - sharedSecret - namespaceName """ - self.send_getNamespaceProperties(login, namespaceName) + self.send_getNamespaceProperties(sharedSecret, namespaceName) return self.recv_getNamespaceProperties() - def send_getNamespaceProperties(self, login, namespaceName): + def send_getNamespaceProperties(self, sharedSecret, namespaceName): self._oprot.writeMessageBegin('getNamespaceProperties', TMessageType.CALL, self._seqid) args = getNamespaceProperties_args() - args.login = login + args.sharedSecret = sharedSecret args.namespaceName = namespaceName args.write(self._oprot) self._oprot.writeMessageEnd() @@ -4512,19 +4472,19 @@ def recv_getNamespaceProperties(self): raise result.ouch3 raise TApplicationException(TApplicationException.MISSING_RESULT, "getNamespaceProperties failed: unknown result") - def namespaceIdMap(self, login): + def namespaceIdMap(self, sharedSecret): """ Parameters: - - login + - sharedSecret """ - self.send_namespaceIdMap(login) + self.send_namespaceIdMap(sharedSecret) return self.recv_namespaceIdMap() - def send_namespaceIdMap(self, login): + def send_namespaceIdMap(self, sharedSecret): self._oprot.writeMessageBegin('namespaceIdMap', TMessageType.CALL, self._seqid) args = namespaceIdMap_args() - args.login = login + args.sharedSecret = sharedSecret args.write(self._oprot) self._oprot.writeMessageEnd() self._oprot.trans.flush() @@ -4548,22 +4508,22 @@ def recv_namespaceIdMap(self): raise result.ouch2 raise TApplicationException(TApplicationException.MISSING_RESULT, "namespaceIdMap failed: unknown result") - def attachNamespaceIterator(self, login, namespaceName, setting, scopes): + def attachNamespaceIterator(self, sharedSecret, namespaceName, setting, scopes): """ Parameters: - - login + - sharedSecret - namespaceName - setting - scopes """ - self.send_attachNamespaceIterator(login, namespaceName, setting, scopes) + self.send_attachNamespaceIterator(sharedSecret, namespaceName, setting, scopes) self.recv_attachNamespaceIterator() - def send_attachNamespaceIterator(self, login, namespaceName, setting, scopes): + def send_attachNamespaceIterator(self, sharedSecret, namespaceName, setting, scopes): self._oprot.writeMessageBegin('attachNamespaceIterator', TMessageType.CALL, self._seqid) args = attachNamespaceIterator_args() - args.login = login + args.sharedSecret = sharedSecret args.namespaceName = namespaceName args.setting = setting args.scopes = scopes @@ -4590,22 +4550,22 @@ def recv_attachNamespaceIterator(self): raise result.ouch3 return - def removeNamespaceIterator(self, login, namespaceName, name, scopes): + def removeNamespaceIterator(self, sharedSecret, namespaceName, name, scopes): """ Parameters: - - login + - sharedSecret - namespaceName - name - scopes """ - self.send_removeNamespaceIterator(login, namespaceName, name, scopes) + self.send_removeNamespaceIterator(sharedSecret, namespaceName, name, scopes) self.recv_removeNamespaceIterator() - def send_removeNamespaceIterator(self, login, namespaceName, name, scopes): + def send_removeNamespaceIterator(self, sharedSecret, namespaceName, name, scopes): self._oprot.writeMessageBegin('removeNamespaceIterator', TMessageType.CALL, self._seqid) args = removeNamespaceIterator_args() - args.login = login + args.sharedSecret = sharedSecret args.namespaceName = namespaceName args.name = name args.scopes = scopes @@ -4632,22 +4592,22 @@ def recv_removeNamespaceIterator(self): raise result.ouch3 return - def getNamespaceIteratorSetting(self, login, namespaceName, name, scope): + def getNamespaceIteratorSetting(self, sharedSecret, namespaceName, name, scope): """ Parameters: - - login + - sharedSecret - namespaceName - name - scope """ - self.send_getNamespaceIteratorSetting(login, namespaceName, name, scope) + self.send_getNamespaceIteratorSetting(sharedSecret, namespaceName, name, scope) return self.recv_getNamespaceIteratorSetting() - def send_getNamespaceIteratorSetting(self, login, namespaceName, name, scope): + def send_getNamespaceIteratorSetting(self, sharedSecret, namespaceName, name, scope): self._oprot.writeMessageBegin('getNamespaceIteratorSetting', TMessageType.CALL, self._seqid) args = getNamespaceIteratorSetting_args() - args.login = login + args.sharedSecret = sharedSecret args.namespaceName = namespaceName args.name = name args.scope = scope @@ -4676,20 +4636,20 @@ def recv_getNamespaceIteratorSetting(self): raise result.ouch3 raise TApplicationException(TApplicationException.MISSING_RESULT, "getNamespaceIteratorSetting failed: unknown result") - def listNamespaceIterators(self, login, namespaceName): + def listNamespaceIterators(self, sharedSecret, namespaceName): """ Parameters: - - login + - sharedSecret - namespaceName """ - self.send_listNamespaceIterators(login, namespaceName) + self.send_listNamespaceIterators(sharedSecret, namespaceName) return self.recv_listNamespaceIterators() - def send_listNamespaceIterators(self, login, namespaceName): + def send_listNamespaceIterators(self, sharedSecret, namespaceName): self._oprot.writeMessageBegin('listNamespaceIterators', TMessageType.CALL, self._seqid) args = listNamespaceIterators_args() - args.login = login + args.sharedSecret = sharedSecret args.namespaceName = namespaceName args.write(self._oprot) self._oprot.writeMessageEnd() @@ -4716,22 +4676,22 @@ def recv_listNamespaceIterators(self): raise result.ouch3 raise TApplicationException(TApplicationException.MISSING_RESULT, "listNamespaceIterators failed: unknown result") - def checkNamespaceIteratorConflicts(self, login, namespaceName, setting, scopes): + def checkNamespaceIteratorConflicts(self, sharedSecret, namespaceName, setting, scopes): """ Parameters: - - login + - sharedSecret - namespaceName - setting - scopes """ - self.send_checkNamespaceIteratorConflicts(login, namespaceName, setting, scopes) + self.send_checkNamespaceIteratorConflicts(sharedSecret, namespaceName, setting, scopes) self.recv_checkNamespaceIteratorConflicts() - def send_checkNamespaceIteratorConflicts(self, login, namespaceName, setting, scopes): + def send_checkNamespaceIteratorConflicts(self, sharedSecret, namespaceName, setting, scopes): self._oprot.writeMessageBegin('checkNamespaceIteratorConflicts', TMessageType.CALL, self._seqid) args = checkNamespaceIteratorConflicts_args() - args.login = login + args.sharedSecret = sharedSecret args.namespaceName = namespaceName args.setting = setting args.scopes = scopes @@ -4758,21 +4718,21 @@ def recv_checkNamespaceIteratorConflicts(self): raise result.ouch3 return - def addNamespaceConstraint(self, login, namespaceName, constraintClassName): + def addNamespaceConstraint(self, sharedSecret, namespaceName, constraintClassName): """ Parameters: - - login + - sharedSecret - namespaceName - constraintClassName """ - self.send_addNamespaceConstraint(login, namespaceName, constraintClassName) + self.send_addNamespaceConstraint(sharedSecret, namespaceName, constraintClassName) return self.recv_addNamespaceConstraint() - def send_addNamespaceConstraint(self, login, namespaceName, constraintClassName): + def send_addNamespaceConstraint(self, sharedSecret, namespaceName, constraintClassName): self._oprot.writeMessageBegin('addNamespaceConstraint', TMessageType.CALL, self._seqid) args = addNamespaceConstraint_args() - args.login = login + args.sharedSecret = sharedSecret args.namespaceName = namespaceName args.constraintClassName = constraintClassName args.write(self._oprot) @@ -4800,21 +4760,21 @@ def recv_addNamespaceConstraint(self): raise result.ouch3 raise TApplicationException(TApplicationException.MISSING_RESULT, "addNamespaceConstraint failed: unknown result") - def removeNamespaceConstraint(self, login, namespaceName, id): + def removeNamespaceConstraint(self, sharedSecret, namespaceName, id): """ Parameters: - - login + - sharedSecret - namespaceName - id """ - self.send_removeNamespaceConstraint(login, namespaceName, id) + self.send_removeNamespaceConstraint(sharedSecret, namespaceName, id) self.recv_removeNamespaceConstraint() - def send_removeNamespaceConstraint(self, login, namespaceName, id): + def send_removeNamespaceConstraint(self, sharedSecret, namespaceName, id): self._oprot.writeMessageBegin('removeNamespaceConstraint', TMessageType.CALL, self._seqid) args = removeNamespaceConstraint_args() - args.login = login + args.sharedSecret = sharedSecret args.namespaceName = namespaceName args.id = id args.write(self._oprot) @@ -4840,20 +4800,20 @@ def recv_removeNamespaceConstraint(self): raise result.ouch3 return - def listNamespaceConstraints(self, login, namespaceName): + def listNamespaceConstraints(self, sharedSecret, namespaceName): """ Parameters: - - login + - sharedSecret - namespaceName """ - self.send_listNamespaceConstraints(login, namespaceName) + self.send_listNamespaceConstraints(sharedSecret, namespaceName) return self.recv_listNamespaceConstraints() - def send_listNamespaceConstraints(self, login, namespaceName): + def send_listNamespaceConstraints(self, sharedSecret, namespaceName): self._oprot.writeMessageBegin('listNamespaceConstraints', TMessageType.CALL, self._seqid) args = listNamespaceConstraints_args() - args.login = login + args.sharedSecret = sharedSecret args.namespaceName = namespaceName args.write(self._oprot) self._oprot.writeMessageEnd() @@ -4880,22 +4840,22 @@ def recv_listNamespaceConstraints(self): raise result.ouch3 raise TApplicationException(TApplicationException.MISSING_RESULT, "listNamespaceConstraints failed: unknown result") - def testNamespaceClassLoad(self, login, namespaceName, className, asTypeName): + def testNamespaceClassLoad(self, sharedSecret, namespaceName, className, asTypeName): """ Parameters: - - login + - sharedSecret - namespaceName - className - asTypeName """ - self.send_testNamespaceClassLoad(login, namespaceName, className, asTypeName) + self.send_testNamespaceClassLoad(sharedSecret, namespaceName, className, asTypeName) return self.recv_testNamespaceClassLoad() - def send_testNamespaceClassLoad(self, login, namespaceName, className, asTypeName): + def send_testNamespaceClassLoad(self, sharedSecret, namespaceName, className, asTypeName): self._oprot.writeMessageBegin('testNamespaceClassLoad', TMessageType.CALL, self._seqid) args = testNamespaceClassLoad_args() - args.login = login + args.sharedSecret = sharedSecret args.namespaceName = namespaceName args.className = className args.asTypeName = asTypeName @@ -4929,7 +4889,6 @@ class Processor(Iface, TProcessor): def __init__(self, handler): self._handler = handler self._processMap = {} - self._processMap["login"] = Processor.process_login self._processMap["addConstraint"] = Processor.process_addConstraint self._processMap["addSplits"] = Processor.process_addSplits self._processMap["attachIterator"] = Processor.process_attachIterator @@ -5029,9 +4988,15 @@ def __init__(self, handler): self._processMap["removeNamespaceConstraint"] = Processor.process_removeNamespaceConstraint self._processMap["listNamespaceConstraints"] = Processor.process_listNamespaceConstraints self._processMap["testNamespaceClassLoad"] = Processor.process_testNamespaceClassLoad + self._on_message_begin = None + + def on_message_begin(self, func): + self._on_message_begin = func def process(self, iprot, oprot): (name, type, seqid) = iprot.readMessageBegin() + if self._on_message_begin: + self._on_message_begin(name, type, seqid) if name not in self._processMap: iprot.skip(TType.STRUCT) iprot.readMessageEnd() @@ -5045,39 +5010,13 @@ def process(self, iprot, oprot): self._processMap[name](self, seqid, iprot, oprot) return True - def process_login(self, seqid, iprot, oprot): - args = login_args() - args.read(iprot) - iprot.readMessageEnd() - result = login_result() - try: - result.success = self._handler.login(args.principal, args.loginProperties) - msg_type = TMessageType.REPLY - except TTransport.TTransportException: - raise - except AccumuloSecurityException as ouch2: - msg_type = TMessageType.REPLY - result.ouch2 = ouch2 - except TApplicationException as ex: - logging.exception('TApplication exception in handler') - msg_type = TMessageType.EXCEPTION - result = ex - except Exception: - logging.exception('Unexpected exception in handler') - msg_type = TMessageType.EXCEPTION - result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error') - oprot.writeMessageBegin("login", msg_type, seqid) - result.write(oprot) - oprot.writeMessageEnd() - oprot.trans.flush() - def process_addConstraint(self, seqid, iprot, oprot): args = addConstraint_args() args.read(iprot) iprot.readMessageEnd() result = addConstraint_result() try: - result.success = self._handler.addConstraint(args.login, args.tableName, args.constraintClassName) + result.success = self._handler.addConstraint(args.sharedSecret, args.tableName, args.constraintClassName) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5109,7 +5048,7 @@ def process_addSplits(self, seqid, iprot, oprot): iprot.readMessageEnd() result = addSplits_result() try: - self._handler.addSplits(args.login, args.tableName, args.splits) + self._handler.addSplits(args.sharedSecret, args.tableName, args.splits) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5141,7 +5080,7 @@ def process_attachIterator(self, seqid, iprot, oprot): iprot.readMessageEnd() result = attachIterator_result() try: - self._handler.attachIterator(args.login, args.tableName, args.setting, args.scopes) + self._handler.attachIterator(args.sharedSecret, args.tableName, args.setting, args.scopes) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5173,7 +5112,7 @@ def process_checkIteratorConflicts(self, seqid, iprot, oprot): iprot.readMessageEnd() result = checkIteratorConflicts_result() try: - self._handler.checkIteratorConflicts(args.login, args.tableName, args.setting, args.scopes) + self._handler.checkIteratorConflicts(args.sharedSecret, args.tableName, args.setting, args.scopes) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5205,7 +5144,7 @@ def process_clearLocatorCache(self, seqid, iprot, oprot): iprot.readMessageEnd() result = clearLocatorCache_result() try: - self._handler.clearLocatorCache(args.login, args.tableName) + self._handler.clearLocatorCache(args.sharedSecret, args.tableName) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5231,7 +5170,7 @@ def process_cloneTable(self, seqid, iprot, oprot): iprot.readMessageEnd() result = cloneTable_result() try: - self._handler.cloneTable(args.login, args.tableName, args.newTableName, args.flush, args.propertiesToSet, args.propertiesToExclude) + self._handler.cloneTable(args.sharedSecret, args.tableName, args.newTableName, args.flush, args.propertiesToSet, args.propertiesToExclude) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5266,7 +5205,7 @@ def process_compactTable(self, seqid, iprot, oprot): iprot.readMessageEnd() result = compactTable_result() try: - self._handler.compactTable(args.login, args.tableName, args.startRow, args.endRow, args.iterators, args.flush, args.wait, args.compactionStrategy) + self._handler.compactTable(args.sharedSecret, args.tableName, args.startRow, args.endRow, args.iterators, args.flush, args.wait, args.selectorConfig, args.configurerConfig) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5298,7 +5237,7 @@ def process_cancelCompaction(self, seqid, iprot, oprot): iprot.readMessageEnd() result = cancelCompaction_result() try: - self._handler.cancelCompaction(args.login, args.tableName) + self._handler.cancelCompaction(args.sharedSecret, args.tableName) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5330,7 +5269,7 @@ def process_createTable(self, seqid, iprot, oprot): iprot.readMessageEnd() result = createTable_result() try: - self._handler.createTable(args.login, args.tableName, args.versioningIter, args.type) + self._handler.createTable(args.sharedSecret, args.tableName, args.versioningIter, args.type) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5362,7 +5301,7 @@ def process_deleteTable(self, seqid, iprot, oprot): iprot.readMessageEnd() result = deleteTable_result() try: - self._handler.deleteTable(args.login, args.tableName) + self._handler.deleteTable(args.sharedSecret, args.tableName) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5394,7 +5333,7 @@ def process_deleteRows(self, seqid, iprot, oprot): iprot.readMessageEnd() result = deleteRows_result() try: - self._handler.deleteRows(args.login, args.tableName, args.startRow, args.endRow) + self._handler.deleteRows(args.sharedSecret, args.tableName, args.startRow, args.endRow) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5426,7 +5365,7 @@ def process_exportTable(self, seqid, iprot, oprot): iprot.readMessageEnd() result = exportTable_result() try: - self._handler.exportTable(args.login, args.tableName, args.exportDir) + self._handler.exportTable(args.sharedSecret, args.tableName, args.exportDir) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5458,7 +5397,7 @@ def process_flushTable(self, seqid, iprot, oprot): iprot.readMessageEnd() result = flushTable_result() try: - self._handler.flushTable(args.login, args.tableName, args.startRow, args.endRow, args.wait) + self._handler.flushTable(args.sharedSecret, args.tableName, args.startRow, args.endRow, args.wait) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5490,7 +5429,7 @@ def process_getDiskUsage(self, seqid, iprot, oprot): iprot.readMessageEnd() result = getDiskUsage_result() try: - result.success = self._handler.getDiskUsage(args.login, args.tables) + result.success = self._handler.getDiskUsage(args.sharedSecret, args.tables) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5522,7 +5461,7 @@ def process_getLocalityGroups(self, seqid, iprot, oprot): iprot.readMessageEnd() result = getLocalityGroups_result() try: - result.success = self._handler.getLocalityGroups(args.login, args.tableName) + result.success = self._handler.getLocalityGroups(args.sharedSecret, args.tableName) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5554,7 +5493,7 @@ def process_getIteratorSetting(self, seqid, iprot, oprot): iprot.readMessageEnd() result = getIteratorSetting_result() try: - result.success = self._handler.getIteratorSetting(args.login, args.tableName, args.iteratorName, args.scope) + result.success = self._handler.getIteratorSetting(args.sharedSecret, args.tableName, args.iteratorName, args.scope) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5586,7 +5525,7 @@ def process_getMaxRow(self, seqid, iprot, oprot): iprot.readMessageEnd() result = getMaxRow_result() try: - result.success = self._handler.getMaxRow(args.login, args.tableName, args.auths, args.startRow, args.startInclusive, args.endRow, args.endInclusive) + result.success = self._handler.getMaxRow(args.sharedSecret, args.tableName, args.auths, args.startRow, args.startInclusive, args.endRow, args.endInclusive) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5618,7 +5557,7 @@ def process_getTableProperties(self, seqid, iprot, oprot): iprot.readMessageEnd() result = getTableProperties_result() try: - result.success = self._handler.getTableProperties(args.login, args.tableName) + result.success = self._handler.getTableProperties(args.sharedSecret, args.tableName) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5650,7 +5589,7 @@ def process_importDirectory(self, seqid, iprot, oprot): iprot.readMessageEnd() result = importDirectory_result() try: - self._handler.importDirectory(args.login, args.tableName, args.importDir, args.failureDir, args.setTime) + self._handler.importDirectory(args.sharedSecret, args.tableName, args.importDir, args.failureDir, args.setTime) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5682,7 +5621,7 @@ def process_importTable(self, seqid, iprot, oprot): iprot.readMessageEnd() result = importTable_result() try: - self._handler.importTable(args.login, args.tableName, args.importDir) + self._handler.importTable(args.sharedSecret, args.tableName, args.importDir) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5714,7 +5653,7 @@ def process_listSplits(self, seqid, iprot, oprot): iprot.readMessageEnd() result = listSplits_result() try: - result.success = self._handler.listSplits(args.login, args.tableName, args.maxSplits) + result.success = self._handler.listSplits(args.sharedSecret, args.tableName, args.maxSplits) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5746,7 +5685,7 @@ def process_listTables(self, seqid, iprot, oprot): iprot.readMessageEnd() result = listTables_result() try: - result.success = self._handler.listTables(args.login) + result.success = self._handler.listTables(args.sharedSecret) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5769,7 +5708,7 @@ def process_listIterators(self, seqid, iprot, oprot): iprot.readMessageEnd() result = listIterators_result() try: - result.success = self._handler.listIterators(args.login, args.tableName) + result.success = self._handler.listIterators(args.sharedSecret, args.tableName) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5801,7 +5740,7 @@ def process_listConstraints(self, seqid, iprot, oprot): iprot.readMessageEnd() result = listConstraints_result() try: - result.success = self._handler.listConstraints(args.login, args.tableName) + result.success = self._handler.listConstraints(args.sharedSecret, args.tableName) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5833,7 +5772,7 @@ def process_mergeTablets(self, seqid, iprot, oprot): iprot.readMessageEnd() result = mergeTablets_result() try: - self._handler.mergeTablets(args.login, args.tableName, args.startRow, args.endRow) + self._handler.mergeTablets(args.sharedSecret, args.tableName, args.startRow, args.endRow) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5865,7 +5804,7 @@ def process_offlineTable(self, seqid, iprot, oprot): iprot.readMessageEnd() result = offlineTable_result() try: - self._handler.offlineTable(args.login, args.tableName, args.wait) + self._handler.offlineTable(args.sharedSecret, args.tableName, args.wait) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5897,7 +5836,7 @@ def process_onlineTable(self, seqid, iprot, oprot): iprot.readMessageEnd() result = onlineTable_result() try: - self._handler.onlineTable(args.login, args.tableName, args.wait) + self._handler.onlineTable(args.sharedSecret, args.tableName, args.wait) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5929,7 +5868,7 @@ def process_removeConstraint(self, seqid, iprot, oprot): iprot.readMessageEnd() result = removeConstraint_result() try: - self._handler.removeConstraint(args.login, args.tableName, args.constraint) + self._handler.removeConstraint(args.sharedSecret, args.tableName, args.constraint) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5961,7 +5900,7 @@ def process_removeIterator(self, seqid, iprot, oprot): iprot.readMessageEnd() result = removeIterator_result() try: - self._handler.removeIterator(args.login, args.tableName, args.iterName, args.scopes) + self._handler.removeIterator(args.sharedSecret, args.tableName, args.iterName, args.scopes) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -5993,7 +5932,7 @@ def process_removeTableProperty(self, seqid, iprot, oprot): iprot.readMessageEnd() result = removeTableProperty_result() try: - self._handler.removeTableProperty(args.login, args.tableName, args.property) + self._handler.removeTableProperty(args.sharedSecret, args.tableName, args.property) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6025,7 +5964,7 @@ def process_renameTable(self, seqid, iprot, oprot): iprot.readMessageEnd() result = renameTable_result() try: - self._handler.renameTable(args.login, args.oldTableName, args.newTableName) + self._handler.renameTable(args.sharedSecret, args.oldTableName, args.newTableName) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6060,7 +5999,7 @@ def process_setLocalityGroups(self, seqid, iprot, oprot): iprot.readMessageEnd() result = setLocalityGroups_result() try: - self._handler.setLocalityGroups(args.login, args.tableName, args.groups) + self._handler.setLocalityGroups(args.sharedSecret, args.tableName, args.groups) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6092,7 +6031,7 @@ def process_setTableProperty(self, seqid, iprot, oprot): iprot.readMessageEnd() result = setTableProperty_result() try: - self._handler.setTableProperty(args.login, args.tableName, args.property, args.value) + self._handler.setTableProperty(args.sharedSecret, args.tableName, args.property, args.value) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6124,7 +6063,7 @@ def process_splitRangeByTablets(self, seqid, iprot, oprot): iprot.readMessageEnd() result = splitRangeByTablets_result() try: - result.success = self._handler.splitRangeByTablets(args.login, args.tableName, args.range, args.maxSplits) + result.success = self._handler.splitRangeByTablets(args.sharedSecret, args.tableName, args.range, args.maxSplits) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6156,7 +6095,7 @@ def process_tableExists(self, seqid, iprot, oprot): iprot.readMessageEnd() result = tableExists_result() try: - result.success = self._handler.tableExists(args.login, args.tableName) + result.success = self._handler.tableExists(args.sharedSecret, args.tableName) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6179,7 +6118,7 @@ def process_tableIdMap(self, seqid, iprot, oprot): iprot.readMessageEnd() result = tableIdMap_result() try: - result.success = self._handler.tableIdMap(args.login) + result.success = self._handler.tableIdMap(args.sharedSecret) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6202,7 +6141,7 @@ def process_testTableClassLoad(self, seqid, iprot, oprot): iprot.readMessageEnd() result = testTableClassLoad_result() try: - result.success = self._handler.testTableClassLoad(args.login, args.tableName, args.className, args.asTypeName) + result.success = self._handler.testTableClassLoad(args.sharedSecret, args.tableName, args.className, args.asTypeName) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6234,7 +6173,7 @@ def process_pingTabletServer(self, seqid, iprot, oprot): iprot.readMessageEnd() result = pingTabletServer_result() try: - self._handler.pingTabletServer(args.login, args.tserver) + self._handler.pingTabletServer(args.sharedSecret, args.tserver) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6263,7 +6202,7 @@ def process_getActiveScans(self, seqid, iprot, oprot): iprot.readMessageEnd() result = getActiveScans_result() try: - result.success = self._handler.getActiveScans(args.login, args.tserver) + result.success = self._handler.getActiveScans(args.sharedSecret, args.tserver) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6292,7 +6231,7 @@ def process_getActiveCompactions(self, seqid, iprot, oprot): iprot.readMessageEnd() result = getActiveCompactions_result() try: - result.success = self._handler.getActiveCompactions(args.login, args.tserver) + result.success = self._handler.getActiveCompactions(args.sharedSecret, args.tserver) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6321,7 +6260,7 @@ def process_getSiteConfiguration(self, seqid, iprot, oprot): iprot.readMessageEnd() result = getSiteConfiguration_result() try: - result.success = self._handler.getSiteConfiguration(args.login) + result.success = self._handler.getSiteConfiguration(args.sharedSecret) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6350,7 +6289,7 @@ def process_getSystemConfiguration(self, seqid, iprot, oprot): iprot.readMessageEnd() result = getSystemConfiguration_result() try: - result.success = self._handler.getSystemConfiguration(args.login) + result.success = self._handler.getSystemConfiguration(args.sharedSecret) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6379,7 +6318,7 @@ def process_getTabletServers(self, seqid, iprot, oprot): iprot.readMessageEnd() result = getTabletServers_result() try: - result.success = self._handler.getTabletServers(args.login) + result.success = self._handler.getTabletServers(args.sharedSecret) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6402,7 +6341,7 @@ def process_removeProperty(self, seqid, iprot, oprot): iprot.readMessageEnd() result = removeProperty_result() try: - self._handler.removeProperty(args.login, args.property) + self._handler.removeProperty(args.sharedSecret, args.property) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6431,7 +6370,7 @@ def process_setProperty(self, seqid, iprot, oprot): iprot.readMessageEnd() result = setProperty_result() try: - self._handler.setProperty(args.login, args.property, args.value) + self._handler.setProperty(args.sharedSecret, args.property, args.value) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6460,7 +6399,7 @@ def process_testClassLoad(self, seqid, iprot, oprot): iprot.readMessageEnd() result = testClassLoad_result() try: - result.success = self._handler.testClassLoad(args.login, args.className, args.asTypeName) + result.success = self._handler.testClassLoad(args.sharedSecret, args.className, args.asTypeName) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6489,7 +6428,7 @@ def process_authenticateUser(self, seqid, iprot, oprot): iprot.readMessageEnd() result = authenticateUser_result() try: - result.success = self._handler.authenticateUser(args.login, args.user, args.properties) + result.success = self._handler.authenticateUser(args.sharedSecret, args.user, args.properties) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6518,7 +6457,7 @@ def process_changeUserAuthorizations(self, seqid, iprot, oprot): iprot.readMessageEnd() result = changeUserAuthorizations_result() try: - self._handler.changeUserAuthorizations(args.login, args.user, args.authorizations) + self._handler.changeUserAuthorizations(args.sharedSecret, args.user, args.authorizations) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6547,7 +6486,7 @@ def process_changeLocalUserPassword(self, seqid, iprot, oprot): iprot.readMessageEnd() result = changeLocalUserPassword_result() try: - self._handler.changeLocalUserPassword(args.login, args.user, args.password) + self._handler.changeLocalUserPassword(args.sharedSecret, args.user, args.password) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6576,7 +6515,7 @@ def process_createLocalUser(self, seqid, iprot, oprot): iprot.readMessageEnd() result = createLocalUser_result() try: - self._handler.createLocalUser(args.login, args.user, args.password) + self._handler.createLocalUser(args.sharedSecret, args.user, args.password) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6605,7 +6544,7 @@ def process_dropLocalUser(self, seqid, iprot, oprot): iprot.readMessageEnd() result = dropLocalUser_result() try: - self._handler.dropLocalUser(args.login, args.user) + self._handler.dropLocalUser(args.sharedSecret, args.user) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6634,7 +6573,7 @@ def process_getUserAuthorizations(self, seqid, iprot, oprot): iprot.readMessageEnd() result = getUserAuthorizations_result() try: - result.success = self._handler.getUserAuthorizations(args.login, args.user) + result.success = self._handler.getUserAuthorizations(args.sharedSecret, args.user) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6663,7 +6602,7 @@ def process_grantSystemPermission(self, seqid, iprot, oprot): iprot.readMessageEnd() result = grantSystemPermission_result() try: - self._handler.grantSystemPermission(args.login, args.user, args.perm) + self._handler.grantSystemPermission(args.sharedSecret, args.user, args.perm) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6692,7 +6631,7 @@ def process_grantTablePermission(self, seqid, iprot, oprot): iprot.readMessageEnd() result = grantTablePermission_result() try: - self._handler.grantTablePermission(args.login, args.user, args.table, args.perm) + self._handler.grantTablePermission(args.sharedSecret, args.user, args.table, args.perm) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6724,7 +6663,7 @@ def process_hasSystemPermission(self, seqid, iprot, oprot): iprot.readMessageEnd() result = hasSystemPermission_result() try: - result.success = self._handler.hasSystemPermission(args.login, args.user, args.perm) + result.success = self._handler.hasSystemPermission(args.sharedSecret, args.user, args.perm) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6753,7 +6692,7 @@ def process_hasTablePermission(self, seqid, iprot, oprot): iprot.readMessageEnd() result = hasTablePermission_result() try: - result.success = self._handler.hasTablePermission(args.login, args.user, args.table, args.perm) + result.success = self._handler.hasTablePermission(args.sharedSecret, args.user, args.table, args.perm) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6785,7 +6724,7 @@ def process_listLocalUsers(self, seqid, iprot, oprot): iprot.readMessageEnd() result = listLocalUsers_result() try: - result.success = self._handler.listLocalUsers(args.login) + result.success = self._handler.listLocalUsers(args.sharedSecret) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6817,7 +6756,7 @@ def process_revokeSystemPermission(self, seqid, iprot, oprot): iprot.readMessageEnd() result = revokeSystemPermission_result() try: - self._handler.revokeSystemPermission(args.login, args.user, args.perm) + self._handler.revokeSystemPermission(args.sharedSecret, args.user, args.perm) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6846,7 +6785,7 @@ def process_revokeTablePermission(self, seqid, iprot, oprot): iprot.readMessageEnd() result = revokeTablePermission_result() try: - self._handler.revokeTablePermission(args.login, args.user, args.table, args.perm) + self._handler.revokeTablePermission(args.sharedSecret, args.user, args.table, args.perm) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6878,7 +6817,7 @@ def process_grantNamespacePermission(self, seqid, iprot, oprot): iprot.readMessageEnd() result = grantNamespacePermission_result() try: - self._handler.grantNamespacePermission(args.login, args.user, args.namespaceName, args.perm) + self._handler.grantNamespacePermission(args.sharedSecret, args.user, args.namespaceName, args.perm) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6907,7 +6846,7 @@ def process_hasNamespacePermission(self, seqid, iprot, oprot): iprot.readMessageEnd() result = hasNamespacePermission_result() try: - result.success = self._handler.hasNamespacePermission(args.login, args.user, args.namespaceName, args.perm) + result.success = self._handler.hasNamespacePermission(args.sharedSecret, args.user, args.namespaceName, args.perm) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6936,7 +6875,7 @@ def process_revokeNamespacePermission(self, seqid, iprot, oprot): iprot.readMessageEnd() result = revokeNamespacePermission_result() try: - self._handler.revokeNamespacePermission(args.login, args.user, args.namespaceName, args.perm) + self._handler.revokeNamespacePermission(args.sharedSecret, args.user, args.namespaceName, args.perm) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6965,7 +6904,7 @@ def process_createBatchScanner(self, seqid, iprot, oprot): iprot.readMessageEnd() result = createBatchScanner_result() try: - result.success = self._handler.createBatchScanner(args.login, args.tableName, args.options) + result.success = self._handler.createBatchScanner(args.sharedSecret, args.tableName, args.options) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -6997,7 +6936,7 @@ def process_createScanner(self, seqid, iprot, oprot): iprot.readMessageEnd() result = createScanner_result() try: - result.success = self._handler.createScanner(args.login, args.tableName, args.options) + result.success = self._handler.createScanner(args.sharedSecret, args.tableName, args.options) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -7145,7 +7084,7 @@ def process_updateAndFlush(self, seqid, iprot, oprot): iprot.readMessageEnd() result = updateAndFlush_result() try: - self._handler.updateAndFlush(args.login, args.tableName, args.cells) + self._handler.updateAndFlush(args.sharedSecret, args.tableName, args.cells) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -7180,7 +7119,7 @@ def process_createWriter(self, seqid, iprot, oprot): iprot.readMessageEnd() result = createWriter_result() try: - result.success = self._handler.createWriter(args.login, args.tableName, args.opts) + result.success = self._handler.createWriter(args.sharedSecret, args.tableName, args.opts) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -7281,7 +7220,7 @@ def process_updateRowConditionally(self, seqid, iprot, oprot): iprot.readMessageEnd() result = updateRowConditionally_result() try: - result.success = self._handler.updateRowConditionally(args.login, args.tableName, args.row, args.updates) + result.success = self._handler.updateRowConditionally(args.sharedSecret, args.tableName, args.row, args.updates) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -7313,7 +7252,7 @@ def process_createConditionalWriter(self, seqid, iprot, oprot): iprot.readMessageEnd() result = createConditionalWriter_result() try: - result.success = self._handler.createConditionalWriter(args.login, args.tableName, args.options) + result.success = self._handler.createConditionalWriter(args.sharedSecret, args.tableName, args.options) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -7492,7 +7431,7 @@ def process_listNamespaces(self, seqid, iprot, oprot): iprot.readMessageEnd() result = listNamespaces_result() try: - result.success = self._handler.listNamespaces(args.login) + result.success = self._handler.listNamespaces(args.sharedSecret) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -7521,7 +7460,7 @@ def process_namespaceExists(self, seqid, iprot, oprot): iprot.readMessageEnd() result = namespaceExists_result() try: - result.success = self._handler.namespaceExists(args.login, args.namespaceName) + result.success = self._handler.namespaceExists(args.sharedSecret, args.namespaceName) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -7550,7 +7489,7 @@ def process_createNamespace(self, seqid, iprot, oprot): iprot.readMessageEnd() result = createNamespace_result() try: - self._handler.createNamespace(args.login, args.namespaceName) + self._handler.createNamespace(args.sharedSecret, args.namespaceName) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -7582,7 +7521,7 @@ def process_deleteNamespace(self, seqid, iprot, oprot): iprot.readMessageEnd() result = deleteNamespace_result() try: - self._handler.deleteNamespace(args.login, args.namespaceName) + self._handler.deleteNamespace(args.sharedSecret, args.namespaceName) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -7617,7 +7556,7 @@ def process_renameNamespace(self, seqid, iprot, oprot): iprot.readMessageEnd() result = renameNamespace_result() try: - self._handler.renameNamespace(args.login, args.oldNamespaceName, args.newNamespaceName) + self._handler.renameNamespace(args.sharedSecret, args.oldNamespaceName, args.newNamespaceName) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -7652,7 +7591,7 @@ def process_setNamespaceProperty(self, seqid, iprot, oprot): iprot.readMessageEnd() result = setNamespaceProperty_result() try: - self._handler.setNamespaceProperty(args.login, args.namespaceName, args.property, args.value) + self._handler.setNamespaceProperty(args.sharedSecret, args.namespaceName, args.property, args.value) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -7684,7 +7623,7 @@ def process_removeNamespaceProperty(self, seqid, iprot, oprot): iprot.readMessageEnd() result = removeNamespaceProperty_result() try: - self._handler.removeNamespaceProperty(args.login, args.namespaceName, args.property) + self._handler.removeNamespaceProperty(args.sharedSecret, args.namespaceName, args.property) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -7716,7 +7655,7 @@ def process_getNamespaceProperties(self, seqid, iprot, oprot): iprot.readMessageEnd() result = getNamespaceProperties_result() try: - result.success = self._handler.getNamespaceProperties(args.login, args.namespaceName) + result.success = self._handler.getNamespaceProperties(args.sharedSecret, args.namespaceName) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -7748,7 +7687,7 @@ def process_namespaceIdMap(self, seqid, iprot, oprot): iprot.readMessageEnd() result = namespaceIdMap_result() try: - result.success = self._handler.namespaceIdMap(args.login) + result.success = self._handler.namespaceIdMap(args.sharedSecret) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -7777,7 +7716,7 @@ def process_attachNamespaceIterator(self, seqid, iprot, oprot): iprot.readMessageEnd() result = attachNamespaceIterator_result() try: - self._handler.attachNamespaceIterator(args.login, args.namespaceName, args.setting, args.scopes) + self._handler.attachNamespaceIterator(args.sharedSecret, args.namespaceName, args.setting, args.scopes) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -7809,7 +7748,7 @@ def process_removeNamespaceIterator(self, seqid, iprot, oprot): iprot.readMessageEnd() result = removeNamespaceIterator_result() try: - self._handler.removeNamespaceIterator(args.login, args.namespaceName, args.name, args.scopes) + self._handler.removeNamespaceIterator(args.sharedSecret, args.namespaceName, args.name, args.scopes) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -7841,7 +7780,7 @@ def process_getNamespaceIteratorSetting(self, seqid, iprot, oprot): iprot.readMessageEnd() result = getNamespaceIteratorSetting_result() try: - result.success = self._handler.getNamespaceIteratorSetting(args.login, args.namespaceName, args.name, args.scope) + result.success = self._handler.getNamespaceIteratorSetting(args.sharedSecret, args.namespaceName, args.name, args.scope) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -7873,7 +7812,7 @@ def process_listNamespaceIterators(self, seqid, iprot, oprot): iprot.readMessageEnd() result = listNamespaceIterators_result() try: - result.success = self._handler.listNamespaceIterators(args.login, args.namespaceName) + result.success = self._handler.listNamespaceIterators(args.sharedSecret, args.namespaceName) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -7905,7 +7844,7 @@ def process_checkNamespaceIteratorConflicts(self, seqid, iprot, oprot): iprot.readMessageEnd() result = checkNamespaceIteratorConflicts_result() try: - self._handler.checkNamespaceIteratorConflicts(args.login, args.namespaceName, args.setting, args.scopes) + self._handler.checkNamespaceIteratorConflicts(args.sharedSecret, args.namespaceName, args.setting, args.scopes) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -7937,7 +7876,7 @@ def process_addNamespaceConstraint(self, seqid, iprot, oprot): iprot.readMessageEnd() result = addNamespaceConstraint_result() try: - result.success = self._handler.addNamespaceConstraint(args.login, args.namespaceName, args.constraintClassName) + result.success = self._handler.addNamespaceConstraint(args.sharedSecret, args.namespaceName, args.constraintClassName) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -7969,7 +7908,7 @@ def process_removeNamespaceConstraint(self, seqid, iprot, oprot): iprot.readMessageEnd() result = removeNamespaceConstraint_result() try: - self._handler.removeNamespaceConstraint(args.login, args.namespaceName, args.id) + self._handler.removeNamespaceConstraint(args.sharedSecret, args.namespaceName, args.id) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -8001,7 +7940,7 @@ def process_listNamespaceConstraints(self, seqid, iprot, oprot): iprot.readMessageEnd() result = listNamespaceConstraints_result() try: - result.success = self._handler.listNamespaceConstraints(args.login, args.namespaceName) + result.success = self._handler.listNamespaceConstraints(args.sharedSecret, args.namespaceName) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -8033,7 +7972,7 @@ def process_testNamespaceClassLoad(self, seqid, iprot, oprot): iprot.readMessageEnd() result = testNamespaceClassLoad_result() try: - result.success = self._handler.testNamespaceClassLoad(args.login, args.namespaceName, args.className, args.asTypeName) + result.success = self._handler.testNamespaceClassLoad(args.sharedSecret, args.namespaceName, args.className, args.asTypeName) msg_type = TMessageType.REPLY except TTransport.TTransportException: raise @@ -8062,176 +8001,18 @@ def process_testNamespaceClassLoad(self, seqid, iprot, oprot): # HELPER FUNCTIONS AND STRUCTURES -class login_args(object): - """ - Attributes: - - principal - - loginProperties - - """ - - - def __init__(self, principal=None, loginProperties=None,): - self.principal = principal - self.loginProperties = loginProperties - - def read(self, iprot): - if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: - iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec]) - return - iprot.readStructBegin() - while True: - (fname, ftype, fid) = iprot.readFieldBegin() - if ftype == TType.STOP: - break - if fid == 1: - if ftype == TType.STRING: - self.principal = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - else: - iprot.skip(ftype) - elif fid == 2: - if ftype == TType.MAP: - self.loginProperties = {} - (_ktype145, _vtype146, _size144) = iprot.readMapBegin() - for _i148 in range(_size144): - _key149 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - _val150 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - self.loginProperties[_key149] = _val150 - iprot.readMapEnd() - else: - iprot.skip(ftype) - else: - iprot.skip(ftype) - iprot.readFieldEnd() - iprot.readStructEnd() - - def write(self, oprot): - if oprot._fast_encode is not None and self.thrift_spec is not None: - oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) - return - oprot.writeStructBegin('login_args') - if self.principal is not None: - oprot.writeFieldBegin('principal', TType.STRING, 1) - oprot.writeString(self.principal.encode('utf-8') if sys.version_info[0] == 2 else self.principal) - oprot.writeFieldEnd() - if self.loginProperties is not None: - oprot.writeFieldBegin('loginProperties', TType.MAP, 2) - oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.loginProperties)) - for kiter151, viter152 in self.loginProperties.items(): - oprot.writeString(kiter151.encode('utf-8') if sys.version_info[0] == 2 else kiter151) - oprot.writeString(viter152.encode('utf-8') if sys.version_info[0] == 2 else viter152) - oprot.writeMapEnd() - oprot.writeFieldEnd() - oprot.writeFieldStop() - oprot.writeStructEnd() - - def validate(self): - return - - def __repr__(self): - L = ['%s=%r' % (key, value) - for key, value in self.__dict__.items()] - return '%s(%s)' % (self.__class__.__name__, ', '.join(L)) - - def __eq__(self, other): - return isinstance(other, self.__class__) and self.__dict__ == other.__dict__ - - def __ne__(self, other): - return not (self == other) -all_structs.append(login_args) -login_args.thrift_spec = ( - None, # 0 - (1, TType.STRING, 'principal', 'UTF8', None, ), # 1 - (2, TType.MAP, 'loginProperties', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ), # 2 -) - - -class login_result(object): - """ - Attributes: - - success - - ouch2 - - """ - - - def __init__(self, success=None, ouch2=None,): - self.success = success - self.ouch2 = ouch2 - - def read(self, iprot): - if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: - iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec]) - return - iprot.readStructBegin() - while True: - (fname, ftype, fid) = iprot.readFieldBegin() - if ftype == TType.STOP: - break - if fid == 0: - if ftype == TType.STRING: - self.success = iprot.readBinary() - else: - iprot.skip(ftype) - elif fid == 1: - if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) - else: - iprot.skip(ftype) - else: - iprot.skip(ftype) - iprot.readFieldEnd() - iprot.readStructEnd() - - def write(self, oprot): - if oprot._fast_encode is not None and self.thrift_spec is not None: - oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) - return - oprot.writeStructBegin('login_result') - if self.success is not None: - oprot.writeFieldBegin('success', TType.STRING, 0) - oprot.writeBinary(self.success) - oprot.writeFieldEnd() - if self.ouch2 is not None: - oprot.writeFieldBegin('ouch2', TType.STRUCT, 1) - self.ouch2.write(oprot) - oprot.writeFieldEnd() - oprot.writeFieldStop() - oprot.writeStructEnd() - - def validate(self): - return - - def __repr__(self): - L = ['%s=%r' % (key, value) - for key, value in self.__dict__.items()] - return '%s(%s)' % (self.__class__.__name__, ', '.join(L)) - - def __eq__(self, other): - return isinstance(other, self.__class__) and self.__dict__ == other.__dict__ - - def __ne__(self, other): - return not (self == other) -all_structs.append(login_result) -login_result.thrift_spec = ( - (0, TType.STRING, 'success', 'BINARY', None, ), # 0 - (1, TType.STRUCT, 'ouch2', [AccumuloSecurityException, None], None, ), # 1 -) - - class addConstraint_args(object): """ Attributes: - - login + - sharedSecret - tableName - constraintClassName """ - def __init__(self, login=None, tableName=None, constraintClassName=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, constraintClassName=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.constraintClassName = constraintClassName @@ -8246,17 +8027,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.constraintClassName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.constraintClassName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -8269,9 +8050,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('addConstraint_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -8300,7 +8081,7 @@ def __ne__(self, other): all_structs.append(addConstraint_args) addConstraint_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.STRING, 'constraintClassName', 'UTF8', None, ), # 3 ) @@ -8339,20 +8120,17 @@ def read(self, iprot): iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -8409,15 +8187,15 @@ def __ne__(self, other): class addSplits_args(object): """ Attributes: - - login + - sharedSecret - tableName - splits """ - def __init__(self, login=None, tableName=None, splits=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, splits=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.splits = splits @@ -8432,21 +8210,21 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.SET: self.splits = set() - (_etype156, _size153) = iprot.readSetBegin() - for _i157 in range(_size153): - _elem158 = iprot.readBinary() - self.splits.add(_elem158) + (_etype147, _size144) = iprot.readSetBegin() + for _i148 in range(_size144): + _elem149 = iprot.readBinary() + self.splits.add(_elem149) iprot.readSetEnd() else: iprot.skip(ftype) @@ -8460,9 +8238,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('addSplits_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -8471,8 +8249,8 @@ def write(self, oprot): if self.splits is not None: oprot.writeFieldBegin('splits', TType.SET, 3) oprot.writeSetBegin(TType.STRING, len(self.splits)) - for iter159 in self.splits: - oprot.writeBinary(iter159) + for iter150 in self.splits: + oprot.writeBinary(iter150) oprot.writeSetEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -8494,7 +8272,7 @@ def __ne__(self, other): all_structs.append(addSplits_args) addSplits_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.SET, 'splits', (TType.STRING, 'BINARY', False), None, ), # 3 ) @@ -8526,20 +8304,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -8592,7 +8367,7 @@ def __ne__(self, other): class attachIterator_args(object): """ Attributes: - - login + - sharedSecret - tableName - setting - scopes @@ -8600,8 +8375,8 @@ class attachIterator_args(object): """ - def __init__(self, login=None, tableName=None, setting=None, scopes=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, setting=None, scopes=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.setting = setting self.scopes = scopes @@ -8617,12 +8392,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: @@ -8634,10 +8409,10 @@ def read(self, iprot): elif fid == 4: if ftype == TType.SET: self.scopes = set() - (_etype163, _size160) = iprot.readSetBegin() - for _i164 in range(_size160): - _elem165 = iprot.readI32() - self.scopes.add(_elem165) + (_etype154, _size151) = iprot.readSetBegin() + for _i155 in range(_size151): + _elem156 = iprot.readI32() + self.scopes.add(_elem156) iprot.readSetEnd() else: iprot.skip(ftype) @@ -8651,9 +8426,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('attachIterator_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -8666,8 +8441,8 @@ def write(self, oprot): if self.scopes is not None: oprot.writeFieldBegin('scopes', TType.SET, 4) oprot.writeSetBegin(TType.I32, len(self.scopes)) - for iter166 in self.scopes: - oprot.writeI32(iter166) + for iter157 in self.scopes: + oprot.writeI32(iter157) oprot.writeSetEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -8689,7 +8464,7 @@ def __ne__(self, other): all_structs.append(attachIterator_args) attachIterator_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.STRUCT, 'setting', [IteratorSetting, None], None, ), # 3 (4, TType.SET, 'scopes', (TType.I32, None, False), None, ), # 4 @@ -8722,20 +8497,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloSecurityException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -8788,7 +8560,7 @@ def __ne__(self, other): class checkIteratorConflicts_args(object): """ Attributes: - - login + - sharedSecret - tableName - setting - scopes @@ -8796,8 +8568,8 @@ class checkIteratorConflicts_args(object): """ - def __init__(self, login=None, tableName=None, setting=None, scopes=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, setting=None, scopes=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.setting = setting self.scopes = scopes @@ -8813,12 +8585,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: @@ -8830,10 +8602,10 @@ def read(self, iprot): elif fid == 4: if ftype == TType.SET: self.scopes = set() - (_etype170, _size167) = iprot.readSetBegin() - for _i171 in range(_size167): - _elem172 = iprot.readI32() - self.scopes.add(_elem172) + (_etype161, _size158) = iprot.readSetBegin() + for _i162 in range(_size158): + _elem163 = iprot.readI32() + self.scopes.add(_elem163) iprot.readSetEnd() else: iprot.skip(ftype) @@ -8847,9 +8619,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('checkIteratorConflicts_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -8862,8 +8634,8 @@ def write(self, oprot): if self.scopes is not None: oprot.writeFieldBegin('scopes', TType.SET, 4) oprot.writeSetBegin(TType.I32, len(self.scopes)) - for iter173 in self.scopes: - oprot.writeI32(iter173) + for iter164 in self.scopes: + oprot.writeI32(iter164) oprot.writeSetEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -8885,7 +8657,7 @@ def __ne__(self, other): all_structs.append(checkIteratorConflicts_args) checkIteratorConflicts_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.STRUCT, 'setting', [IteratorSetting, None], None, ), # 3 (4, TType.SET, 'scopes', (TType.I32, None, False), None, ), # 4 @@ -8918,20 +8690,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloSecurityException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -8984,14 +8753,14 @@ def __ne__(self, other): class clearLocatorCache_args(object): """ Attributes: - - login + - sharedSecret - tableName """ - def __init__(self, login=None, tableName=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None,): + self.sharedSecret = sharedSecret self.tableName = tableName def read(self, iprot): @@ -9005,12 +8774,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -9023,9 +8792,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('clearLocatorCache_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -9050,7 +8819,7 @@ def __ne__(self, other): all_structs.append(clearLocatorCache_args) clearLocatorCache_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 ) @@ -9077,8 +8846,7 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = TableNotFoundException() - self.ouch1.read(iprot) + self.ouch1 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -9121,7 +8889,7 @@ def __ne__(self, other): class cloneTable_args(object): """ Attributes: - - login + - sharedSecret - tableName - newTableName - flush @@ -9131,8 +8899,8 @@ class cloneTable_args(object): """ - def __init__(self, login=None, tableName=None, newTableName=None, flush=None, propertiesToSet=None, propertiesToExclude=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, newTableName=None, flush=None, propertiesToSet=None, propertiesToExclude=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.newTableName = newTableName self.flush = flush @@ -9150,17 +8918,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.newTableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.newTableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 4: @@ -9171,21 +8939,21 @@ def read(self, iprot): elif fid == 5: if ftype == TType.MAP: self.propertiesToSet = {} - (_ktype175, _vtype176, _size174) = iprot.readMapBegin() - for _i178 in range(_size174): - _key179 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - _val180 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - self.propertiesToSet[_key179] = _val180 + (_ktype166, _vtype167, _size165) = iprot.readMapBegin() + for _i169 in range(_size165): + _key170 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + _val171 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + self.propertiesToSet[_key170] = _val171 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 6: if ftype == TType.SET: self.propertiesToExclude = set() - (_etype184, _size181) = iprot.readSetBegin() - for _i185 in range(_size181): - _elem186 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - self.propertiesToExclude.add(_elem186) + (_etype175, _size172) = iprot.readSetBegin() + for _i176 in range(_size172): + _elem177 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + self.propertiesToExclude.add(_elem177) iprot.readSetEnd() else: iprot.skip(ftype) @@ -9199,9 +8967,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('cloneTable_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -9218,16 +8986,16 @@ def write(self, oprot): if self.propertiesToSet is not None: oprot.writeFieldBegin('propertiesToSet', TType.MAP, 5) oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.propertiesToSet)) - for kiter187, viter188 in self.propertiesToSet.items(): - oprot.writeString(kiter187.encode('utf-8') if sys.version_info[0] == 2 else kiter187) - oprot.writeString(viter188.encode('utf-8') if sys.version_info[0] == 2 else viter188) + for kiter178, viter179 in self.propertiesToSet.items(): + oprot.writeString(kiter178.encode('utf-8') if sys.version_info[0] == 2 else kiter178) + oprot.writeString(viter179.encode('utf-8') if sys.version_info[0] == 2 else viter179) oprot.writeMapEnd() oprot.writeFieldEnd() if self.propertiesToExclude is not None: oprot.writeFieldBegin('propertiesToExclude', TType.SET, 6) oprot.writeSetBegin(TType.STRING, len(self.propertiesToExclude)) - for iter189 in self.propertiesToExclude: - oprot.writeString(iter189.encode('utf-8') if sys.version_info[0] == 2 else iter189) + for iter180 in self.propertiesToExclude: + oprot.writeString(iter180.encode('utf-8') if sys.version_info[0] == 2 else iter180) oprot.writeSetEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -9249,7 +9017,7 @@ def __ne__(self, other): all_structs.append(cloneTable_args) cloneTable_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.STRING, 'newTableName', 'UTF8', None, ), # 3 (4, TType.BOOL, 'flush', None, None, ), # 4 @@ -9286,26 +9054,22 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) elif fid == 4: if ftype == TType.STRUCT: - self.ouch4 = TableExistsException() - self.ouch4.read(iprot) + self.ouch4 = TableExistsException.read(iprot) else: iprot.skip(ftype) else: @@ -9363,27 +9127,29 @@ def __ne__(self, other): class compactTable_args(object): """ Attributes: - - login + - sharedSecret - tableName - startRow - endRow - iterators - flush - wait - - compactionStrategy + - selectorConfig + - configurerConfig """ - def __init__(self, login=None, tableName=None, startRow=None, endRow=None, iterators=None, flush=None, wait=None, compactionStrategy=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, startRow=None, endRow=None, iterators=None, flush=None, wait=None, selectorConfig=None, configurerConfig=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.startRow = startRow self.endRow = endRow self.iterators = iterators self.flush = flush self.wait = wait - self.compactionStrategy = compactionStrategy + self.selectorConfig = selectorConfig + self.configurerConfig = configurerConfig def read(self, iprot): if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: @@ -9396,12 +9162,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: @@ -9417,11 +9183,11 @@ def read(self, iprot): elif fid == 5: if ftype == TType.LIST: self.iterators = [] - (_etype193, _size190) = iprot.readListBegin() - for _i194 in range(_size190): - _elem195 = IteratorSetting() - _elem195.read(iprot) - self.iterators.append(_elem195) + (_etype184, _size181) = iprot.readListBegin() + for _i185 in range(_size181): + _elem186 = IteratorSetting() + _elem186.read(iprot) + self.iterators.append(_elem186) iprot.readListEnd() else: iprot.skip(ftype) @@ -9437,8 +9203,14 @@ def read(self, iprot): iprot.skip(ftype) elif fid == 8: if ftype == TType.STRUCT: - self.compactionStrategy = CompactionStrategyConfig() - self.compactionStrategy.read(iprot) + self.selectorConfig = PluginConfig() + self.selectorConfig.read(iprot) + else: + iprot.skip(ftype) + elif fid == 9: + if ftype == TType.STRUCT: + self.configurerConfig = PluginConfig() + self.configurerConfig.read(iprot) else: iprot.skip(ftype) else: @@ -9451,9 +9223,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('compactTable_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -9470,8 +9242,8 @@ def write(self, oprot): if self.iterators is not None: oprot.writeFieldBegin('iterators', TType.LIST, 5) oprot.writeListBegin(TType.STRUCT, len(self.iterators)) - for iter196 in self.iterators: - iter196.write(oprot) + for iter187 in self.iterators: + iter187.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.flush is not None: @@ -9482,9 +9254,13 @@ def write(self, oprot): oprot.writeFieldBegin('wait', TType.BOOL, 7) oprot.writeBool(self.wait) oprot.writeFieldEnd() - if self.compactionStrategy is not None: - oprot.writeFieldBegin('compactionStrategy', TType.STRUCT, 8) - self.compactionStrategy.write(oprot) + if self.selectorConfig is not None: + oprot.writeFieldBegin('selectorConfig', TType.STRUCT, 8) + self.selectorConfig.write(oprot) + oprot.writeFieldEnd() + if self.configurerConfig is not None: + oprot.writeFieldBegin('configurerConfig', TType.STRUCT, 9) + self.configurerConfig.write(oprot) oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -9505,14 +9281,15 @@ def __ne__(self, other): all_structs.append(compactTable_args) compactTable_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.STRING, 'startRow', 'BINARY', None, ), # 3 (4, TType.STRING, 'endRow', 'BINARY', None, ), # 4 (5, TType.LIST, 'iterators', (TType.STRUCT, [IteratorSetting, None], False), None, ), # 5 (6, TType.BOOL, 'flush', None, None, ), # 6 (7, TType.BOOL, 'wait', None, None, ), # 7 - (8, TType.STRUCT, 'compactionStrategy', [CompactionStrategyConfig, None], None, ), # 8 + (8, TType.STRUCT, 'selectorConfig', [PluginConfig, None], None, ), # 8 + (9, TType.STRUCT, 'configurerConfig', [PluginConfig, None], None, ), # 9 ) @@ -9542,20 +9319,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloSecurityException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = TableNotFoundException() - self.ouch2.read(iprot) + self.ouch2 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = AccumuloException() - self.ouch3.read(iprot) + self.ouch3 = AccumuloException.read(iprot) else: iprot.skip(ftype) else: @@ -9608,14 +9382,14 @@ def __ne__(self, other): class cancelCompaction_args(object): """ Attributes: - - login + - sharedSecret - tableName """ - def __init__(self, login=None, tableName=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None,): + self.sharedSecret = sharedSecret self.tableName = tableName def read(self, iprot): @@ -9629,12 +9403,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -9647,9 +9421,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('cancelCompaction_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -9674,7 +9448,7 @@ def __ne__(self, other): all_structs.append(cancelCompaction_args) cancelCompaction_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 ) @@ -9705,20 +9479,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloSecurityException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = TableNotFoundException() - self.ouch2.read(iprot) + self.ouch2 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = AccumuloException() - self.ouch3.read(iprot) + self.ouch3 = AccumuloException.read(iprot) else: iprot.skip(ftype) else: @@ -9771,7 +9542,7 @@ def __ne__(self, other): class createTable_args(object): """ Attributes: - - login + - sharedSecret - tableName - versioningIter - type @@ -9779,8 +9550,8 @@ class createTable_args(object): """ - def __init__(self, login=None, tableName=None, versioningIter=None, type=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, versioningIter=None, type=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.versioningIter = versioningIter self.type = type @@ -9796,12 +9567,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: @@ -9824,9 +9595,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('createTable_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -9859,7 +9630,7 @@ def __ne__(self, other): all_structs.append(createTable_args) createTable_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.BOOL, 'versioningIter', None, None, ), # 3 (4, TType.I32, 'type', None, None, ), # 4 @@ -9892,20 +9663,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableExistsException() - self.ouch3.read(iprot) + self.ouch3 = TableExistsException.read(iprot) else: iprot.skip(ftype) else: @@ -9958,14 +9726,14 @@ def __ne__(self, other): class deleteTable_args(object): """ Attributes: - - login + - sharedSecret - tableName """ - def __init__(self, login=None, tableName=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None,): + self.sharedSecret = sharedSecret self.tableName = tableName def read(self, iprot): @@ -9979,12 +9747,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -9997,9 +9765,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('deleteTable_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -10024,7 +9792,7 @@ def __ne__(self, other): all_structs.append(deleteTable_args) deleteTable_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 ) @@ -10055,20 +9823,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -10121,7 +9886,7 @@ def __ne__(self, other): class deleteRows_args(object): """ Attributes: - - login + - sharedSecret - tableName - startRow - endRow @@ -10129,8 +9894,8 @@ class deleteRows_args(object): """ - def __init__(self, login=None, tableName=None, startRow=None, endRow=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, startRow=None, endRow=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.startRow = startRow self.endRow = endRow @@ -10146,12 +9911,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: @@ -10174,9 +9939,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('deleteRows_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -10209,7 +9974,7 @@ def __ne__(self, other): all_structs.append(deleteRows_args) deleteRows_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.STRING, 'startRow', 'BINARY', None, ), # 3 (4, TType.STRING, 'endRow', 'BINARY', None, ), # 4 @@ -10242,20 +10007,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -10308,15 +10070,15 @@ def __ne__(self, other): class exportTable_args(object): """ Attributes: - - login + - sharedSecret - tableName - exportDir """ - def __init__(self, login=None, tableName=None, exportDir=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, exportDir=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.exportDir = exportDir @@ -10331,17 +10093,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.exportDir = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.exportDir = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -10354,9 +10116,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('exportTable_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -10385,7 +10147,7 @@ def __ne__(self, other): all_structs.append(exportTable_args) exportTable_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.STRING, 'exportDir', 'UTF8', None, ), # 3 ) @@ -10417,20 +10179,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -10483,7 +10242,7 @@ def __ne__(self, other): class flushTable_args(object): """ Attributes: - - login + - sharedSecret - tableName - startRow - endRow @@ -10492,8 +10251,8 @@ class flushTable_args(object): """ - def __init__(self, login=None, tableName=None, startRow=None, endRow=None, wait=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, startRow=None, endRow=None, wait=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.startRow = startRow self.endRow = endRow @@ -10510,12 +10269,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: @@ -10543,9 +10302,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('flushTable_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -10582,7 +10341,7 @@ def __ne__(self, other): all_structs.append(flushTable_args) flushTable_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.STRING, 'startRow', 'BINARY', None, ), # 3 (4, TType.STRING, 'endRow', 'BINARY', None, ), # 4 @@ -10616,20 +10375,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -10682,14 +10438,14 @@ def __ne__(self, other): class getDiskUsage_args(object): """ Attributes: - - login + - sharedSecret - tables """ - def __init__(self, login=None, tables=None,): - self.login = login + def __init__(self, sharedSecret=None, tables=None,): + self.sharedSecret = sharedSecret self.tables = tables def read(self, iprot): @@ -10703,16 +10459,16 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.SET: self.tables = set() - (_etype200, _size197) = iprot.readSetBegin() - for _i201 in range(_size197): - _elem202 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - self.tables.add(_elem202) + (_etype191, _size188) = iprot.readSetBegin() + for _i192 in range(_size188): + _elem193 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + self.tables.add(_elem193) iprot.readSetEnd() else: iprot.skip(ftype) @@ -10726,15 +10482,15 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('getDiskUsage_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tables is not None: oprot.writeFieldBegin('tables', TType.SET, 2) oprot.writeSetBegin(TType.STRING, len(self.tables)) - for iter203 in self.tables: - oprot.writeString(iter203.encode('utf-8') if sys.version_info[0] == 2 else iter203) + for iter194 in self.tables: + oprot.writeString(iter194.encode('utf-8') if sys.version_info[0] == 2 else iter194) oprot.writeSetEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -10756,7 +10512,7 @@ def __ne__(self, other): all_structs.append(getDiskUsage_args) getDiskUsage_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.SET, 'tables', (TType.STRING, 'UTF8', False), None, ), # 2 ) @@ -10790,30 +10546,27 @@ def read(self, iprot): if fid == 0: if ftype == TType.LIST: self.success = [] - (_etype207, _size204) = iprot.readListBegin() - for _i208 in range(_size204): - _elem209 = DiskUsage() - _elem209.read(iprot) - self.success.append(_elem209) + (_etype198, _size195) = iprot.readListBegin() + for _i199 in range(_size195): + _elem200 = DiskUsage() + _elem200.read(iprot) + self.success.append(_elem200) iprot.readListEnd() else: iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -10829,8 +10582,8 @@ def write(self, oprot): if self.success is not None: oprot.writeFieldBegin('success', TType.LIST, 0) oprot.writeListBegin(TType.STRUCT, len(self.success)) - for iter210 in self.success: - iter210.write(oprot) + for iter201 in self.success: + iter201.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.ouch1 is not None: @@ -10873,14 +10626,14 @@ def __ne__(self, other): class getLocalityGroups_args(object): """ Attributes: - - login + - sharedSecret - tableName """ - def __init__(self, login=None, tableName=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None,): + self.sharedSecret = sharedSecret self.tableName = tableName def read(self, iprot): @@ -10894,12 +10647,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -10912,9 +10665,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('getLocalityGroups_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -10939,7 +10692,7 @@ def __ne__(self, other): all_structs.append(getLocalityGroups_args) getLocalityGroups_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 ) @@ -10973,35 +10726,32 @@ def read(self, iprot): if fid == 0: if ftype == TType.MAP: self.success = {} - (_ktype212, _vtype213, _size211) = iprot.readMapBegin() - for _i215 in range(_size211): - _key216 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - _val217 = set() - (_etype221, _size218) = iprot.readSetBegin() - for _i222 in range(_size218): - _elem223 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - _val217.add(_elem223) + (_ktype203, _vtype204, _size202) = iprot.readMapBegin() + for _i206 in range(_size202): + _key207 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + _val208 = set() + (_etype212, _size209) = iprot.readSetBegin() + for _i213 in range(_size209): + _elem214 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + _val208.add(_elem214) iprot.readSetEnd() - self.success[_key216] = _val217 + self.success[_key207] = _val208 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -11017,11 +10767,11 @@ def write(self, oprot): if self.success is not None: oprot.writeFieldBegin('success', TType.MAP, 0) oprot.writeMapBegin(TType.STRING, TType.SET, len(self.success)) - for kiter224, viter225 in self.success.items(): - oprot.writeString(kiter224.encode('utf-8') if sys.version_info[0] == 2 else kiter224) - oprot.writeSetBegin(TType.STRING, len(viter225)) - for iter226 in viter225: - oprot.writeString(iter226.encode('utf-8') if sys.version_info[0] == 2 else iter226) + for kiter215, viter216 in self.success.items(): + oprot.writeString(kiter215.encode('utf-8') if sys.version_info[0] == 2 else kiter215) + oprot.writeSetBegin(TType.STRING, len(viter216)) + for iter217 in viter216: + oprot.writeString(iter217.encode('utf-8') if sys.version_info[0] == 2 else iter217) oprot.writeSetEnd() oprot.writeMapEnd() oprot.writeFieldEnd() @@ -11065,7 +10815,7 @@ def __ne__(self, other): class getIteratorSetting_args(object): """ Attributes: - - login + - sharedSecret - tableName - iteratorName - scope @@ -11073,8 +10823,8 @@ class getIteratorSetting_args(object): """ - def __init__(self, login=None, tableName=None, iteratorName=None, scope=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, iteratorName=None, scope=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.iteratorName = iteratorName self.scope = scope @@ -11090,17 +10840,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.iteratorName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.iteratorName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 4: @@ -11118,9 +10868,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('getIteratorSetting_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -11153,7 +10903,7 @@ def __ne__(self, other): all_structs.append(getIteratorSetting_args) getIteratorSetting_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.STRING, 'iteratorName', 'UTF8', None, ), # 3 (4, TType.I32, 'scope', None, None, ), # 4 @@ -11194,20 +10944,17 @@ def read(self, iprot): iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -11264,7 +11011,7 @@ def __ne__(self, other): class getMaxRow_args(object): """ Attributes: - - login + - sharedSecret - tableName - auths - startRow @@ -11275,8 +11022,8 @@ class getMaxRow_args(object): """ - def __init__(self, login=None, tableName=None, auths=None, startRow=None, startInclusive=None, endRow=None, endInclusive=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, auths=None, startRow=None, startInclusive=None, endRow=None, endInclusive=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.auths = auths self.startRow = startRow @@ -11295,21 +11042,21 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.SET: self.auths = set() - (_etype230, _size227) = iprot.readSetBegin() - for _i231 in range(_size227): - _elem232 = iprot.readBinary() - self.auths.add(_elem232) + (_etype221, _size218) = iprot.readSetBegin() + for _i222 in range(_size218): + _elem223 = iprot.readBinary() + self.auths.add(_elem223) iprot.readSetEnd() else: iprot.skip(ftype) @@ -11343,9 +11090,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('getMaxRow_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -11354,8 +11101,8 @@ def write(self, oprot): if self.auths is not None: oprot.writeFieldBegin('auths', TType.SET, 3) oprot.writeSetBegin(TType.STRING, len(self.auths)) - for iter233 in self.auths: - oprot.writeBinary(iter233) + for iter224 in self.auths: + oprot.writeBinary(iter224) oprot.writeSetEnd() oprot.writeFieldEnd() if self.startRow is not None: @@ -11393,7 +11140,7 @@ def __ne__(self, other): all_structs.append(getMaxRow_args) getMaxRow_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.SET, 'auths', (TType.STRING, 'BINARY', False), None, ), # 3 (4, TType.STRING, 'startRow', 'BINARY', None, ), # 4 @@ -11436,20 +11183,17 @@ def read(self, iprot): iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -11506,14 +11250,14 @@ def __ne__(self, other): class getTableProperties_args(object): """ Attributes: - - login + - sharedSecret - tableName """ - def __init__(self, login=None, tableName=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None,): + self.sharedSecret = sharedSecret self.tableName = tableName def read(self, iprot): @@ -11527,12 +11271,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -11545,9 +11289,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('getTableProperties_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -11572,7 +11316,7 @@ def __ne__(self, other): all_structs.append(getTableProperties_args) getTableProperties_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 ) @@ -11606,30 +11350,27 @@ def read(self, iprot): if fid == 0: if ftype == TType.MAP: self.success = {} - (_ktype235, _vtype236, _size234) = iprot.readMapBegin() - for _i238 in range(_size234): - _key239 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - _val240 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - self.success[_key239] = _val240 + (_ktype226, _vtype227, _size225) = iprot.readMapBegin() + for _i229 in range(_size225): + _key230 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + _val231 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + self.success[_key230] = _val231 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -11645,9 +11386,9 @@ def write(self, oprot): if self.success is not None: oprot.writeFieldBegin('success', TType.MAP, 0) oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success)) - for kiter241, viter242 in self.success.items(): - oprot.writeString(kiter241.encode('utf-8') if sys.version_info[0] == 2 else kiter241) - oprot.writeString(viter242.encode('utf-8') if sys.version_info[0] == 2 else viter242) + for kiter232, viter233 in self.success.items(): + oprot.writeString(kiter232.encode('utf-8') if sys.version_info[0] == 2 else kiter232) + oprot.writeString(viter233.encode('utf-8') if sys.version_info[0] == 2 else viter233) oprot.writeMapEnd() oprot.writeFieldEnd() if self.ouch1 is not None: @@ -11690,7 +11431,7 @@ def __ne__(self, other): class importDirectory_args(object): """ Attributes: - - login + - sharedSecret - tableName - importDir - failureDir @@ -11699,8 +11440,8 @@ class importDirectory_args(object): """ - def __init__(self, login=None, tableName=None, importDir=None, failureDir=None, setTime=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, importDir=None, failureDir=None, setTime=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.importDir = importDir self.failureDir = failureDir @@ -11717,22 +11458,22 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.importDir = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.importDir = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 4: if ftype == TType.STRING: - self.failureDir = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.failureDir = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 5: @@ -11750,9 +11491,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('importDirectory_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -11789,7 +11530,7 @@ def __ne__(self, other): all_structs.append(importDirectory_args) importDirectory_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.STRING, 'importDir', 'UTF8', None, ), # 3 (4, TType.STRING, 'failureDir', 'UTF8', None, ), # 4 @@ -11823,20 +11564,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = TableNotFoundException() - self.ouch1.read(iprot) + self.ouch1 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch3 = AccumuloException() - self.ouch3.read(iprot) + self.ouch3 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch4 = AccumuloSecurityException() - self.ouch4.read(iprot) + self.ouch4 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -11889,15 +11627,15 @@ def __ne__(self, other): class importTable_args(object): """ Attributes: - - login + - sharedSecret - tableName - importDir """ - def __init__(self, login=None, tableName=None, importDir=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, importDir=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.importDir = importDir @@ -11912,17 +11650,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.importDir = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.importDir = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -11935,9 +11673,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('importTable_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -11966,7 +11704,7 @@ def __ne__(self, other): all_structs.append(importTable_args) importTable_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.STRING, 'importDir', 'UTF8', None, ), # 3 ) @@ -11998,20 +11736,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = TableExistsException() - self.ouch1.read(iprot) + self.ouch1 = TableExistsException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = AccumuloSecurityException() - self.ouch3.read(iprot) + self.ouch3 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -12064,15 +11799,15 @@ def __ne__(self, other): class listSplits_args(object): """ Attributes: - - login + - sharedSecret - tableName - maxSplits """ - def __init__(self, login=None, tableName=None, maxSplits=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, maxSplits=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.maxSplits = maxSplits @@ -12087,12 +11822,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: @@ -12110,9 +11845,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('listSplits_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -12141,7 +11876,7 @@ def __ne__(self, other): all_structs.append(listSplits_args) listSplits_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.I32, 'maxSplits', None, None, ), # 3 ) @@ -12176,29 +11911,26 @@ def read(self, iprot): if fid == 0: if ftype == TType.LIST: self.success = [] - (_etype246, _size243) = iprot.readListBegin() - for _i247 in range(_size243): - _elem248 = iprot.readBinary() - self.success.append(_elem248) + (_etype237, _size234) = iprot.readListBegin() + for _i238 in range(_size234): + _elem239 = iprot.readBinary() + self.success.append(_elem239) iprot.readListEnd() else: iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -12214,8 +11946,8 @@ def write(self, oprot): if self.success is not None: oprot.writeFieldBegin('success', TType.LIST, 0) oprot.writeListBegin(TType.STRING, len(self.success)) - for iter249 in self.success: - oprot.writeBinary(iter249) + for iter240 in self.success: + oprot.writeBinary(iter240) oprot.writeListEnd() oprot.writeFieldEnd() if self.ouch1 is not None: @@ -12258,13 +11990,13 @@ def __ne__(self, other): class listTables_args(object): """ Attributes: - - login + - sharedSecret """ - def __init__(self, login=None,): - self.login = login + def __init__(self, sharedSecret=None,): + self.sharedSecret = sharedSecret def read(self, iprot): if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: @@ -12277,7 +12009,7 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -12290,9 +12022,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('listTables_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -12313,7 +12045,7 @@ def __ne__(self, other): all_structs.append(listTables_args) listTables_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 ) @@ -12340,10 +12072,10 @@ def read(self, iprot): if fid == 0: if ftype == TType.SET: self.success = set() - (_etype253, _size250) = iprot.readSetBegin() - for _i254 in range(_size250): - _elem255 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - self.success.add(_elem255) + (_etype244, _size241) = iprot.readSetBegin() + for _i245 in range(_size241): + _elem246 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + self.success.add(_elem246) iprot.readSetEnd() else: iprot.skip(ftype) @@ -12360,8 +12092,8 @@ def write(self, oprot): if self.success is not None: oprot.writeFieldBegin('success', TType.SET, 0) oprot.writeSetBegin(TType.STRING, len(self.success)) - for iter256 in self.success: - oprot.writeString(iter256.encode('utf-8') if sys.version_info[0] == 2 else iter256) + for iter247 in self.success: + oprot.writeString(iter247.encode('utf-8') if sys.version_info[0] == 2 else iter247) oprot.writeSetEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -12389,14 +12121,14 @@ def __ne__(self, other): class listIterators_args(object): """ Attributes: - - login + - sharedSecret - tableName """ - def __init__(self, login=None, tableName=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None,): + self.sharedSecret = sharedSecret self.tableName = tableName def read(self, iprot): @@ -12410,12 +12142,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -12428,9 +12160,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('listIterators_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -12455,7 +12187,7 @@ def __ne__(self, other): all_structs.append(listIterators_args) listIterators_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 ) @@ -12489,35 +12221,32 @@ def read(self, iprot): if fid == 0: if ftype == TType.MAP: self.success = {} - (_ktype258, _vtype259, _size257) = iprot.readMapBegin() - for _i261 in range(_size257): - _key262 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - _val263 = set() - (_etype267, _size264) = iprot.readSetBegin() - for _i268 in range(_size264): - _elem269 = iprot.readI32() - _val263.add(_elem269) + (_ktype249, _vtype250, _size248) = iprot.readMapBegin() + for _i252 in range(_size248): + _key253 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + _val254 = set() + (_etype258, _size255) = iprot.readSetBegin() + for _i259 in range(_size255): + _elem260 = iprot.readI32() + _val254.add(_elem260) iprot.readSetEnd() - self.success[_key262] = _val263 + self.success[_key253] = _val254 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -12533,11 +12262,11 @@ def write(self, oprot): if self.success is not None: oprot.writeFieldBegin('success', TType.MAP, 0) oprot.writeMapBegin(TType.STRING, TType.SET, len(self.success)) - for kiter270, viter271 in self.success.items(): - oprot.writeString(kiter270.encode('utf-8') if sys.version_info[0] == 2 else kiter270) - oprot.writeSetBegin(TType.I32, len(viter271)) - for iter272 in viter271: - oprot.writeI32(iter272) + for kiter261, viter262 in self.success.items(): + oprot.writeString(kiter261.encode('utf-8') if sys.version_info[0] == 2 else kiter261) + oprot.writeSetBegin(TType.I32, len(viter262)) + for iter263 in viter262: + oprot.writeI32(iter263) oprot.writeSetEnd() oprot.writeMapEnd() oprot.writeFieldEnd() @@ -12581,14 +12310,14 @@ def __ne__(self, other): class listConstraints_args(object): """ Attributes: - - login + - sharedSecret - tableName """ - def __init__(self, login=None, tableName=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None,): + self.sharedSecret = sharedSecret self.tableName = tableName def read(self, iprot): @@ -12602,12 +12331,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -12620,9 +12349,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('listConstraints_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -12647,7 +12376,7 @@ def __ne__(self, other): all_structs.append(listConstraints_args) listConstraints_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 ) @@ -12681,30 +12410,27 @@ def read(self, iprot): if fid == 0: if ftype == TType.MAP: self.success = {} - (_ktype274, _vtype275, _size273) = iprot.readMapBegin() - for _i277 in range(_size273): - _key278 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - _val279 = iprot.readI32() - self.success[_key278] = _val279 + (_ktype265, _vtype266, _size264) = iprot.readMapBegin() + for _i268 in range(_size264): + _key269 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + _val270 = iprot.readI32() + self.success[_key269] = _val270 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -12720,9 +12446,9 @@ def write(self, oprot): if self.success is not None: oprot.writeFieldBegin('success', TType.MAP, 0) oprot.writeMapBegin(TType.STRING, TType.I32, len(self.success)) - for kiter280, viter281 in self.success.items(): - oprot.writeString(kiter280.encode('utf-8') if sys.version_info[0] == 2 else kiter280) - oprot.writeI32(viter281) + for kiter271, viter272 in self.success.items(): + oprot.writeString(kiter271.encode('utf-8') if sys.version_info[0] == 2 else kiter271) + oprot.writeI32(viter272) oprot.writeMapEnd() oprot.writeFieldEnd() if self.ouch1 is not None: @@ -12765,7 +12491,7 @@ def __ne__(self, other): class mergeTablets_args(object): """ Attributes: - - login + - sharedSecret - tableName - startRow - endRow @@ -12773,8 +12499,8 @@ class mergeTablets_args(object): """ - def __init__(self, login=None, tableName=None, startRow=None, endRow=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, startRow=None, endRow=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.startRow = startRow self.endRow = endRow @@ -12790,12 +12516,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: @@ -12818,9 +12544,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('mergeTablets_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -12853,7 +12579,7 @@ def __ne__(self, other): all_structs.append(mergeTablets_args) mergeTablets_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.STRING, 'startRow', 'BINARY', None, ), # 3 (4, TType.STRING, 'endRow', 'BINARY', None, ), # 4 @@ -12886,20 +12612,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -12952,15 +12675,15 @@ def __ne__(self, other): class offlineTable_args(object): """ Attributes: - - login + - sharedSecret - tableName - wait """ - def __init__(self, login=None, tableName=None, wait=False,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, wait=False,): + self.sharedSecret = sharedSecret self.tableName = tableName self.wait = wait @@ -12975,12 +12698,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: @@ -12998,9 +12721,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('offlineTable_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -13029,7 +12752,7 @@ def __ne__(self, other): all_structs.append(offlineTable_args) offlineTable_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.BOOL, 'wait', None, False, ), # 3 ) @@ -13061,20 +12784,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -13127,15 +12847,15 @@ def __ne__(self, other): class onlineTable_args(object): """ Attributes: - - login + - sharedSecret - tableName - wait """ - def __init__(self, login=None, tableName=None, wait=False,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, wait=False,): + self.sharedSecret = sharedSecret self.tableName = tableName self.wait = wait @@ -13150,12 +12870,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: @@ -13173,9 +12893,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('onlineTable_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -13204,7 +12924,7 @@ def __ne__(self, other): all_structs.append(onlineTable_args) onlineTable_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.BOOL, 'wait', None, False, ), # 3 ) @@ -13236,20 +12956,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -13302,15 +13019,15 @@ def __ne__(self, other): class removeConstraint_args(object): """ Attributes: - - login + - sharedSecret - tableName - constraint """ - def __init__(self, login=None, tableName=None, constraint=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, constraint=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.constraint = constraint @@ -13325,12 +13042,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: @@ -13348,9 +13065,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('removeConstraint_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -13379,7 +13096,7 @@ def __ne__(self, other): all_structs.append(removeConstraint_args) removeConstraint_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.I32, 'constraint', None, None, ), # 3 ) @@ -13411,20 +13128,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -13477,7 +13191,7 @@ def __ne__(self, other): class removeIterator_args(object): """ Attributes: - - login + - sharedSecret - tableName - iterName - scopes @@ -13485,8 +13199,8 @@ class removeIterator_args(object): """ - def __init__(self, login=None, tableName=None, iterName=None, scopes=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, iterName=None, scopes=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.iterName = iterName self.scopes = scopes @@ -13502,26 +13216,26 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.iterName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.iterName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 4: if ftype == TType.SET: self.scopes = set() - (_etype285, _size282) = iprot.readSetBegin() - for _i286 in range(_size282): - _elem287 = iprot.readI32() - self.scopes.add(_elem287) + (_etype276, _size273) = iprot.readSetBegin() + for _i277 in range(_size273): + _elem278 = iprot.readI32() + self.scopes.add(_elem278) iprot.readSetEnd() else: iprot.skip(ftype) @@ -13535,9 +13249,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('removeIterator_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -13550,8 +13264,8 @@ def write(self, oprot): if self.scopes is not None: oprot.writeFieldBegin('scopes', TType.SET, 4) oprot.writeSetBegin(TType.I32, len(self.scopes)) - for iter288 in self.scopes: - oprot.writeI32(iter288) + for iter279 in self.scopes: + oprot.writeI32(iter279) oprot.writeSetEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -13573,7 +13287,7 @@ def __ne__(self, other): all_structs.append(removeIterator_args) removeIterator_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.STRING, 'iterName', 'UTF8', None, ), # 3 (4, TType.SET, 'scopes', (TType.I32, None, False), None, ), # 4 @@ -13606,20 +13320,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -13672,15 +13383,15 @@ def __ne__(self, other): class removeTableProperty_args(object): """ Attributes: - - login + - sharedSecret - tableName - property """ - def __init__(self, login=None, tableName=None, property=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, property=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.property = property @@ -13695,17 +13406,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.property = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.property = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -13718,9 +13429,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('removeTableProperty_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -13749,7 +13460,7 @@ def __ne__(self, other): all_structs.append(removeTableProperty_args) removeTableProperty_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.STRING, 'property', 'UTF8', None, ), # 3 ) @@ -13781,20 +13492,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -13847,15 +13555,15 @@ def __ne__(self, other): class renameTable_args(object): """ Attributes: - - login + - sharedSecret - oldTableName - newTableName """ - def __init__(self, login=None, oldTableName=None, newTableName=None,): - self.login = login + def __init__(self, sharedSecret=None, oldTableName=None, newTableName=None,): + self.sharedSecret = sharedSecret self.oldTableName = oldTableName self.newTableName = newTableName @@ -13870,17 +13578,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.oldTableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.oldTableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.newTableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.newTableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -13893,9 +13601,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('renameTable_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.oldTableName is not None: oprot.writeFieldBegin('oldTableName', TType.STRING, 2) @@ -13924,7 +13632,7 @@ def __ne__(self, other): all_structs.append(renameTable_args) renameTable_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'oldTableName', 'UTF8', None, ), # 2 (3, TType.STRING, 'newTableName', 'UTF8', None, ), # 3 ) @@ -13958,26 +13666,22 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) elif fid == 4: if ftype == TType.STRUCT: - self.ouch4 = TableExistsException() - self.ouch4.read(iprot) + self.ouch4 = TableExistsException.read(iprot) else: iprot.skip(ftype) else: @@ -14035,15 +13739,15 @@ def __ne__(self, other): class setLocalityGroups_args(object): """ Attributes: - - login + - sharedSecret - tableName - groups """ - def __init__(self, login=None, tableName=None, groups=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, groups=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.groups = groups @@ -14058,27 +13762,27 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.MAP: self.groups = {} - (_ktype290, _vtype291, _size289) = iprot.readMapBegin() - for _i293 in range(_size289): - _key294 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - _val295 = set() - (_etype299, _size296) = iprot.readSetBegin() - for _i300 in range(_size296): - _elem301 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - _val295.add(_elem301) + (_ktype281, _vtype282, _size280) = iprot.readMapBegin() + for _i284 in range(_size280): + _key285 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + _val286 = set() + (_etype290, _size287) = iprot.readSetBegin() + for _i291 in range(_size287): + _elem292 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + _val286.add(_elem292) iprot.readSetEnd() - self.groups[_key294] = _val295 + self.groups[_key285] = _val286 iprot.readMapEnd() else: iprot.skip(ftype) @@ -14092,9 +13796,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('setLocalityGroups_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -14103,11 +13807,11 @@ def write(self, oprot): if self.groups is not None: oprot.writeFieldBegin('groups', TType.MAP, 3) oprot.writeMapBegin(TType.STRING, TType.SET, len(self.groups)) - for kiter302, viter303 in self.groups.items(): - oprot.writeString(kiter302.encode('utf-8') if sys.version_info[0] == 2 else kiter302) - oprot.writeSetBegin(TType.STRING, len(viter303)) - for iter304 in viter303: - oprot.writeString(iter304.encode('utf-8') if sys.version_info[0] == 2 else iter304) + for kiter293, viter294 in self.groups.items(): + oprot.writeString(kiter293.encode('utf-8') if sys.version_info[0] == 2 else kiter293) + oprot.writeSetBegin(TType.STRING, len(viter294)) + for iter295 in viter294: + oprot.writeString(iter295.encode('utf-8') if sys.version_info[0] == 2 else iter295) oprot.writeSetEnd() oprot.writeMapEnd() oprot.writeFieldEnd() @@ -14130,7 +13834,7 @@ def __ne__(self, other): all_structs.append(setLocalityGroups_args) setLocalityGroups_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.MAP, 'groups', (TType.STRING, 'UTF8', TType.SET, (TType.STRING, 'UTF8', False), False), None, ), # 3 ) @@ -14162,20 +13866,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -14228,7 +13929,7 @@ def __ne__(self, other): class setTableProperty_args(object): """ Attributes: - - login + - sharedSecret - tableName - property - value @@ -14236,8 +13937,8 @@ class setTableProperty_args(object): """ - def __init__(self, login=None, tableName=None, property=None, value=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, property=None, value=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.property = property self.value = value @@ -14253,22 +13954,22 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.property = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.property = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 4: if ftype == TType.STRING: - self.value = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.value = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -14281,9 +13982,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('setTableProperty_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -14316,7 +14017,7 @@ def __ne__(self, other): all_structs.append(setTableProperty_args) setTableProperty_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.STRING, 'property', 'UTF8', None, ), # 3 (4, TType.STRING, 'value', 'UTF8', None, ), # 4 @@ -14349,20 +14050,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -14415,7 +14113,7 @@ def __ne__(self, other): class splitRangeByTablets_args(object): """ Attributes: - - login + - sharedSecret - tableName - range - maxSplits @@ -14423,8 +14121,8 @@ class splitRangeByTablets_args(object): """ - def __init__(self, login=None, tableName=None, range=None, maxSplits=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, range=None, maxSplits=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.range = range self.maxSplits = maxSplits @@ -14440,12 +14138,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: @@ -14469,9 +14167,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('splitRangeByTablets_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -14504,7 +14202,7 @@ def __ne__(self, other): all_structs.append(splitRangeByTablets_args) splitRangeByTablets_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.STRUCT, 'range', [Range, None], None, ), # 3 (4, TType.I32, 'maxSplits', None, None, ), # 4 @@ -14540,30 +14238,27 @@ def read(self, iprot): if fid == 0: if ftype == TType.SET: self.success = set() - (_etype308, _size305) = iprot.readSetBegin() - for _i309 in range(_size305): - _elem310 = Range() - _elem310.read(iprot) - self.success.add(_elem310) + (_etype299, _size296) = iprot.readSetBegin() + for _i300 in range(_size296): + _elem301 = Range() + _elem301.read(iprot) + self.success.add(_elem301) iprot.readSetEnd() else: iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -14579,8 +14274,8 @@ def write(self, oprot): if self.success is not None: oprot.writeFieldBegin('success', TType.SET, 0) oprot.writeSetBegin(TType.STRUCT, len(self.success)) - for iter311 in self.success: - iter311.write(oprot) + for iter302 in self.success: + iter302.write(oprot) oprot.writeSetEnd() oprot.writeFieldEnd() if self.ouch1 is not None: @@ -14623,14 +14318,14 @@ def __ne__(self, other): class tableExists_args(object): """ Attributes: - - login + - sharedSecret - tableName """ - def __init__(self, login=None, tableName=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None,): + self.sharedSecret = sharedSecret self.tableName = tableName def read(self, iprot): @@ -14644,12 +14339,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -14662,9 +14357,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('tableExists_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -14689,7 +14384,7 @@ def __ne__(self, other): all_structs.append(tableExists_args) tableExists_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 ) @@ -14758,13 +14453,13 @@ def __ne__(self, other): class tableIdMap_args(object): """ Attributes: - - login + - sharedSecret """ - def __init__(self, login=None,): - self.login = login + def __init__(self, sharedSecret=None,): + self.sharedSecret = sharedSecret def read(self, iprot): if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: @@ -14777,7 +14472,7 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -14790,9 +14485,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('tableIdMap_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -14813,7 +14508,7 @@ def __ne__(self, other): all_structs.append(tableIdMap_args) tableIdMap_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 ) @@ -14840,11 +14535,11 @@ def read(self, iprot): if fid == 0: if ftype == TType.MAP: self.success = {} - (_ktype313, _vtype314, _size312) = iprot.readMapBegin() - for _i316 in range(_size312): - _key317 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - _val318 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - self.success[_key317] = _val318 + (_ktype304, _vtype305, _size303) = iprot.readMapBegin() + for _i307 in range(_size303): + _key308 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + _val309 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + self.success[_key308] = _val309 iprot.readMapEnd() else: iprot.skip(ftype) @@ -14861,9 +14556,9 @@ def write(self, oprot): if self.success is not None: oprot.writeFieldBegin('success', TType.MAP, 0) oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success)) - for kiter319, viter320 in self.success.items(): - oprot.writeString(kiter319.encode('utf-8') if sys.version_info[0] == 2 else kiter319) - oprot.writeString(viter320.encode('utf-8') if sys.version_info[0] == 2 else viter320) + for kiter310, viter311 in self.success.items(): + oprot.writeString(kiter310.encode('utf-8') if sys.version_info[0] == 2 else kiter310) + oprot.writeString(viter311.encode('utf-8') if sys.version_info[0] == 2 else viter311) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -14891,7 +14586,7 @@ def __ne__(self, other): class testTableClassLoad_args(object): """ Attributes: - - login + - sharedSecret - tableName - className - asTypeName @@ -14899,8 +14594,8 @@ class testTableClassLoad_args(object): """ - def __init__(self, login=None, tableName=None, className=None, asTypeName=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, className=None, asTypeName=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.className = className self.asTypeName = asTypeName @@ -14916,22 +14611,22 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.className = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.className = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 4: if ftype == TType.STRING: - self.asTypeName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.asTypeName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -14944,9 +14639,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('testTableClassLoad_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -14979,7 +14674,7 @@ def __ne__(self, other): all_structs.append(testTableClassLoad_args) testTableClassLoad_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.STRING, 'className', 'UTF8', None, ), # 3 (4, TType.STRING, 'asTypeName', 'UTF8', None, ), # 4 @@ -15019,20 +14714,17 @@ def read(self, iprot): iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -15089,14 +14781,14 @@ def __ne__(self, other): class pingTabletServer_args(object): """ Attributes: - - login + - sharedSecret - tserver """ - def __init__(self, login=None, tserver=None,): - self.login = login + def __init__(self, sharedSecret=None, tserver=None,): + self.sharedSecret = sharedSecret self.tserver = tserver def read(self, iprot): @@ -15110,12 +14802,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tserver = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tserver = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -15128,9 +14820,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('pingTabletServer_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tserver is not None: oprot.writeFieldBegin('tserver', TType.STRING, 2) @@ -15155,7 +14847,7 @@ def __ne__(self, other): all_structs.append(pingTabletServer_args) pingTabletServer_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tserver', 'UTF8', None, ), # 2 ) @@ -15184,14 +14876,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -15239,14 +14929,14 @@ def __ne__(self, other): class getActiveScans_args(object): """ Attributes: - - login + - sharedSecret - tserver """ - def __init__(self, login=None, tserver=None,): - self.login = login + def __init__(self, sharedSecret=None, tserver=None,): + self.sharedSecret = sharedSecret self.tserver = tserver def read(self, iprot): @@ -15260,12 +14950,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tserver = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tserver = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -15278,9 +14968,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('getActiveScans_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tserver is not None: oprot.writeFieldBegin('tserver', TType.STRING, 2) @@ -15305,7 +14995,7 @@ def __ne__(self, other): all_structs.append(getActiveScans_args) getActiveScans_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tserver', 'UTF8', None, ), # 2 ) @@ -15337,24 +15027,22 @@ def read(self, iprot): if fid == 0: if ftype == TType.LIST: self.success = [] - (_etype324, _size321) = iprot.readListBegin() - for _i325 in range(_size321): - _elem326 = ActiveScan() - _elem326.read(iprot) - self.success.append(_elem326) + (_etype315, _size312) = iprot.readListBegin() + for _i316 in range(_size312): + _elem317 = ActiveScan() + _elem317.read(iprot) + self.success.append(_elem317) iprot.readListEnd() else: iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -15370,8 +15058,8 @@ def write(self, oprot): if self.success is not None: oprot.writeFieldBegin('success', TType.LIST, 0) oprot.writeListBegin(TType.STRUCT, len(self.success)) - for iter327 in self.success: - iter327.write(oprot) + for iter318 in self.success: + iter318.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.ouch1 is not None: @@ -15409,14 +15097,14 @@ def __ne__(self, other): class getActiveCompactions_args(object): """ Attributes: - - login + - sharedSecret - tserver """ - def __init__(self, login=None, tserver=None,): - self.login = login + def __init__(self, sharedSecret=None, tserver=None,): + self.sharedSecret = sharedSecret self.tserver = tserver def read(self, iprot): @@ -15430,12 +15118,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tserver = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tserver = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -15448,9 +15136,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('getActiveCompactions_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tserver is not None: oprot.writeFieldBegin('tserver', TType.STRING, 2) @@ -15475,7 +15163,7 @@ def __ne__(self, other): all_structs.append(getActiveCompactions_args) getActiveCompactions_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tserver', 'UTF8', None, ), # 2 ) @@ -15507,24 +15195,22 @@ def read(self, iprot): if fid == 0: if ftype == TType.LIST: self.success = [] - (_etype331, _size328) = iprot.readListBegin() - for _i332 in range(_size328): - _elem333 = ActiveCompaction() - _elem333.read(iprot) - self.success.append(_elem333) + (_etype322, _size319) = iprot.readListBegin() + for _i323 in range(_size319): + _elem324 = ActiveCompaction() + _elem324.read(iprot) + self.success.append(_elem324) iprot.readListEnd() else: iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -15540,8 +15226,8 @@ def write(self, oprot): if self.success is not None: oprot.writeFieldBegin('success', TType.LIST, 0) oprot.writeListBegin(TType.STRUCT, len(self.success)) - for iter334 in self.success: - iter334.write(oprot) + for iter325 in self.success: + iter325.write(oprot) oprot.writeListEnd() oprot.writeFieldEnd() if self.ouch1 is not None: @@ -15579,13 +15265,13 @@ def __ne__(self, other): class getSiteConfiguration_args(object): """ Attributes: - - login + - sharedSecret """ - def __init__(self, login=None,): - self.login = login + def __init__(self, sharedSecret=None,): + self.sharedSecret = sharedSecret def read(self, iprot): if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: @@ -15598,7 +15284,7 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -15611,9 +15297,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('getSiteConfiguration_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -15634,7 +15320,7 @@ def __ne__(self, other): all_structs.append(getSiteConfiguration_args) getSiteConfiguration_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 ) @@ -15665,24 +15351,22 @@ def read(self, iprot): if fid == 0: if ftype == TType.MAP: self.success = {} - (_ktype336, _vtype337, _size335) = iprot.readMapBegin() - for _i339 in range(_size335): - _key340 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - _val341 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - self.success[_key340] = _val341 + (_ktype327, _vtype328, _size326) = iprot.readMapBegin() + for _i330 in range(_size326): + _key331 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + _val332 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + self.success[_key331] = _val332 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -15698,9 +15382,9 @@ def write(self, oprot): if self.success is not None: oprot.writeFieldBegin('success', TType.MAP, 0) oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success)) - for kiter342, viter343 in self.success.items(): - oprot.writeString(kiter342.encode('utf-8') if sys.version_info[0] == 2 else kiter342) - oprot.writeString(viter343.encode('utf-8') if sys.version_info[0] == 2 else viter343) + for kiter333, viter334 in self.success.items(): + oprot.writeString(kiter333.encode('utf-8') if sys.version_info[0] == 2 else kiter333) + oprot.writeString(viter334.encode('utf-8') if sys.version_info[0] == 2 else viter334) oprot.writeMapEnd() oprot.writeFieldEnd() if self.ouch1 is not None: @@ -15738,13 +15422,13 @@ def __ne__(self, other): class getSystemConfiguration_args(object): """ Attributes: - - login + - sharedSecret """ - def __init__(self, login=None,): - self.login = login + def __init__(self, sharedSecret=None,): + self.sharedSecret = sharedSecret def read(self, iprot): if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: @@ -15757,7 +15441,7 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -15770,9 +15454,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('getSystemConfiguration_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -15793,7 +15477,7 @@ def __ne__(self, other): all_structs.append(getSystemConfiguration_args) getSystemConfiguration_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 ) @@ -15824,24 +15508,22 @@ def read(self, iprot): if fid == 0: if ftype == TType.MAP: self.success = {} - (_ktype345, _vtype346, _size344) = iprot.readMapBegin() - for _i348 in range(_size344): - _key349 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - _val350 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - self.success[_key349] = _val350 + (_ktype336, _vtype337, _size335) = iprot.readMapBegin() + for _i339 in range(_size335): + _key340 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + _val341 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + self.success[_key340] = _val341 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -15857,9 +15539,9 @@ def write(self, oprot): if self.success is not None: oprot.writeFieldBegin('success', TType.MAP, 0) oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success)) - for kiter351, viter352 in self.success.items(): - oprot.writeString(kiter351.encode('utf-8') if sys.version_info[0] == 2 else kiter351) - oprot.writeString(viter352.encode('utf-8') if sys.version_info[0] == 2 else viter352) + for kiter342, viter343 in self.success.items(): + oprot.writeString(kiter342.encode('utf-8') if sys.version_info[0] == 2 else kiter342) + oprot.writeString(viter343.encode('utf-8') if sys.version_info[0] == 2 else viter343) oprot.writeMapEnd() oprot.writeFieldEnd() if self.ouch1 is not None: @@ -15897,13 +15579,13 @@ def __ne__(self, other): class getTabletServers_args(object): """ Attributes: - - login + - sharedSecret """ - def __init__(self, login=None,): - self.login = login + def __init__(self, sharedSecret=None,): + self.sharedSecret = sharedSecret def read(self, iprot): if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: @@ -15916,7 +15598,7 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -15929,9 +15611,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('getTabletServers_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -15952,7 +15634,7 @@ def __ne__(self, other): all_structs.append(getTabletServers_args) getTabletServers_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 ) @@ -15979,10 +15661,10 @@ def read(self, iprot): if fid == 0: if ftype == TType.LIST: self.success = [] - (_etype356, _size353) = iprot.readListBegin() - for _i357 in range(_size353): - _elem358 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - self.success.append(_elem358) + (_etype347, _size344) = iprot.readListBegin() + for _i348 in range(_size344): + _elem349 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + self.success.append(_elem349) iprot.readListEnd() else: iprot.skip(ftype) @@ -15999,8 +15681,8 @@ def write(self, oprot): if self.success is not None: oprot.writeFieldBegin('success', TType.LIST, 0) oprot.writeListBegin(TType.STRING, len(self.success)) - for iter359 in self.success: - oprot.writeString(iter359.encode('utf-8') if sys.version_info[0] == 2 else iter359) + for iter350 in self.success: + oprot.writeString(iter350.encode('utf-8') if sys.version_info[0] == 2 else iter350) oprot.writeListEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -16028,14 +15710,14 @@ def __ne__(self, other): class removeProperty_args(object): """ Attributes: - - login + - sharedSecret - property """ - def __init__(self, login=None, property=None,): - self.login = login + def __init__(self, sharedSecret=None, property=None,): + self.sharedSecret = sharedSecret self.property = property def read(self, iprot): @@ -16049,12 +15731,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.property = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.property = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -16067,9 +15749,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('removeProperty_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.property is not None: oprot.writeFieldBegin('property', TType.STRING, 2) @@ -16094,7 +15776,7 @@ def __ne__(self, other): all_structs.append(removeProperty_args) removeProperty_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'property', 'UTF8', None, ), # 2 ) @@ -16123,14 +15805,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -16178,15 +15858,15 @@ def __ne__(self, other): class setProperty_args(object): """ Attributes: - - login + - sharedSecret - property - value """ - def __init__(self, login=None, property=None, value=None,): - self.login = login + def __init__(self, sharedSecret=None, property=None, value=None,): + self.sharedSecret = sharedSecret self.property = property self.value = value @@ -16201,17 +15881,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.property = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.property = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.value = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.value = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -16224,9 +15904,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('setProperty_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.property is not None: oprot.writeFieldBegin('property', TType.STRING, 2) @@ -16255,7 +15935,7 @@ def __ne__(self, other): all_structs.append(setProperty_args) setProperty_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'property', 'UTF8', None, ), # 2 (3, TType.STRING, 'value', 'UTF8', None, ), # 3 ) @@ -16285,14 +15965,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -16340,15 +16018,15 @@ def __ne__(self, other): class testClassLoad_args(object): """ Attributes: - - login + - sharedSecret - className - asTypeName """ - def __init__(self, login=None, className=None, asTypeName=None,): - self.login = login + def __init__(self, sharedSecret=None, className=None, asTypeName=None,): + self.sharedSecret = sharedSecret self.className = className self.asTypeName = asTypeName @@ -16363,17 +16041,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.className = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.className = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.asTypeName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.asTypeName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -16386,9 +16064,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('testClassLoad_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.className is not None: oprot.writeFieldBegin('className', TType.STRING, 2) @@ -16417,7 +16095,7 @@ def __ne__(self, other): all_structs.append(testClassLoad_args) testClassLoad_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'className', 'UTF8', None, ), # 2 (3, TType.STRING, 'asTypeName', 'UTF8', None, ), # 3 ) @@ -16454,14 +16132,12 @@ def read(self, iprot): iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -16513,15 +16189,15 @@ def __ne__(self, other): class authenticateUser_args(object): """ Attributes: - - login + - sharedSecret - user - properties """ - def __init__(self, login=None, user=None, properties=None,): - self.login = login + def __init__(self, sharedSecret=None, user=None, properties=None,): + self.sharedSecret = sharedSecret self.user = user self.properties = properties @@ -16536,22 +16212,22 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.user = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.user = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.MAP: self.properties = {} - (_ktype361, _vtype362, _size360) = iprot.readMapBegin() - for _i364 in range(_size360): - _key365 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - _val366 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - self.properties[_key365] = _val366 + (_ktype352, _vtype353, _size351) = iprot.readMapBegin() + for _i355 in range(_size351): + _key356 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + _val357 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + self.properties[_key356] = _val357 iprot.readMapEnd() else: iprot.skip(ftype) @@ -16565,9 +16241,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('authenticateUser_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.user is not None: oprot.writeFieldBegin('user', TType.STRING, 2) @@ -16576,9 +16252,9 @@ def write(self, oprot): if self.properties is not None: oprot.writeFieldBegin('properties', TType.MAP, 3) oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.properties)) - for kiter367, viter368 in self.properties.items(): - oprot.writeString(kiter367.encode('utf-8') if sys.version_info[0] == 2 else kiter367) - oprot.writeString(viter368.encode('utf-8') if sys.version_info[0] == 2 else viter368) + for kiter358, viter359 in self.properties.items(): + oprot.writeString(kiter358.encode('utf-8') if sys.version_info[0] == 2 else kiter358) + oprot.writeString(viter359.encode('utf-8') if sys.version_info[0] == 2 else viter359) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -16600,7 +16276,7 @@ def __ne__(self, other): all_structs.append(authenticateUser_args) authenticateUser_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'user', 'UTF8', None, ), # 2 (3, TType.MAP, 'properties', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ), # 3 ) @@ -16637,14 +16313,12 @@ def read(self, iprot): iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -16696,15 +16370,15 @@ def __ne__(self, other): class changeUserAuthorizations_args(object): """ Attributes: - - login + - sharedSecret - user - authorizations """ - def __init__(self, login=None, user=None, authorizations=None,): - self.login = login + def __init__(self, sharedSecret=None, user=None, authorizations=None,): + self.sharedSecret = sharedSecret self.user = user self.authorizations = authorizations @@ -16719,21 +16393,21 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.user = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.user = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.SET: self.authorizations = set() - (_etype372, _size369) = iprot.readSetBegin() - for _i373 in range(_size369): - _elem374 = iprot.readBinary() - self.authorizations.add(_elem374) + (_etype363, _size360) = iprot.readSetBegin() + for _i364 in range(_size360): + _elem365 = iprot.readBinary() + self.authorizations.add(_elem365) iprot.readSetEnd() else: iprot.skip(ftype) @@ -16747,9 +16421,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('changeUserAuthorizations_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.user is not None: oprot.writeFieldBegin('user', TType.STRING, 2) @@ -16758,8 +16432,8 @@ def write(self, oprot): if self.authorizations is not None: oprot.writeFieldBegin('authorizations', TType.SET, 3) oprot.writeSetBegin(TType.STRING, len(self.authorizations)) - for iter375 in self.authorizations: - oprot.writeBinary(iter375) + for iter366 in self.authorizations: + oprot.writeBinary(iter366) oprot.writeSetEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -16781,7 +16455,7 @@ def __ne__(self, other): all_structs.append(changeUserAuthorizations_args) changeUserAuthorizations_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'user', 'UTF8', None, ), # 2 (3, TType.SET, 'authorizations', (TType.STRING, 'BINARY', False), None, ), # 3 ) @@ -16811,14 +16485,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -16866,15 +16538,15 @@ def __ne__(self, other): class changeLocalUserPassword_args(object): """ Attributes: - - login + - sharedSecret - user - password """ - def __init__(self, login=None, user=None, password=None,): - self.login = login + def __init__(self, sharedSecret=None, user=None, password=None,): + self.sharedSecret = sharedSecret self.user = user self.password = password @@ -16889,12 +16561,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.user = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.user = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: @@ -16912,9 +16584,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('changeLocalUserPassword_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.user is not None: oprot.writeFieldBegin('user', TType.STRING, 2) @@ -16943,7 +16615,7 @@ def __ne__(self, other): all_structs.append(changeLocalUserPassword_args) changeLocalUserPassword_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'user', 'UTF8', None, ), # 2 (3, TType.STRING, 'password', 'BINARY', None, ), # 3 ) @@ -16973,14 +16645,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -17028,15 +16698,15 @@ def __ne__(self, other): class createLocalUser_args(object): """ Attributes: - - login + - sharedSecret - user - password """ - def __init__(self, login=None, user=None, password=None,): - self.login = login + def __init__(self, sharedSecret=None, user=None, password=None,): + self.sharedSecret = sharedSecret self.user = user self.password = password @@ -17051,12 +16721,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.user = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.user = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: @@ -17074,9 +16744,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('createLocalUser_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.user is not None: oprot.writeFieldBegin('user', TType.STRING, 2) @@ -17105,7 +16775,7 @@ def __ne__(self, other): all_structs.append(createLocalUser_args) createLocalUser_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'user', 'UTF8', None, ), # 2 (3, TType.STRING, 'password', 'BINARY', None, ), # 3 ) @@ -17135,14 +16805,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -17190,14 +16858,14 @@ def __ne__(self, other): class dropLocalUser_args(object): """ Attributes: - - login + - sharedSecret - user """ - def __init__(self, login=None, user=None,): - self.login = login + def __init__(self, sharedSecret=None, user=None,): + self.sharedSecret = sharedSecret self.user = user def read(self, iprot): @@ -17211,12 +16879,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.user = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.user = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -17229,9 +16897,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('dropLocalUser_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.user is not None: oprot.writeFieldBegin('user', TType.STRING, 2) @@ -17256,7 +16924,7 @@ def __ne__(self, other): all_structs.append(dropLocalUser_args) dropLocalUser_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'user', 'UTF8', None, ), # 2 ) @@ -17285,14 +16953,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -17340,14 +17006,14 @@ def __ne__(self, other): class getUserAuthorizations_args(object): """ Attributes: - - login + - sharedSecret - user """ - def __init__(self, login=None, user=None,): - self.login = login + def __init__(self, sharedSecret=None, user=None,): + self.sharedSecret = sharedSecret self.user = user def read(self, iprot): @@ -17361,12 +17027,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.user = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.user = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -17379,9 +17045,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('getUserAuthorizations_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.user is not None: oprot.writeFieldBegin('user', TType.STRING, 2) @@ -17406,7 +17072,7 @@ def __ne__(self, other): all_structs.append(getUserAuthorizations_args) getUserAuthorizations_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'user', 'UTF8', None, ), # 2 ) @@ -17438,23 +17104,21 @@ def read(self, iprot): if fid == 0: if ftype == TType.LIST: self.success = [] - (_etype379, _size376) = iprot.readListBegin() - for _i380 in range(_size376): - _elem381 = iprot.readBinary() - self.success.append(_elem381) + (_etype370, _size367) = iprot.readListBegin() + for _i371 in range(_size367): + _elem372 = iprot.readBinary() + self.success.append(_elem372) iprot.readListEnd() else: iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -17470,8 +17134,8 @@ def write(self, oprot): if self.success is not None: oprot.writeFieldBegin('success', TType.LIST, 0) oprot.writeListBegin(TType.STRING, len(self.success)) - for iter382 in self.success: - oprot.writeBinary(iter382) + for iter373 in self.success: + oprot.writeBinary(iter373) oprot.writeListEnd() oprot.writeFieldEnd() if self.ouch1 is not None: @@ -17509,15 +17173,15 @@ def __ne__(self, other): class grantSystemPermission_args(object): """ Attributes: - - login + - sharedSecret - user - perm """ - def __init__(self, login=None, user=None, perm=None,): - self.login = login + def __init__(self, sharedSecret=None, user=None, perm=None,): + self.sharedSecret = sharedSecret self.user = user self.perm = perm @@ -17532,12 +17196,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.user = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.user = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: @@ -17555,9 +17219,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('grantSystemPermission_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.user is not None: oprot.writeFieldBegin('user', TType.STRING, 2) @@ -17586,7 +17250,7 @@ def __ne__(self, other): all_structs.append(grantSystemPermission_args) grantSystemPermission_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'user', 'UTF8', None, ), # 2 (3, TType.I32, 'perm', None, None, ), # 3 ) @@ -17616,14 +17280,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -17671,7 +17333,7 @@ def __ne__(self, other): class grantTablePermission_args(object): """ Attributes: - - login + - sharedSecret - user - table - perm @@ -17679,8 +17341,8 @@ class grantTablePermission_args(object): """ - def __init__(self, login=None, user=None, table=None, perm=None,): - self.login = login + def __init__(self, sharedSecret=None, user=None, table=None, perm=None,): + self.sharedSecret = sharedSecret self.user = user self.table = table self.perm = perm @@ -17696,17 +17358,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.user = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.user = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.table = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.table = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 4: @@ -17724,9 +17386,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('grantTablePermission_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.user is not None: oprot.writeFieldBegin('user', TType.STRING, 2) @@ -17759,7 +17421,7 @@ def __ne__(self, other): all_structs.append(grantTablePermission_args) grantTablePermission_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'user', 'UTF8', None, ), # 2 (3, TType.STRING, 'table', 'UTF8', None, ), # 3 (4, TType.I32, 'perm', None, None, ), # 4 @@ -17792,20 +17454,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -17858,15 +17517,15 @@ def __ne__(self, other): class hasSystemPermission_args(object): """ Attributes: - - login + - sharedSecret - user - perm """ - def __init__(self, login=None, user=None, perm=None,): - self.login = login + def __init__(self, sharedSecret=None, user=None, perm=None,): + self.sharedSecret = sharedSecret self.user = user self.perm = perm @@ -17881,12 +17540,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.user = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.user = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: @@ -17904,9 +17563,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('hasSystemPermission_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.user is not None: oprot.writeFieldBegin('user', TType.STRING, 2) @@ -17935,7 +17594,7 @@ def __ne__(self, other): all_structs.append(hasSystemPermission_args) hasSystemPermission_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'user', 'UTF8', None, ), # 2 (3, TType.I32, 'perm', None, None, ), # 3 ) @@ -17972,14 +17631,12 @@ def read(self, iprot): iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -18031,7 +17688,7 @@ def __ne__(self, other): class hasTablePermission_args(object): """ Attributes: - - login + - sharedSecret - user - table - perm @@ -18039,8 +17696,8 @@ class hasTablePermission_args(object): """ - def __init__(self, login=None, user=None, table=None, perm=None,): - self.login = login + def __init__(self, sharedSecret=None, user=None, table=None, perm=None,): + self.sharedSecret = sharedSecret self.user = user self.table = table self.perm = perm @@ -18056,17 +17713,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.user = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.user = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.table = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.table = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 4: @@ -18084,9 +17741,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('hasTablePermission_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.user is not None: oprot.writeFieldBegin('user', TType.STRING, 2) @@ -18119,7 +17776,7 @@ def __ne__(self, other): all_structs.append(hasTablePermission_args) hasTablePermission_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'user', 'UTF8', None, ), # 2 (3, TType.STRING, 'table', 'UTF8', None, ), # 3 (4, TType.I32, 'perm', None, None, ), # 4 @@ -18159,20 +17816,17 @@ def read(self, iprot): iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -18229,13 +17883,13 @@ def __ne__(self, other): class listLocalUsers_args(object): """ Attributes: - - login + - sharedSecret """ - def __init__(self, login=None,): - self.login = login + def __init__(self, sharedSecret=None,): + self.sharedSecret = sharedSecret def read(self, iprot): if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: @@ -18248,7 +17902,7 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -18261,9 +17915,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('listLocalUsers_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -18284,7 +17938,7 @@ def __ne__(self, other): all_structs.append(listLocalUsers_args) listLocalUsers_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 ) @@ -18317,29 +17971,26 @@ def read(self, iprot): if fid == 0: if ftype == TType.SET: self.success = set() - (_etype386, _size383) = iprot.readSetBegin() - for _i387 in range(_size383): - _elem388 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - self.success.add(_elem388) + (_etype377, _size374) = iprot.readSetBegin() + for _i378 in range(_size374): + _elem379 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + self.success.add(_elem379) iprot.readSetEnd() else: iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -18355,8 +18006,8 @@ def write(self, oprot): if self.success is not None: oprot.writeFieldBegin('success', TType.SET, 0) oprot.writeSetBegin(TType.STRING, len(self.success)) - for iter389 in self.success: - oprot.writeString(iter389.encode('utf-8') if sys.version_info[0] == 2 else iter389) + for iter380 in self.success: + oprot.writeString(iter380.encode('utf-8') if sys.version_info[0] == 2 else iter380) oprot.writeSetEnd() oprot.writeFieldEnd() if self.ouch1 is not None: @@ -18399,15 +18050,15 @@ def __ne__(self, other): class revokeSystemPermission_args(object): """ Attributes: - - login + - sharedSecret - user - perm """ - def __init__(self, login=None, user=None, perm=None,): - self.login = login + def __init__(self, sharedSecret=None, user=None, perm=None,): + self.sharedSecret = sharedSecret self.user = user self.perm = perm @@ -18422,12 +18073,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.user = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.user = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: @@ -18445,9 +18096,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('revokeSystemPermission_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.user is not None: oprot.writeFieldBegin('user', TType.STRING, 2) @@ -18476,7 +18127,7 @@ def __ne__(self, other): all_structs.append(revokeSystemPermission_args) revokeSystemPermission_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'user', 'UTF8', None, ), # 2 (3, TType.I32, 'perm', None, None, ), # 3 ) @@ -18506,14 +18157,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -18561,7 +18210,7 @@ def __ne__(self, other): class revokeTablePermission_args(object): """ Attributes: - - login + - sharedSecret - user - table - perm @@ -18569,8 +18218,8 @@ class revokeTablePermission_args(object): """ - def __init__(self, login=None, user=None, table=None, perm=None,): - self.login = login + def __init__(self, sharedSecret=None, user=None, table=None, perm=None,): + self.sharedSecret = sharedSecret self.user = user self.table = table self.perm = perm @@ -18586,17 +18235,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.user = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.user = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.table = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.table = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 4: @@ -18614,9 +18263,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('revokeTablePermission_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.user is not None: oprot.writeFieldBegin('user', TType.STRING, 2) @@ -18649,7 +18298,7 @@ def __ne__(self, other): all_structs.append(revokeTablePermission_args) revokeTablePermission_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'user', 'UTF8', None, ), # 2 (3, TType.STRING, 'table', 'UTF8', None, ), # 3 (4, TType.I32, 'perm', None, None, ), # 4 @@ -18682,20 +18331,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -18748,7 +18394,7 @@ def __ne__(self, other): class grantNamespacePermission_args(object): """ Attributes: - - login + - sharedSecret - user - namespaceName - perm @@ -18756,8 +18402,8 @@ class grantNamespacePermission_args(object): """ - def __init__(self, login=None, user=None, namespaceName=None, perm=None,): - self.login = login + def __init__(self, sharedSecret=None, user=None, namespaceName=None, perm=None,): + self.sharedSecret = sharedSecret self.user = user self.namespaceName = namespaceName self.perm = perm @@ -18773,17 +18419,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.user = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.user = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.namespaceName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.namespaceName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 4: @@ -18801,9 +18447,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('grantNamespacePermission_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.user is not None: oprot.writeFieldBegin('user', TType.STRING, 2) @@ -18836,7 +18482,7 @@ def __ne__(self, other): all_structs.append(grantNamespacePermission_args) grantNamespacePermission_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'user', 'UTF8', None, ), # 2 (3, TType.STRING, 'namespaceName', 'UTF8', None, ), # 3 (4, TType.I32, 'perm', None, None, ), # 4 @@ -18867,14 +18513,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -18922,7 +18566,7 @@ def __ne__(self, other): class hasNamespacePermission_args(object): """ Attributes: - - login + - sharedSecret - user - namespaceName - perm @@ -18930,8 +18574,8 @@ class hasNamespacePermission_args(object): """ - def __init__(self, login=None, user=None, namespaceName=None, perm=None,): - self.login = login + def __init__(self, sharedSecret=None, user=None, namespaceName=None, perm=None,): + self.sharedSecret = sharedSecret self.user = user self.namespaceName = namespaceName self.perm = perm @@ -18947,17 +18591,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.user = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.user = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.namespaceName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.namespaceName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 4: @@ -18975,9 +18619,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('hasNamespacePermission_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.user is not None: oprot.writeFieldBegin('user', TType.STRING, 2) @@ -19010,7 +18654,7 @@ def __ne__(self, other): all_structs.append(hasNamespacePermission_args) hasNamespacePermission_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'user', 'UTF8', None, ), # 2 (3, TType.STRING, 'namespaceName', 'UTF8', None, ), # 3 (4, TType.I32, 'perm', None, None, ), # 4 @@ -19048,14 +18692,12 @@ def read(self, iprot): iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -19107,7 +18749,7 @@ def __ne__(self, other): class revokeNamespacePermission_args(object): """ Attributes: - - login + - sharedSecret - user - namespaceName - perm @@ -19115,8 +18757,8 @@ class revokeNamespacePermission_args(object): """ - def __init__(self, login=None, user=None, namespaceName=None, perm=None,): - self.login = login + def __init__(self, sharedSecret=None, user=None, namespaceName=None, perm=None,): + self.sharedSecret = sharedSecret self.user = user self.namespaceName = namespaceName self.perm = perm @@ -19132,17 +18774,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.user = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.user = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.namespaceName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.namespaceName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 4: @@ -19160,9 +18802,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('revokeNamespacePermission_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.user is not None: oprot.writeFieldBegin('user', TType.STRING, 2) @@ -19195,7 +18837,7 @@ def __ne__(self, other): all_structs.append(revokeNamespacePermission_args) revokeNamespacePermission_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'user', 'UTF8', None, ), # 2 (3, TType.STRING, 'namespaceName', 'UTF8', None, ), # 3 (4, TType.I32, 'perm', None, None, ), # 4 @@ -19226,14 +18868,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -19281,15 +18921,15 @@ def __ne__(self, other): class createBatchScanner_args(object): """ Attributes: - - login + - sharedSecret - tableName - options """ - def __init__(self, login=None, tableName=None, options=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, options=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.options = options @@ -19304,12 +18944,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: @@ -19328,9 +18968,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('createBatchScanner_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -19359,7 +18999,7 @@ def __ne__(self, other): all_structs.append(createBatchScanner_args) createBatchScanner_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.STRUCT, 'options', [BatchScanOptions, None], None, ), # 3 ) @@ -19393,25 +19033,22 @@ def read(self, iprot): break if fid == 0: if ftype == TType.STRING: - self.success = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.success = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -19468,15 +19105,15 @@ def __ne__(self, other): class createScanner_args(object): """ Attributes: - - login + - sharedSecret - tableName - options """ - def __init__(self, login=None, tableName=None, options=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, options=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.options = options @@ -19491,12 +19128,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: @@ -19515,9 +19152,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('createScanner_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -19546,7 +19183,7 @@ def __ne__(self, other): all_structs.append(createScanner_args) createScanner_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.STRUCT, 'options', [ScanOptions, None], None, ), # 3 ) @@ -19580,25 +19217,22 @@ def read(self, iprot): break if fid == 0: if ftype == TType.STRING: - self.success = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.success = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -19674,7 +19308,7 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.scanner = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.scanner = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -19743,8 +19377,7 @@ def read(self, iprot): iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = UnknownScanner() - self.ouch1.read(iprot) + self.ouch1 = UnknownScanner.read(iprot) else: iprot.skip(ftype) else: @@ -19810,7 +19443,7 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.scanner = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.scanner = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -19884,20 +19517,17 @@ def read(self, iprot): iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = NoMoreEntriesException() - self.ouch1.read(iprot) + self.ouch1 = NoMoreEntriesException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = UnknownScanner() - self.ouch2.read(iprot) + self.ouch2 = UnknownScanner.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = AccumuloSecurityException() - self.ouch3.read(iprot) + self.ouch3 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -19975,7 +19605,7 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.scanner = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.scanner = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: @@ -20059,20 +19689,17 @@ def read(self, iprot): iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = NoMoreEntriesException() - self.ouch1.read(iprot) + self.ouch1 = NoMoreEntriesException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = UnknownScanner() - self.ouch2.read(iprot) + self.ouch2 = UnknownScanner.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = AccumuloSecurityException() - self.ouch3.read(iprot) + self.ouch3 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -20148,7 +19775,7 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.scanner = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.scanner = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -20210,8 +19837,7 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = UnknownScanner() - self.ouch1.read(iprot) + self.ouch1 = UnknownScanner.read(iprot) else: iprot.skip(ftype) else: @@ -20254,15 +19880,15 @@ def __ne__(self, other): class updateAndFlush_args(object): """ Attributes: - - login + - sharedSecret - tableName - cells """ - def __init__(self, login=None, tableName=None, cells=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, cells=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.cells = cells @@ -20277,28 +19903,28 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.MAP: self.cells = {} - (_ktype391, _vtype392, _size390) = iprot.readMapBegin() - for _i394 in range(_size390): - _key395 = iprot.readBinary() - _val396 = [] - (_etype400, _size397) = iprot.readListBegin() - for _i401 in range(_size397): - _elem402 = ColumnUpdate() - _elem402.read(iprot) - _val396.append(_elem402) + (_ktype382, _vtype383, _size381) = iprot.readMapBegin() + for _i385 in range(_size381): + _key386 = iprot.readBinary() + _val387 = [] + (_etype391, _size388) = iprot.readListBegin() + for _i392 in range(_size388): + _elem393 = ColumnUpdate() + _elem393.read(iprot) + _val387.append(_elem393) iprot.readListEnd() - self.cells[_key395] = _val396 + self.cells[_key386] = _val387 iprot.readMapEnd() else: iprot.skip(ftype) @@ -20312,9 +19938,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('updateAndFlush_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -20323,11 +19949,11 @@ def write(self, oprot): if self.cells is not None: oprot.writeFieldBegin('cells', TType.MAP, 3) oprot.writeMapBegin(TType.STRING, TType.LIST, len(self.cells)) - for kiter403, viter404 in self.cells.items(): - oprot.writeBinary(kiter403) - oprot.writeListBegin(TType.STRUCT, len(viter404)) - for iter405 in viter404: - iter405.write(oprot) + for kiter394, viter395 in self.cells.items(): + oprot.writeBinary(kiter394) + oprot.writeListBegin(TType.STRUCT, len(viter395)) + for iter396 in viter395: + iter396.write(oprot) oprot.writeListEnd() oprot.writeMapEnd() oprot.writeFieldEnd() @@ -20350,7 +19976,7 @@ def __ne__(self, other): all_structs.append(updateAndFlush_args) updateAndFlush_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.MAP, 'cells', (TType.STRING, 'BINARY', TType.LIST, (TType.STRUCT, [ColumnUpdate, None], False), False), None, ), # 3 ) @@ -20384,26 +20010,22 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.outch1 = AccumuloException() - self.outch1.read(iprot) + self.outch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) elif fid == 4: if ftype == TType.STRUCT: - self.ouch4 = MutationsRejectedException() - self.ouch4.read(iprot) + self.ouch4 = MutationsRejectedException.read(iprot) else: iprot.skip(ftype) else: @@ -20461,15 +20083,15 @@ def __ne__(self, other): class createWriter_args(object): """ Attributes: - - login + - sharedSecret - tableName - opts """ - def __init__(self, login=None, tableName=None, opts=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, opts=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.opts = opts @@ -20484,12 +20106,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: @@ -20508,9 +20130,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('createWriter_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -20539,7 +20161,7 @@ def __ne__(self, other): all_structs.append(createWriter_args) createWriter_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.STRUCT, 'opts', [WriterOptions, None], None, ), # 3 ) @@ -20573,25 +20195,22 @@ def read(self, iprot): break if fid == 0: if ftype == TType.STRING: - self.success = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.success = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.outch1 = AccumuloException() - self.outch1.read(iprot) + self.outch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -20669,23 +20288,23 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.writer = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.writer = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.MAP: self.cells = {} - (_ktype407, _vtype408, _size406) = iprot.readMapBegin() - for _i410 in range(_size406): - _key411 = iprot.readBinary() - _val412 = [] - (_etype416, _size413) = iprot.readListBegin() - for _i417 in range(_size413): - _elem418 = ColumnUpdate() - _elem418.read(iprot) - _val412.append(_elem418) + (_ktype398, _vtype399, _size397) = iprot.readMapBegin() + for _i401 in range(_size397): + _key402 = iprot.readBinary() + _val403 = [] + (_etype407, _size404) = iprot.readListBegin() + for _i408 in range(_size404): + _elem409 = ColumnUpdate() + _elem409.read(iprot) + _val403.append(_elem409) iprot.readListEnd() - self.cells[_key411] = _val412 + self.cells[_key402] = _val403 iprot.readMapEnd() else: iprot.skip(ftype) @@ -20706,11 +20325,11 @@ def write(self, oprot): if self.cells is not None: oprot.writeFieldBegin('cells', TType.MAP, 2) oprot.writeMapBegin(TType.STRING, TType.LIST, len(self.cells)) - for kiter419, viter420 in self.cells.items(): - oprot.writeBinary(kiter419) - oprot.writeListBegin(TType.STRUCT, len(viter420)) - for iter421 in viter420: - iter421.write(oprot) + for kiter410, viter411 in self.cells.items(): + oprot.writeBinary(kiter410) + oprot.writeListBegin(TType.STRUCT, len(viter411)) + for iter412 in viter411: + iter412.write(oprot) oprot.writeListEnd() oprot.writeMapEnd() oprot.writeFieldEnd() @@ -20760,7 +20379,7 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.writer = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.writer = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -20824,14 +20443,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = UnknownWriter() - self.ouch1.read(iprot) + self.ouch1 = UnknownWriter.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = MutationsRejectedException() - self.ouch2.read(iprot) + self.ouch2 = MutationsRejectedException.read(iprot) else: iprot.skip(ftype) else: @@ -20898,7 +20515,7 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.writer = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.writer = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -20962,14 +20579,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = UnknownWriter() - self.ouch1.read(iprot) + self.ouch1 = UnknownWriter.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = MutationsRejectedException() - self.ouch2.read(iprot) + self.ouch2 = MutationsRejectedException.read(iprot) else: iprot.skip(ftype) else: @@ -21017,7 +20632,7 @@ def __ne__(self, other): class updateRowConditionally_args(object): """ Attributes: - - login + - sharedSecret - tableName - row - updates @@ -21025,8 +20640,8 @@ class updateRowConditionally_args(object): """ - def __init__(self, login=None, tableName=None, row=None, updates=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, row=None, updates=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.row = row self.updates = updates @@ -21042,12 +20657,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: @@ -21071,9 +20686,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('updateRowConditionally_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -21106,7 +20721,7 @@ def __ne__(self, other): all_structs.append(updateRowConditionally_args) updateRowConditionally_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.STRING, 'row', 'BINARY', None, ), # 3 (4, TType.STRUCT, 'updates', [ConditionalUpdates, None], None, ), # 4 @@ -21146,20 +20761,17 @@ def read(self, iprot): iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -21216,15 +20828,15 @@ def __ne__(self, other): class createConditionalWriter_args(object): """ Attributes: - - login + - sharedSecret - tableName - options """ - def __init__(self, login=None, tableName=None, options=None,): - self.login = login + def __init__(self, sharedSecret=None, tableName=None, options=None,): + self.sharedSecret = sharedSecret self.tableName = tableName self.options = options @@ -21239,12 +20851,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.tableName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: @@ -21263,9 +20875,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('createConditionalWriter_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.tableName is not None: oprot.writeFieldBegin('tableName', TType.STRING, 2) @@ -21294,7 +20906,7 @@ def __ne__(self, other): all_structs.append(createConditionalWriter_args) createConditionalWriter_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'tableName', 'UTF8', None, ), # 2 (3, TType.STRUCT, 'options', [ConditionalWriterOptions, None], None, ), # 3 ) @@ -21328,25 +20940,22 @@ def read(self, iprot): break if fid == 0: if ftype == TType.STRING: - self.success = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.success = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = TableNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = TableNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -21424,18 +21033,18 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.conditionalWriter = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.conditionalWriter = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.MAP: self.updates = {} - (_ktype423, _vtype424, _size422) = iprot.readMapBegin() - for _i426 in range(_size422): - _key427 = iprot.readBinary() - _val428 = ConditionalUpdates() - _val428.read(iprot) - self.updates[_key427] = _val428 + (_ktype414, _vtype415, _size413) = iprot.readMapBegin() + for _i417 in range(_size413): + _key418 = iprot.readBinary() + _val419 = ConditionalUpdates() + _val419.read(iprot) + self.updates[_key418] = _val419 iprot.readMapEnd() else: iprot.skip(ftype) @@ -21456,9 +21065,9 @@ def write(self, oprot): if self.updates is not None: oprot.writeFieldBegin('updates', TType.MAP, 2) oprot.writeMapBegin(TType.STRING, TType.STRUCT, len(self.updates)) - for kiter429, viter430 in self.updates.items(): - oprot.writeBinary(kiter429) - viter430.write(oprot) + for kiter420, viter421 in self.updates.items(): + oprot.writeBinary(kiter420) + viter421.write(oprot) oprot.writeMapEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -21514,30 +21123,27 @@ def read(self, iprot): if fid == 0: if ftype == TType.MAP: self.success = {} - (_ktype432, _vtype433, _size431) = iprot.readMapBegin() - for _i435 in range(_size431): - _key436 = iprot.readBinary() - _val437 = iprot.readI32() - self.success[_key436] = _val437 + (_ktype423, _vtype424, _size422) = iprot.readMapBegin() + for _i426 in range(_size422): + _key427 = iprot.readBinary() + _val428 = iprot.readI32() + self.success[_key427] = _val428 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = UnknownWriter() - self.ouch1.read(iprot) + self.ouch1 = UnknownWriter.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = AccumuloSecurityException() - self.ouch3.read(iprot) + self.ouch3 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -21553,9 +21159,9 @@ def write(self, oprot): if self.success is not None: oprot.writeFieldBegin('success', TType.MAP, 0) oprot.writeMapBegin(TType.STRING, TType.I32, len(self.success)) - for kiter438, viter439 in self.success.items(): - oprot.writeBinary(kiter438) - oprot.writeI32(viter439) + for kiter429, viter430 in self.success.items(): + oprot.writeBinary(kiter429) + oprot.writeI32(viter430) oprot.writeMapEnd() oprot.writeFieldEnd() if self.ouch1 is not None: @@ -21617,7 +21223,7 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.conditionalWriter = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.conditionalWriter = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -22026,7 +21632,7 @@ def read(self, iprot): break if fid == 0: if ftype == TType.STRING: - self.success = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.success = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -22130,7 +21736,7 @@ def read(self, iprot): break if fid == 0: if ftype == TType.STRING: - self.success = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.success = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -22172,13 +21778,13 @@ def __ne__(self, other): class listNamespaces_args(object): """ Attributes: - - login + - sharedSecret """ - def __init__(self, login=None,): - self.login = login + def __init__(self, sharedSecret=None,): + self.sharedSecret = sharedSecret def read(self, iprot): if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: @@ -22191,7 +21797,7 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -22204,9 +21810,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('listNamespaces_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -22227,7 +21833,7 @@ def __ne__(self, other): all_structs.append(listNamespaces_args) listNamespaces_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 ) @@ -22258,23 +21864,21 @@ def read(self, iprot): if fid == 0: if ftype == TType.LIST: self.success = [] - (_etype443, _size440) = iprot.readListBegin() - for _i444 in range(_size440): - _elem445 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - self.success.append(_elem445) + (_etype434, _size431) = iprot.readListBegin() + for _i435 in range(_size431): + _elem436 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + self.success.append(_elem436) iprot.readListEnd() else: iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -22290,8 +21894,8 @@ def write(self, oprot): if self.success is not None: oprot.writeFieldBegin('success', TType.LIST, 0) oprot.writeListBegin(TType.STRING, len(self.success)) - for iter446 in self.success: - oprot.writeString(iter446.encode('utf-8') if sys.version_info[0] == 2 else iter446) + for iter437 in self.success: + oprot.writeString(iter437.encode('utf-8') if sys.version_info[0] == 2 else iter437) oprot.writeListEnd() oprot.writeFieldEnd() if self.ouch1 is not None: @@ -22329,14 +21933,14 @@ def __ne__(self, other): class namespaceExists_args(object): """ Attributes: - - login + - sharedSecret - namespaceName """ - def __init__(self, login=None, namespaceName=None,): - self.login = login + def __init__(self, sharedSecret=None, namespaceName=None,): + self.sharedSecret = sharedSecret self.namespaceName = namespaceName def read(self, iprot): @@ -22350,12 +21954,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.namespaceName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.namespaceName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -22368,9 +21972,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('namespaceExists_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.namespaceName is not None: oprot.writeFieldBegin('namespaceName', TType.STRING, 2) @@ -22395,7 +21999,7 @@ def __ne__(self, other): all_structs.append(namespaceExists_args) namespaceExists_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'namespaceName', 'UTF8', None, ), # 2 ) @@ -22431,14 +22035,12 @@ def read(self, iprot): iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -22490,14 +22092,14 @@ def __ne__(self, other): class createNamespace_args(object): """ Attributes: - - login + - sharedSecret - namespaceName """ - def __init__(self, login=None, namespaceName=None,): - self.login = login + def __init__(self, sharedSecret=None, namespaceName=None,): + self.sharedSecret = sharedSecret self.namespaceName = namespaceName def read(self, iprot): @@ -22511,12 +22113,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.namespaceName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.namespaceName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -22529,9 +22131,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('createNamespace_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.namespaceName is not None: oprot.writeFieldBegin('namespaceName', TType.STRING, 2) @@ -22556,7 +22158,7 @@ def __ne__(self, other): all_structs.append(createNamespace_args) createNamespace_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'namespaceName', 'UTF8', None, ), # 2 ) @@ -22587,20 +22189,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = NamespaceExistsException() - self.ouch3.read(iprot) + self.ouch3 = NamespaceExistsException.read(iprot) else: iprot.skip(ftype) else: @@ -22653,14 +22252,14 @@ def __ne__(self, other): class deleteNamespace_args(object): """ Attributes: - - login + - sharedSecret - namespaceName """ - def __init__(self, login=None, namespaceName=None,): - self.login = login + def __init__(self, sharedSecret=None, namespaceName=None,): + self.sharedSecret = sharedSecret self.namespaceName = namespaceName def read(self, iprot): @@ -22674,12 +22273,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.namespaceName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.namespaceName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -22692,9 +22291,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('deleteNamespace_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.namespaceName is not None: oprot.writeFieldBegin('namespaceName', TType.STRING, 2) @@ -22719,7 +22318,7 @@ def __ne__(self, other): all_structs.append(deleteNamespace_args) deleteNamespace_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'namespaceName', 'UTF8', None, ), # 2 ) @@ -22752,26 +22351,22 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = NamespaceNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = NamespaceNotFoundException.read(iprot) else: iprot.skip(ftype) elif fid == 4: if ftype == TType.STRUCT: - self.ouch4 = NamespaceNotEmptyException() - self.ouch4.read(iprot) + self.ouch4 = NamespaceNotEmptyException.read(iprot) else: iprot.skip(ftype) else: @@ -22829,15 +22424,15 @@ def __ne__(self, other): class renameNamespace_args(object): """ Attributes: - - login + - sharedSecret - oldNamespaceName - newNamespaceName """ - def __init__(self, login=None, oldNamespaceName=None, newNamespaceName=None,): - self.login = login + def __init__(self, sharedSecret=None, oldNamespaceName=None, newNamespaceName=None,): + self.sharedSecret = sharedSecret self.oldNamespaceName = oldNamespaceName self.newNamespaceName = newNamespaceName @@ -22852,17 +22447,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.oldNamespaceName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.oldNamespaceName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.newNamespaceName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.newNamespaceName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -22875,9 +22470,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('renameNamespace_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.oldNamespaceName is not None: oprot.writeFieldBegin('oldNamespaceName', TType.STRING, 2) @@ -22906,7 +22501,7 @@ def __ne__(self, other): all_structs.append(renameNamespace_args) renameNamespace_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'oldNamespaceName', 'UTF8', None, ), # 2 (3, TType.STRING, 'newNamespaceName', 'UTF8', None, ), # 3 ) @@ -22940,26 +22535,22 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = NamespaceNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = NamespaceNotFoundException.read(iprot) else: iprot.skip(ftype) elif fid == 4: if ftype == TType.STRUCT: - self.ouch4 = NamespaceExistsException() - self.ouch4.read(iprot) + self.ouch4 = NamespaceExistsException.read(iprot) else: iprot.skip(ftype) else: @@ -23017,7 +22608,7 @@ def __ne__(self, other): class setNamespaceProperty_args(object): """ Attributes: - - login + - sharedSecret - namespaceName - property - value @@ -23025,8 +22616,8 @@ class setNamespaceProperty_args(object): """ - def __init__(self, login=None, namespaceName=None, property=None, value=None,): - self.login = login + def __init__(self, sharedSecret=None, namespaceName=None, property=None, value=None,): + self.sharedSecret = sharedSecret self.namespaceName = namespaceName self.property = property self.value = value @@ -23042,22 +22633,22 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.namespaceName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.namespaceName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.property = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.property = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 4: if ftype == TType.STRING: - self.value = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.value = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -23070,9 +22661,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('setNamespaceProperty_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.namespaceName is not None: oprot.writeFieldBegin('namespaceName', TType.STRING, 2) @@ -23105,7 +22696,7 @@ def __ne__(self, other): all_structs.append(setNamespaceProperty_args) setNamespaceProperty_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'namespaceName', 'UTF8', None, ), # 2 (3, TType.STRING, 'property', 'UTF8', None, ), # 3 (4, TType.STRING, 'value', 'UTF8', None, ), # 4 @@ -23138,20 +22729,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = NamespaceNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = NamespaceNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -23204,15 +22792,15 @@ def __ne__(self, other): class removeNamespaceProperty_args(object): """ Attributes: - - login + - sharedSecret - namespaceName - property """ - def __init__(self, login=None, namespaceName=None, property=None,): - self.login = login + def __init__(self, sharedSecret=None, namespaceName=None, property=None,): + self.sharedSecret = sharedSecret self.namespaceName = namespaceName self.property = property @@ -23227,17 +22815,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.namespaceName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.namespaceName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.property = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.property = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -23250,9 +22838,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('removeNamespaceProperty_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.namespaceName is not None: oprot.writeFieldBegin('namespaceName', TType.STRING, 2) @@ -23281,7 +22869,7 @@ def __ne__(self, other): all_structs.append(removeNamespaceProperty_args) removeNamespaceProperty_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'namespaceName', 'UTF8', None, ), # 2 (3, TType.STRING, 'property', 'UTF8', None, ), # 3 ) @@ -23313,20 +22901,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = NamespaceNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = NamespaceNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -23379,14 +22964,14 @@ def __ne__(self, other): class getNamespaceProperties_args(object): """ Attributes: - - login + - sharedSecret - namespaceName """ - def __init__(self, login=None, namespaceName=None,): - self.login = login + def __init__(self, sharedSecret=None, namespaceName=None,): + self.sharedSecret = sharedSecret self.namespaceName = namespaceName def read(self, iprot): @@ -23400,12 +22985,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.namespaceName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.namespaceName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -23418,9 +23003,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('getNamespaceProperties_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.namespaceName is not None: oprot.writeFieldBegin('namespaceName', TType.STRING, 2) @@ -23445,7 +23030,7 @@ def __ne__(self, other): all_structs.append(getNamespaceProperties_args) getNamespaceProperties_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'namespaceName', 'UTF8', None, ), # 2 ) @@ -23479,30 +23064,27 @@ def read(self, iprot): if fid == 0: if ftype == TType.MAP: self.success = {} - (_ktype448, _vtype449, _size447) = iprot.readMapBegin() - for _i451 in range(_size447): - _key452 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - _val453 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - self.success[_key452] = _val453 + (_ktype439, _vtype440, _size438) = iprot.readMapBegin() + for _i442 in range(_size438): + _key443 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + _val444 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + self.success[_key443] = _val444 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = NamespaceNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = NamespaceNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -23518,9 +23100,9 @@ def write(self, oprot): if self.success is not None: oprot.writeFieldBegin('success', TType.MAP, 0) oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success)) - for kiter454, viter455 in self.success.items(): - oprot.writeString(kiter454.encode('utf-8') if sys.version_info[0] == 2 else kiter454) - oprot.writeString(viter455.encode('utf-8') if sys.version_info[0] == 2 else viter455) + for kiter445, viter446 in self.success.items(): + oprot.writeString(kiter445.encode('utf-8') if sys.version_info[0] == 2 else kiter445) + oprot.writeString(viter446.encode('utf-8') if sys.version_info[0] == 2 else viter446) oprot.writeMapEnd() oprot.writeFieldEnd() if self.ouch1 is not None: @@ -23563,13 +23145,13 @@ def __ne__(self, other): class namespaceIdMap_args(object): """ Attributes: - - login + - sharedSecret """ - def __init__(self, login=None,): - self.login = login + def __init__(self, sharedSecret=None,): + self.sharedSecret = sharedSecret def read(self, iprot): if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: @@ -23582,7 +23164,7 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -23595,9 +23177,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('namespaceIdMap_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() oprot.writeFieldStop() oprot.writeStructEnd() @@ -23618,7 +23200,7 @@ def __ne__(self, other): all_structs.append(namespaceIdMap_args) namespaceIdMap_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 ) @@ -23649,24 +23231,22 @@ def read(self, iprot): if fid == 0: if ftype == TType.MAP: self.success = {} - (_ktype457, _vtype458, _size456) = iprot.readMapBegin() - for _i460 in range(_size456): - _key461 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - _val462 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - self.success[_key461] = _val462 + (_ktype448, _vtype449, _size447) = iprot.readMapBegin() + for _i451 in range(_size447): + _key452 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + _val453 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + self.success[_key452] = _val453 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) else: @@ -23682,9 +23262,9 @@ def write(self, oprot): if self.success is not None: oprot.writeFieldBegin('success', TType.MAP, 0) oprot.writeMapBegin(TType.STRING, TType.STRING, len(self.success)) - for kiter463, viter464 in self.success.items(): - oprot.writeString(kiter463.encode('utf-8') if sys.version_info[0] == 2 else kiter463) - oprot.writeString(viter464.encode('utf-8') if sys.version_info[0] == 2 else viter464) + for kiter454, viter455 in self.success.items(): + oprot.writeString(kiter454.encode('utf-8') if sys.version_info[0] == 2 else kiter454) + oprot.writeString(viter455.encode('utf-8') if sys.version_info[0] == 2 else viter455) oprot.writeMapEnd() oprot.writeFieldEnd() if self.ouch1 is not None: @@ -23722,7 +23302,7 @@ def __ne__(self, other): class attachNamespaceIterator_args(object): """ Attributes: - - login + - sharedSecret - namespaceName - setting - scopes @@ -23730,8 +23310,8 @@ class attachNamespaceIterator_args(object): """ - def __init__(self, login=None, namespaceName=None, setting=None, scopes=None,): - self.login = login + def __init__(self, sharedSecret=None, namespaceName=None, setting=None, scopes=None,): + self.sharedSecret = sharedSecret self.namespaceName = namespaceName self.setting = setting self.scopes = scopes @@ -23747,12 +23327,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.namespaceName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.namespaceName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: @@ -23764,10 +23344,10 @@ def read(self, iprot): elif fid == 4: if ftype == TType.SET: self.scopes = set() - (_etype468, _size465) = iprot.readSetBegin() - for _i469 in range(_size465): - _elem470 = iprot.readI32() - self.scopes.add(_elem470) + (_etype459, _size456) = iprot.readSetBegin() + for _i460 in range(_size456): + _elem461 = iprot.readI32() + self.scopes.add(_elem461) iprot.readSetEnd() else: iprot.skip(ftype) @@ -23781,9 +23361,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('attachNamespaceIterator_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.namespaceName is not None: oprot.writeFieldBegin('namespaceName', TType.STRING, 2) @@ -23796,8 +23376,8 @@ def write(self, oprot): if self.scopes is not None: oprot.writeFieldBegin('scopes', TType.SET, 4) oprot.writeSetBegin(TType.I32, len(self.scopes)) - for iter471 in self.scopes: - oprot.writeI32(iter471) + for iter462 in self.scopes: + oprot.writeI32(iter462) oprot.writeSetEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -23819,7 +23399,7 @@ def __ne__(self, other): all_structs.append(attachNamespaceIterator_args) attachNamespaceIterator_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'namespaceName', 'UTF8', None, ), # 2 (3, TType.STRUCT, 'setting', [IteratorSetting, None], None, ), # 3 (4, TType.SET, 'scopes', (TType.I32, None, False), None, ), # 4 @@ -23852,20 +23432,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = NamespaceNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = NamespaceNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -23918,7 +23495,7 @@ def __ne__(self, other): class removeNamespaceIterator_args(object): """ Attributes: - - login + - sharedSecret - namespaceName - name - scopes @@ -23926,8 +23503,8 @@ class removeNamespaceIterator_args(object): """ - def __init__(self, login=None, namespaceName=None, name=None, scopes=None,): - self.login = login + def __init__(self, sharedSecret=None, namespaceName=None, name=None, scopes=None,): + self.sharedSecret = sharedSecret self.namespaceName = namespaceName self.name = name self.scopes = scopes @@ -23943,26 +23520,26 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.namespaceName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.namespaceName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.name = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.name = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 4: if ftype == TType.SET: self.scopes = set() - (_etype475, _size472) = iprot.readSetBegin() - for _i476 in range(_size472): - _elem477 = iprot.readI32() - self.scopes.add(_elem477) + (_etype466, _size463) = iprot.readSetBegin() + for _i467 in range(_size463): + _elem468 = iprot.readI32() + self.scopes.add(_elem468) iprot.readSetEnd() else: iprot.skip(ftype) @@ -23976,9 +23553,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('removeNamespaceIterator_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.namespaceName is not None: oprot.writeFieldBegin('namespaceName', TType.STRING, 2) @@ -23991,8 +23568,8 @@ def write(self, oprot): if self.scopes is not None: oprot.writeFieldBegin('scopes', TType.SET, 4) oprot.writeSetBegin(TType.I32, len(self.scopes)) - for iter478 in self.scopes: - oprot.writeI32(iter478) + for iter469 in self.scopes: + oprot.writeI32(iter469) oprot.writeSetEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -24014,7 +23591,7 @@ def __ne__(self, other): all_structs.append(removeNamespaceIterator_args) removeNamespaceIterator_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'namespaceName', 'UTF8', None, ), # 2 (3, TType.STRING, 'name', 'UTF8', None, ), # 3 (4, TType.SET, 'scopes', (TType.I32, None, False), None, ), # 4 @@ -24047,20 +23624,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = NamespaceNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = NamespaceNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -24113,7 +23687,7 @@ def __ne__(self, other): class getNamespaceIteratorSetting_args(object): """ Attributes: - - login + - sharedSecret - namespaceName - name - scope @@ -24121,8 +23695,8 @@ class getNamespaceIteratorSetting_args(object): """ - def __init__(self, login=None, namespaceName=None, name=None, scope=None,): - self.login = login + def __init__(self, sharedSecret=None, namespaceName=None, name=None, scope=None,): + self.sharedSecret = sharedSecret self.namespaceName = namespaceName self.name = name self.scope = scope @@ -24138,17 +23712,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.namespaceName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.namespaceName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.name = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.name = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 4: @@ -24166,9 +23740,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('getNamespaceIteratorSetting_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.namespaceName is not None: oprot.writeFieldBegin('namespaceName', TType.STRING, 2) @@ -24201,7 +23775,7 @@ def __ne__(self, other): all_structs.append(getNamespaceIteratorSetting_args) getNamespaceIteratorSetting_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'namespaceName', 'UTF8', None, ), # 2 (3, TType.STRING, 'name', 'UTF8', None, ), # 3 (4, TType.I32, 'scope', None, None, ), # 4 @@ -24242,20 +23816,17 @@ def read(self, iprot): iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = NamespaceNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = NamespaceNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -24312,14 +23883,14 @@ def __ne__(self, other): class listNamespaceIterators_args(object): """ Attributes: - - login + - sharedSecret - namespaceName """ - def __init__(self, login=None, namespaceName=None,): - self.login = login + def __init__(self, sharedSecret=None, namespaceName=None,): + self.sharedSecret = sharedSecret self.namespaceName = namespaceName def read(self, iprot): @@ -24333,12 +23904,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.namespaceName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.namespaceName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -24351,9 +23922,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('listNamespaceIterators_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.namespaceName is not None: oprot.writeFieldBegin('namespaceName', TType.STRING, 2) @@ -24378,7 +23949,7 @@ def __ne__(self, other): all_structs.append(listNamespaceIterators_args) listNamespaceIterators_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'namespaceName', 'UTF8', None, ), # 2 ) @@ -24412,35 +23983,32 @@ def read(self, iprot): if fid == 0: if ftype == TType.MAP: self.success = {} - (_ktype480, _vtype481, _size479) = iprot.readMapBegin() - for _i483 in range(_size479): - _key484 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - _val485 = set() - (_etype489, _size486) = iprot.readSetBegin() - for _i490 in range(_size486): - _elem491 = iprot.readI32() - _val485.add(_elem491) + (_ktype471, _vtype472, _size470) = iprot.readMapBegin() + for _i474 in range(_size470): + _key475 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + _val476 = set() + (_etype480, _size477) = iprot.readSetBegin() + for _i481 in range(_size477): + _elem482 = iprot.readI32() + _val476.add(_elem482) iprot.readSetEnd() - self.success[_key484] = _val485 + self.success[_key475] = _val476 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = NamespaceNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = NamespaceNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -24456,11 +24024,11 @@ def write(self, oprot): if self.success is not None: oprot.writeFieldBegin('success', TType.MAP, 0) oprot.writeMapBegin(TType.STRING, TType.SET, len(self.success)) - for kiter492, viter493 in self.success.items(): - oprot.writeString(kiter492.encode('utf-8') if sys.version_info[0] == 2 else kiter492) - oprot.writeSetBegin(TType.I32, len(viter493)) - for iter494 in viter493: - oprot.writeI32(iter494) + for kiter483, viter484 in self.success.items(): + oprot.writeString(kiter483.encode('utf-8') if sys.version_info[0] == 2 else kiter483) + oprot.writeSetBegin(TType.I32, len(viter484)) + for iter485 in viter484: + oprot.writeI32(iter485) oprot.writeSetEnd() oprot.writeMapEnd() oprot.writeFieldEnd() @@ -24504,7 +24072,7 @@ def __ne__(self, other): class checkNamespaceIteratorConflicts_args(object): """ Attributes: - - login + - sharedSecret - namespaceName - setting - scopes @@ -24512,8 +24080,8 @@ class checkNamespaceIteratorConflicts_args(object): """ - def __init__(self, login=None, namespaceName=None, setting=None, scopes=None,): - self.login = login + def __init__(self, sharedSecret=None, namespaceName=None, setting=None, scopes=None,): + self.sharedSecret = sharedSecret self.namespaceName = namespaceName self.setting = setting self.scopes = scopes @@ -24529,12 +24097,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.namespaceName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.namespaceName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: @@ -24546,10 +24114,10 @@ def read(self, iprot): elif fid == 4: if ftype == TType.SET: self.scopes = set() - (_etype498, _size495) = iprot.readSetBegin() - for _i499 in range(_size495): - _elem500 = iprot.readI32() - self.scopes.add(_elem500) + (_etype489, _size486) = iprot.readSetBegin() + for _i490 in range(_size486): + _elem491 = iprot.readI32() + self.scopes.add(_elem491) iprot.readSetEnd() else: iprot.skip(ftype) @@ -24563,9 +24131,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('checkNamespaceIteratorConflicts_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.namespaceName is not None: oprot.writeFieldBegin('namespaceName', TType.STRING, 2) @@ -24578,8 +24146,8 @@ def write(self, oprot): if self.scopes is not None: oprot.writeFieldBegin('scopes', TType.SET, 4) oprot.writeSetBegin(TType.I32, len(self.scopes)) - for iter501 in self.scopes: - oprot.writeI32(iter501) + for iter492 in self.scopes: + oprot.writeI32(iter492) oprot.writeSetEnd() oprot.writeFieldEnd() oprot.writeFieldStop() @@ -24601,7 +24169,7 @@ def __ne__(self, other): all_structs.append(checkNamespaceIteratorConflicts_args) checkNamespaceIteratorConflicts_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'namespaceName', 'UTF8', None, ), # 2 (3, TType.STRUCT, 'setting', [IteratorSetting, None], None, ), # 3 (4, TType.SET, 'scopes', (TType.I32, None, False), None, ), # 4 @@ -24634,20 +24202,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = NamespaceNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = NamespaceNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -24700,15 +24265,15 @@ def __ne__(self, other): class addNamespaceConstraint_args(object): """ Attributes: - - login + - sharedSecret - namespaceName - constraintClassName """ - def __init__(self, login=None, namespaceName=None, constraintClassName=None,): - self.login = login + def __init__(self, sharedSecret=None, namespaceName=None, constraintClassName=None,): + self.sharedSecret = sharedSecret self.namespaceName = namespaceName self.constraintClassName = constraintClassName @@ -24723,17 +24288,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.namespaceName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.namespaceName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.constraintClassName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.constraintClassName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -24746,9 +24311,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('addNamespaceConstraint_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.namespaceName is not None: oprot.writeFieldBegin('namespaceName', TType.STRING, 2) @@ -24777,7 +24342,7 @@ def __ne__(self, other): all_structs.append(addNamespaceConstraint_args) addNamespaceConstraint_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'namespaceName', 'UTF8', None, ), # 2 (3, TType.STRING, 'constraintClassName', 'UTF8', None, ), # 3 ) @@ -24816,20 +24381,17 @@ def read(self, iprot): iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = NamespaceNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = NamespaceNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -24886,15 +24448,15 @@ def __ne__(self, other): class removeNamespaceConstraint_args(object): """ Attributes: - - login + - sharedSecret - namespaceName - id """ - def __init__(self, login=None, namespaceName=None, id=None,): - self.login = login + def __init__(self, sharedSecret=None, namespaceName=None, id=None,): + self.sharedSecret = sharedSecret self.namespaceName = namespaceName self.id = id @@ -24909,12 +24471,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.namespaceName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.namespaceName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: @@ -24932,9 +24494,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('removeNamespaceConstraint_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.namespaceName is not None: oprot.writeFieldBegin('namespaceName', TType.STRING, 2) @@ -24963,7 +24525,7 @@ def __ne__(self, other): all_structs.append(removeNamespaceConstraint_args) removeNamespaceConstraint_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'namespaceName', 'UTF8', None, ), # 2 (3, TType.I32, 'id', None, None, ), # 3 ) @@ -24995,20 +24557,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = NamespaceNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = NamespaceNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -25061,14 +24620,14 @@ def __ne__(self, other): class listNamespaceConstraints_args(object): """ Attributes: - - login + - sharedSecret - namespaceName """ - def __init__(self, login=None, namespaceName=None,): - self.login = login + def __init__(self, sharedSecret=None, namespaceName=None,): + self.sharedSecret = sharedSecret self.namespaceName = namespaceName def read(self, iprot): @@ -25082,12 +24641,12 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.namespaceName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.namespaceName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -25100,9 +24659,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('listNamespaceConstraints_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.namespaceName is not None: oprot.writeFieldBegin('namespaceName', TType.STRING, 2) @@ -25127,7 +24686,7 @@ def __ne__(self, other): all_structs.append(listNamespaceConstraints_args) listNamespaceConstraints_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'namespaceName', 'UTF8', None, ), # 2 ) @@ -25161,30 +24720,27 @@ def read(self, iprot): if fid == 0: if ftype == TType.MAP: self.success = {} - (_ktype503, _vtype504, _size502) = iprot.readMapBegin() - for _i506 in range(_size502): - _key507 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - _val508 = iprot.readI32() - self.success[_key507] = _val508 + (_ktype494, _vtype495, _size493) = iprot.readMapBegin() + for _i497 in range(_size493): + _key498 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + _val499 = iprot.readI32() + self.success[_key498] = _val499 iprot.readMapEnd() else: iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = NamespaceNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = NamespaceNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -25200,9 +24756,9 @@ def write(self, oprot): if self.success is not None: oprot.writeFieldBegin('success', TType.MAP, 0) oprot.writeMapBegin(TType.STRING, TType.I32, len(self.success)) - for kiter509, viter510 in self.success.items(): - oprot.writeString(kiter509.encode('utf-8') if sys.version_info[0] == 2 else kiter509) - oprot.writeI32(viter510) + for kiter500, viter501 in self.success.items(): + oprot.writeString(kiter500.encode('utf-8') if sys.version_info[0] == 2 else kiter500) + oprot.writeI32(viter501) oprot.writeMapEnd() oprot.writeFieldEnd() if self.ouch1 is not None: @@ -25245,7 +24801,7 @@ def __ne__(self, other): class testNamespaceClassLoad_args(object): """ Attributes: - - login + - sharedSecret - namespaceName - className - asTypeName @@ -25253,8 +24809,8 @@ class testNamespaceClassLoad_args(object): """ - def __init__(self, login=None, namespaceName=None, className=None, asTypeName=None,): - self.login = login + def __init__(self, sharedSecret=None, namespaceName=None, className=None, asTypeName=None,): + self.sharedSecret = sharedSecret self.namespaceName = namespaceName self.className = className self.asTypeName = asTypeName @@ -25270,22 +24826,22 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.login = iprot.readBinary() + self.sharedSecret = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.namespaceName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.namespaceName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.className = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.className = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 4: if ftype == TType.STRING: - self.asTypeName = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.asTypeName = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: @@ -25298,9 +24854,9 @@ def write(self, oprot): oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return oprot.writeStructBegin('testNamespaceClassLoad_args') - if self.login is not None: - oprot.writeFieldBegin('login', TType.STRING, 1) - oprot.writeBinary(self.login) + if self.sharedSecret is not None: + oprot.writeFieldBegin('sharedSecret', TType.STRING, 1) + oprot.writeString(self.sharedSecret.encode('utf-8') if sys.version_info[0] == 2 else self.sharedSecret) oprot.writeFieldEnd() if self.namespaceName is not None: oprot.writeFieldBegin('namespaceName', TType.STRING, 2) @@ -25333,7 +24889,7 @@ def __ne__(self, other): all_structs.append(testNamespaceClassLoad_args) testNamespaceClassLoad_args.thrift_spec = ( None, # 0 - (1, TType.STRING, 'login', 'BINARY', None, ), # 1 + (1, TType.STRING, 'sharedSecret', 'UTF8', None, ), # 1 (2, TType.STRING, 'namespaceName', 'UTF8', None, ), # 2 (3, TType.STRING, 'className', 'UTF8', None, ), # 3 (4, TType.STRING, 'asTypeName', 'UTF8', None, ), # 4 @@ -25373,20 +24929,17 @@ def read(self, iprot): iprot.skip(ftype) elif fid == 1: if ftype == TType.STRUCT: - self.ouch1 = AccumuloException() - self.ouch1.read(iprot) + self.ouch1 = AccumuloException.read(iprot) else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRUCT: - self.ouch2 = AccumuloSecurityException() - self.ouch2.read(iprot) + self.ouch2 = AccumuloSecurityException.read(iprot) else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRUCT: - self.ouch3 = NamespaceNotFoundException() - self.ouch3.read(iprot) + self.ouch3 = NamespaceNotFoundException.read(iprot) else: iprot.skip(ftype) else: @@ -25440,4 +24993,3 @@ def __ne__(self, other): ) fix_spec(all_structs) del all_structs - diff --git a/accumulo/thrift/__init__.py b/accumulo/thrift/__init__.py index 0892e2f..336ecfe 100644 --- a/accumulo/thrift/__init__.py +++ b/accumulo/thrift/__init__.py @@ -1,15 +1,17 @@ -# 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 +# 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 +# https://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. +# 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. __all__ = ['ttypes', 'constants', 'AccumuloProxy'] diff --git a/accumulo/thrift/constants.py b/accumulo/thrift/constants.py index 2158f61..6ce1367 100644 --- a/accumulo/thrift/constants.py +++ b/accumulo/thrift/constants.py @@ -1,19 +1,21 @@ -# 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 +# 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 +# https://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. +# 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. # -# Autogenerated by Thrift Compiler (0.12.0) +# Autogenerated by Thrift Compiler (0.17.0) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # diff --git a/accumulo/thrift/ttypes.py b/accumulo/thrift/ttypes.py index 1142b4a..df49b4e 100644 --- a/accumulo/thrift/ttypes.py +++ b/accumulo/thrift/ttypes.py @@ -1,19 +1,21 @@ -# 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 +# 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 +# https://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. +# 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. # -# Autogenerated by Thrift Compiler (0.12.0) +# Autogenerated by Thrift Compiler (0.17.0) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # @@ -564,7 +566,7 @@ def read(self, iprot): self.tables = [] (_etype3, _size0) = iprot.readListBegin() for _i4 in range(_size0): - _elem5 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + _elem5 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() self.tables.append(_elem5) iprot.readListEnd() else: @@ -952,12 +954,12 @@ def read(self, iprot): iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.name = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.name = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.iteratorClass = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.iteratorClass = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 4: @@ -965,8 +967,8 @@ def read(self, iprot): self.properties = {} (_ktype15, _vtype16, _size14) = iprot.readMapBegin() for _i18 in range(_size14): - _key19 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - _val20 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + _key19 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + _val20 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() self.properties[_key19] = _val20 iprot.readMapEnd() else: @@ -1378,7 +1380,7 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.tableId = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.tableId = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: @@ -1847,17 +1849,17 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.client = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.client = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: if ftype == TType.STRING: - self.user = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.user = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 3: if ftype == TType.STRING: - self.table = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.table = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 4: @@ -2053,14 +2055,14 @@ def read(self, iprot): self.inputFiles = [] (_etype124, _size121) = iprot.readListBegin() for _i125 in range(_size121): - _elem126 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + _elem126 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() self.inputFiles.append(_elem126) iprot.readListEnd() else: iprot.skip(ftype) elif fid == 4: if ftype == TType.STRING: - self.outputFile = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.outputFile = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 5: @@ -2075,7 +2077,7 @@ def read(self, iprot): iprot.skip(ftype) elif fid == 7: if ftype == TType.STRING: - self.localityGroup = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.localityGroup = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 8: @@ -2274,7 +2276,7 @@ def __ne__(self, other): return not (self == other) -class CompactionStrategyConfig(object): +class PluginConfig(object): """ Attributes: - className @@ -2298,7 +2300,7 @@ def read(self, iprot): break if fid == 1: if ftype == TType.STRING: - self.className = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + self.className = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) elif fid == 2: @@ -2306,8 +2308,8 @@ def read(self, iprot): self.options = {} (_ktype136, _vtype137, _size135) = iprot.readMapBegin() for _i139 in range(_size135): - _key140 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() - _val141 = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + _key140 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() + _val141 = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() self.options[_key140] = _val141 iprot.readMapEnd() else: @@ -2321,7 +2323,7 @@ def write(self, oprot): if oprot._fast_encode is not None and self.thrift_spec is not None: oprot.trans.write(oprot._fast_encode(self, [self.__class__, self.thrift_spec])) return - oprot.writeStructBegin('CompactionStrategyConfig') + oprot.writeStructBegin('PluginConfig') if self.className is not None: oprot.writeFieldBegin('className', TType.STRING, 1) oprot.writeString(self.className.encode('utf-8') if sys.version_info[0] == 2 else self.className) @@ -2361,26 +2363,39 @@ class UnknownScanner(TException): def __init__(self, msg=None,): - self.msg = msg + super(UnknownScanner, self).__setattr__('msg', msg) - def read(self, iprot): - if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: - iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec]) - return + def __setattr__(self, *args): + raise TypeError("can't modify immutable instance") + + def __delattr__(self, *args): + raise TypeError("can't modify immutable instance") + + def __hash__(self): + return hash(self.__class__) ^ hash((self.msg, )) + + @classmethod + def read(cls, iprot): + if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and cls.thrift_spec is not None: + return iprot._fast_decode(None, iprot, [cls, cls.thrift_spec]) iprot.readStructBegin() + msg = None while True: (fname, ftype, fid) = iprot.readFieldBegin() if ftype == TType.STOP: break if fid == 1: if ftype == TType.STRING: - self.msg = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + msg = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() iprot.readStructEnd() + return cls( + msg=msg, + ) def write(self, oprot): if oprot._fast_encode is not None and self.thrift_spec is not None: @@ -2421,26 +2436,39 @@ class UnknownWriter(TException): def __init__(self, msg=None,): - self.msg = msg + super(UnknownWriter, self).__setattr__('msg', msg) - def read(self, iprot): - if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: - iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec]) - return + def __setattr__(self, *args): + raise TypeError("can't modify immutable instance") + + def __delattr__(self, *args): + raise TypeError("can't modify immutable instance") + + def __hash__(self): + return hash(self.__class__) ^ hash((self.msg, )) + + @classmethod + def read(cls, iprot): + if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and cls.thrift_spec is not None: + return iprot._fast_decode(None, iprot, [cls, cls.thrift_spec]) iprot.readStructBegin() + msg = None while True: (fname, ftype, fid) = iprot.readFieldBegin() if ftype == TType.STOP: break if fid == 1: if ftype == TType.STRING: - self.msg = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + msg = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() iprot.readStructEnd() + return cls( + msg=msg, + ) def write(self, oprot): if oprot._fast_encode is not None and self.thrift_spec is not None: @@ -2481,26 +2509,39 @@ class NoMoreEntriesException(TException): def __init__(self, msg=None,): - self.msg = msg + super(NoMoreEntriesException, self).__setattr__('msg', msg) - def read(self, iprot): - if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: - iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec]) - return + def __setattr__(self, *args): + raise TypeError("can't modify immutable instance") + + def __delattr__(self, *args): + raise TypeError("can't modify immutable instance") + + def __hash__(self): + return hash(self.__class__) ^ hash((self.msg, )) + + @classmethod + def read(cls, iprot): + if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and cls.thrift_spec is not None: + return iprot._fast_decode(None, iprot, [cls, cls.thrift_spec]) iprot.readStructBegin() + msg = None while True: (fname, ftype, fid) = iprot.readFieldBegin() if ftype == TType.STOP: break if fid == 1: if ftype == TType.STRING: - self.msg = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + msg = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() iprot.readStructEnd() + return cls( + msg=msg, + ) def write(self, oprot): if oprot._fast_encode is not None and self.thrift_spec is not None: @@ -2541,26 +2582,39 @@ class AccumuloException(TException): def __init__(self, msg=None,): - self.msg = msg + super(AccumuloException, self).__setattr__('msg', msg) - def read(self, iprot): - if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: - iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec]) - return + def __setattr__(self, *args): + raise TypeError("can't modify immutable instance") + + def __delattr__(self, *args): + raise TypeError("can't modify immutable instance") + + def __hash__(self): + return hash(self.__class__) ^ hash((self.msg, )) + + @classmethod + def read(cls, iprot): + if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and cls.thrift_spec is not None: + return iprot._fast_decode(None, iprot, [cls, cls.thrift_spec]) iprot.readStructBegin() + msg = None while True: (fname, ftype, fid) = iprot.readFieldBegin() if ftype == TType.STOP: break if fid == 1: if ftype == TType.STRING: - self.msg = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + msg = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() iprot.readStructEnd() + return cls( + msg=msg, + ) def write(self, oprot): if oprot._fast_encode is not None and self.thrift_spec is not None: @@ -2601,26 +2655,39 @@ class AccumuloSecurityException(TException): def __init__(self, msg=None,): - self.msg = msg + super(AccumuloSecurityException, self).__setattr__('msg', msg) - def read(self, iprot): - if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: - iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec]) - return + def __setattr__(self, *args): + raise TypeError("can't modify immutable instance") + + def __delattr__(self, *args): + raise TypeError("can't modify immutable instance") + + def __hash__(self): + return hash(self.__class__) ^ hash((self.msg, )) + + @classmethod + def read(cls, iprot): + if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and cls.thrift_spec is not None: + return iprot._fast_decode(None, iprot, [cls, cls.thrift_spec]) iprot.readStructBegin() + msg = None while True: (fname, ftype, fid) = iprot.readFieldBegin() if ftype == TType.STOP: break if fid == 1: if ftype == TType.STRING: - self.msg = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + msg = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() iprot.readStructEnd() + return cls( + msg=msg, + ) def write(self, oprot): if oprot._fast_encode is not None and self.thrift_spec is not None: @@ -2661,26 +2728,39 @@ class TableNotFoundException(TException): def __init__(self, msg=None,): - self.msg = msg + super(TableNotFoundException, self).__setattr__('msg', msg) - def read(self, iprot): - if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: - iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec]) - return + def __setattr__(self, *args): + raise TypeError("can't modify immutable instance") + + def __delattr__(self, *args): + raise TypeError("can't modify immutable instance") + + def __hash__(self): + return hash(self.__class__) ^ hash((self.msg, )) + + @classmethod + def read(cls, iprot): + if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and cls.thrift_spec is not None: + return iprot._fast_decode(None, iprot, [cls, cls.thrift_spec]) iprot.readStructBegin() + msg = None while True: (fname, ftype, fid) = iprot.readFieldBegin() if ftype == TType.STOP: break if fid == 1: if ftype == TType.STRING: - self.msg = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + msg = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() iprot.readStructEnd() + return cls( + msg=msg, + ) def write(self, oprot): if oprot._fast_encode is not None and self.thrift_spec is not None: @@ -2721,26 +2801,39 @@ class TableExistsException(TException): def __init__(self, msg=None,): - self.msg = msg + super(TableExistsException, self).__setattr__('msg', msg) - def read(self, iprot): - if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: - iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec]) - return + def __setattr__(self, *args): + raise TypeError("can't modify immutable instance") + + def __delattr__(self, *args): + raise TypeError("can't modify immutable instance") + + def __hash__(self): + return hash(self.__class__) ^ hash((self.msg, )) + + @classmethod + def read(cls, iprot): + if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and cls.thrift_spec is not None: + return iprot._fast_decode(None, iprot, [cls, cls.thrift_spec]) iprot.readStructBegin() + msg = None while True: (fname, ftype, fid) = iprot.readFieldBegin() if ftype == TType.STOP: break if fid == 1: if ftype == TType.STRING: - self.msg = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + msg = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() iprot.readStructEnd() + return cls( + msg=msg, + ) def write(self, oprot): if oprot._fast_encode is not None and self.thrift_spec is not None: @@ -2781,26 +2874,39 @@ class MutationsRejectedException(TException): def __init__(self, msg=None,): - self.msg = msg + super(MutationsRejectedException, self).__setattr__('msg', msg) - def read(self, iprot): - if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: - iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec]) - return + def __setattr__(self, *args): + raise TypeError("can't modify immutable instance") + + def __delattr__(self, *args): + raise TypeError("can't modify immutable instance") + + def __hash__(self): + return hash(self.__class__) ^ hash((self.msg, )) + + @classmethod + def read(cls, iprot): + if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and cls.thrift_spec is not None: + return iprot._fast_decode(None, iprot, [cls, cls.thrift_spec]) iprot.readStructBegin() + msg = None while True: (fname, ftype, fid) = iprot.readFieldBegin() if ftype == TType.STOP: break if fid == 1: if ftype == TType.STRING: - self.msg = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + msg = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() iprot.readStructEnd() + return cls( + msg=msg, + ) def write(self, oprot): if oprot._fast_encode is not None and self.thrift_spec is not None: @@ -2841,26 +2947,39 @@ class NamespaceExistsException(TException): def __init__(self, msg=None,): - self.msg = msg + super(NamespaceExistsException, self).__setattr__('msg', msg) - def read(self, iprot): - if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: - iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec]) - return + def __setattr__(self, *args): + raise TypeError("can't modify immutable instance") + + def __delattr__(self, *args): + raise TypeError("can't modify immutable instance") + + def __hash__(self): + return hash(self.__class__) ^ hash((self.msg, )) + + @classmethod + def read(cls, iprot): + if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and cls.thrift_spec is not None: + return iprot._fast_decode(None, iprot, [cls, cls.thrift_spec]) iprot.readStructBegin() + msg = None while True: (fname, ftype, fid) = iprot.readFieldBegin() if ftype == TType.STOP: break if fid == 1: if ftype == TType.STRING: - self.msg = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + msg = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() iprot.readStructEnd() + return cls( + msg=msg, + ) def write(self, oprot): if oprot._fast_encode is not None and self.thrift_spec is not None: @@ -2901,26 +3020,39 @@ class NamespaceNotFoundException(TException): def __init__(self, msg=None,): - self.msg = msg + super(NamespaceNotFoundException, self).__setattr__('msg', msg) - def read(self, iprot): - if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: - iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec]) - return + def __setattr__(self, *args): + raise TypeError("can't modify immutable instance") + + def __delattr__(self, *args): + raise TypeError("can't modify immutable instance") + + def __hash__(self): + return hash(self.__class__) ^ hash((self.msg, )) + + @classmethod + def read(cls, iprot): + if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and cls.thrift_spec is not None: + return iprot._fast_decode(None, iprot, [cls, cls.thrift_spec]) iprot.readStructBegin() + msg = None while True: (fname, ftype, fid) = iprot.readFieldBegin() if ftype == TType.STOP: break if fid == 1: if ftype == TType.STRING: - self.msg = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + msg = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() iprot.readStructEnd() + return cls( + msg=msg, + ) def write(self, oprot): if oprot._fast_encode is not None and self.thrift_spec is not None: @@ -2961,26 +3093,39 @@ class NamespaceNotEmptyException(TException): def __init__(self, msg=None,): - self.msg = msg + super(NamespaceNotEmptyException, self).__setattr__('msg', msg) - def read(self, iprot): - if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and self.thrift_spec is not None: - iprot._fast_decode(self, iprot, [self.__class__, self.thrift_spec]) - return + def __setattr__(self, *args): + raise TypeError("can't modify immutable instance") + + def __delattr__(self, *args): + raise TypeError("can't modify immutable instance") + + def __hash__(self): + return hash(self.__class__) ^ hash((self.msg, )) + + @classmethod + def read(cls, iprot): + if iprot._fast_decode is not None and isinstance(iprot.trans, TTransport.CReadableTransport) and cls.thrift_spec is not None: + return iprot._fast_decode(None, iprot, [cls, cls.thrift_spec]) iprot.readStructBegin() + msg = None while True: (fname, ftype, fid) = iprot.readFieldBegin() if ftype == TType.STOP: break if fid == 1: if ftype == TType.STRING: - self.msg = iprot.readString().decode('utf-8') if sys.version_info[0] == 2 else iprot.readString() + msg = iprot.readString().decode('utf-8', errors='replace') if sys.version_info[0] == 2 else iprot.readString() else: iprot.skip(ftype) else: iprot.skip(ftype) iprot.readFieldEnd() iprot.readStructEnd() + return cls( + msg=msg, + ) def write(self, oprot): if oprot._fast_encode is not None and self.thrift_spec is not None: @@ -3169,8 +3314,8 @@ def __ne__(self, other): (4, TType.I32, 'threads', None, None, ), # 4 (5, TType.I32, 'durability', None, None, ), # 5 ) -all_structs.append(CompactionStrategyConfig) -CompactionStrategyConfig.thrift_spec = ( +all_structs.append(PluginConfig) +PluginConfig.thrift_spec = ( None, # 0 (1, TType.STRING, 'className', 'UTF8', None, ), # 1 (2, TType.MAP, 'options', (TType.STRING, 'UTF8', TType.STRING, 'UTF8', False), None, ), # 2 diff --git a/setup.py b/setup.py index b0db00a..8b00f6d 100644 --- a/setup.py +++ b/setup.py @@ -2,14 +2,14 @@ setup( name='accumulo', - version='0.3.0', + version='2.1.1', packages=find_packages(), url='https://github.com/NationalSecurityAgency/accumulo-python3', author='National Security Agency', author_email='/dev/null', description='Build Python 3 applications that integrate with Apache Accumulo', install_requires=[ - 'thrift>=0.13.0' + 'thrift>=0.16.0' # Update to thrift 0.17.0, pending https://issues.apache.org/jira/browse/THRIFT-5688 ], extras_require={ 'replication': [