http://git-wip-us.apache.org/repos/asf/accumulo/blob/3af75fc6/proxy/src/main/python/AccumuloProxy.py ---------------------------------------------------------------------- diff --git a/proxy/src/main/python/AccumuloProxy.py b/proxy/src/main/python/AccumuloProxy.py index 2805fff..83c216c 100644 --- a/proxy/src/main/python/AccumuloProxy.py +++ b/proxy/src/main/python/AccumuloProxy.py @@ -13,7 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# Autogenerated by Thrift Compiler (0.9.1) +# Autogenerated by Thrift Compiler (0.9.3) # # DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING # @@ -21,6 +21,7 @@ # from thrift.Thrift import TType, TMessageType, TException, TApplicationException +import logging from ttypes import * from thrift.Thrift import TProcessor from thrift.transport import TTransport @@ -736,20 +737,21 @@ class Client(Iface): self._oprot.trans.flush() def recv_login(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = login_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch2 is not None: raise result.ouch2 - raise TApplicationException(TApplicationException.MISSING_RESULT, "login failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "login failed: unknown result") def addConstraint(self, login, tableName, constraintClassName): """ @@ -772,15 +774,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_addConstraint(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = addConstraint_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: @@ -789,7 +792,7 @@ class Client(Iface): raise result.ouch2 if result.ouch3 is not None: raise result.ouch3 - raise TApplicationException(TApplicationException.MISSING_RESULT, "addConstraint failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "addConstraint failed: unknown result") def addSplits(self, login, tableName, splits): """ @@ -812,15 +815,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_addSplits(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = addSplits_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -852,15 +856,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_attachIterator(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = attachIterator_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -892,15 +897,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_checkIteratorConflicts(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = checkIteratorConflicts_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -928,15 +934,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_clearLocatorCache(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = clearLocatorCache_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 return @@ -968,15 +975,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_cloneTable(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = cloneTable_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -1018,15 +1026,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_compactTable(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = compactTable_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -1054,15 +1063,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_cancelCompaction(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = cancelCompaction_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -1094,15 +1104,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_createTable(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = createTable_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -1130,15 +1141,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_deleteTable(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = deleteTable_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -1170,15 +1182,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_deleteRows(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = deleteRows_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -1208,15 +1221,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_exportTable(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = exportTable_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -1250,15 +1264,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_flushTable(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = flushTable_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -1286,15 +1301,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_getDiskUsage(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = getDiskUsage_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: @@ -1303,7 +1319,7 @@ class Client(Iface): raise result.ouch2 if result.ouch3 is not None: raise result.ouch3 - raise TApplicationException(TApplicationException.MISSING_RESULT, "getDiskUsage failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "getDiskUsage failed: unknown result") def getLocalityGroups(self, login, tableName): """ @@ -1324,15 +1340,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_getLocalityGroups(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = getLocalityGroups_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: @@ -1341,7 +1358,7 @@ class Client(Iface): raise result.ouch2 if result.ouch3 is not None: raise result.ouch3 - raise TApplicationException(TApplicationException.MISSING_RESULT, "getLocalityGroups failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "getLocalityGroups failed: unknown result") def getIteratorSetting(self, login, tableName, iteratorName, scope): """ @@ -1366,15 +1383,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_getIteratorSetting(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = getIteratorSetting_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: @@ -1383,7 +1401,7 @@ class Client(Iface): raise result.ouch2 if result.ouch3 is not None: raise result.ouch3 - raise TApplicationException(TApplicationException.MISSING_RESULT, "getIteratorSetting failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "getIteratorSetting failed: unknown result") def getMaxRow(self, login, tableName, auths, startRow, startInclusive, endRow, endInclusive): """ @@ -1414,15 +1432,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_getMaxRow(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = getMaxRow_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: @@ -1431,7 +1450,7 @@ class Client(Iface): raise result.ouch2 if result.ouch3 is not None: raise result.ouch3 - raise TApplicationException(TApplicationException.MISSING_RESULT, "getMaxRow failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "getMaxRow failed: unknown result") def getTableProperties(self, login, tableName): """ @@ -1452,15 +1471,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_getTableProperties(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = getTableProperties_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: @@ -1469,7 +1489,7 @@ class Client(Iface): raise result.ouch2 if result.ouch3 is not None: raise result.ouch3 - raise TApplicationException(TApplicationException.MISSING_RESULT, "getTableProperties failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "getTableProperties failed: unknown result") def importDirectory(self, login, tableName, importDir, failureDir, setTime): """ @@ -1496,15 +1516,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_importDirectory(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = importDirectory_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch3 is not None: @@ -1534,15 +1555,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_importTable(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = importTable_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -1572,15 +1594,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_listSplits(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = listSplits_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: @@ -1589,7 +1612,7 @@ class Client(Iface): raise result.ouch2 if result.ouch3 is not None: raise result.ouch3 - raise TApplicationException(TApplicationException.MISSING_RESULT, "listSplits failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "listSplits failed: unknown result") def listTables(self, login): """ @@ -1608,18 +1631,19 @@ class Client(Iface): self._oprot.trans.flush() def recv_listTables(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = listTables_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success - raise TApplicationException(TApplicationException.MISSING_RESULT, "listTables failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "listTables failed: unknown result") def listIterators(self, login, tableName): """ @@ -1640,15 +1664,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_listIterators(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = listIterators_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: @@ -1657,7 +1682,7 @@ class Client(Iface): raise result.ouch2 if result.ouch3 is not None: raise result.ouch3 - raise TApplicationException(TApplicationException.MISSING_RESULT, "listIterators failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "listIterators failed: unknown result") def listConstraints(self, login, tableName): """ @@ -1678,15 +1703,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_listConstraints(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = listConstraints_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: @@ -1695,7 +1721,7 @@ class Client(Iface): raise result.ouch2 if result.ouch3 is not None: raise result.ouch3 - raise TApplicationException(TApplicationException.MISSING_RESULT, "listConstraints failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "listConstraints failed: unknown result") def mergeTablets(self, login, tableName, startRow, endRow): """ @@ -1720,15 +1746,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_mergeTablets(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = mergeTablets_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -1758,15 +1785,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_offlineTable(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = offlineTable_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -1796,15 +1824,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_onlineTable(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = onlineTable_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -1834,15 +1863,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_removeConstraint(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = removeConstraint_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -1874,15 +1904,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_removeIterator(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = removeIterator_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -1912,15 +1943,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_removeTableProperty(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = removeTableProperty_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -1950,15 +1982,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_renameTable(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = renameTable_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -1990,15 +2023,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_setLocalityGroups(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = setLocalityGroups_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -2030,15 +2064,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_setTableProperty(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = setTableProperty_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -2070,15 +2105,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_splitRangeByTablets(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = splitRangeByTablets_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: @@ -2087,7 +2123,7 @@ class Client(Iface): raise result.ouch2 if result.ouch3 is not None: raise result.ouch3 - raise TApplicationException(TApplicationException.MISSING_RESULT, "splitRangeByTablets failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "splitRangeByTablets failed: unknown result") def tableExists(self, login, tableName): """ @@ -2108,18 +2144,19 @@ class Client(Iface): self._oprot.trans.flush() def recv_tableExists(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = tableExists_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success - raise TApplicationException(TApplicationException.MISSING_RESULT, "tableExists failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "tableExists failed: unknown result") def tableIdMap(self, login): """ @@ -2138,18 +2175,19 @@ class Client(Iface): self._oprot.trans.flush() def recv_tableIdMap(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = tableIdMap_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success - raise TApplicationException(TApplicationException.MISSING_RESULT, "tableIdMap failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "tableIdMap failed: unknown result") def testTableClassLoad(self, login, tableName, className, asTypeName): """ @@ -2174,15 +2212,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_testTableClassLoad(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = testTableClassLoad_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: @@ -2191,7 +2230,7 @@ class Client(Iface): raise result.ouch2 if result.ouch3 is not None: raise result.ouch3 - raise TApplicationException(TApplicationException.MISSING_RESULT, "testTableClassLoad failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "testTableClassLoad failed: unknown result") def pingTabletServer(self, login, tserver): """ @@ -2212,15 +2251,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_pingTabletServer(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = pingTabletServer_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -2246,22 +2286,23 @@ class Client(Iface): self._oprot.trans.flush() def recv_getActiveScans(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = getActiveScans_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: raise result.ouch2 - raise TApplicationException(TApplicationException.MISSING_RESULT, "getActiveScans failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "getActiveScans failed: unknown result") def getActiveCompactions(self, login, tserver): """ @@ -2282,22 +2323,23 @@ class Client(Iface): self._oprot.trans.flush() def recv_getActiveCompactions(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = getActiveCompactions_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: raise result.ouch2 - raise TApplicationException(TApplicationException.MISSING_RESULT, "getActiveCompactions failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "getActiveCompactions failed: unknown result") def getSiteConfiguration(self, login): """ @@ -2316,22 +2358,23 @@ class Client(Iface): self._oprot.trans.flush() def recv_getSiteConfiguration(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = getSiteConfiguration_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: raise result.ouch2 - raise TApplicationException(TApplicationException.MISSING_RESULT, "getSiteConfiguration failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "getSiteConfiguration failed: unknown result") def getSystemConfiguration(self, login): """ @@ -2350,22 +2393,23 @@ class Client(Iface): self._oprot.trans.flush() def recv_getSystemConfiguration(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = getSystemConfiguration_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: raise result.ouch2 - raise TApplicationException(TApplicationException.MISSING_RESULT, "getSystemConfiguration failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "getSystemConfiguration failed: unknown result") def getTabletServers(self, login): """ @@ -2384,18 +2428,19 @@ class Client(Iface): self._oprot.trans.flush() def recv_getTabletServers(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = getTabletServers_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success - raise TApplicationException(TApplicationException.MISSING_RESULT, "getTabletServers failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "getTabletServers failed: unknown result") def removeProperty(self, login, property): """ @@ -2416,15 +2461,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_removeProperty(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = removeProperty_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -2452,15 +2498,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_setProperty(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = setProperty_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -2488,22 +2535,23 @@ class Client(Iface): self._oprot.trans.flush() def recv_testClassLoad(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = testClassLoad_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: raise result.ouch2 - raise TApplicationException(TApplicationException.MISSING_RESULT, "testClassLoad failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "testClassLoad failed: unknown result") def authenticateUser(self, login, user, properties): """ @@ -2526,22 +2574,23 @@ class Client(Iface): self._oprot.trans.flush() def recv_authenticateUser(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = authenticateUser_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: raise result.ouch2 - raise TApplicationException(TApplicationException.MISSING_RESULT, "authenticateUser failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "authenticateUser failed: unknown result") def changeUserAuthorizations(self, login, user, authorizations): """ @@ -2564,15 +2613,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_changeUserAuthorizations(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = changeUserAuthorizations_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -2600,15 +2650,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_changeLocalUserPassword(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = changeLocalUserPassword_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -2636,15 +2687,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_createLocalUser(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = createLocalUser_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -2670,15 +2722,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_dropLocalUser(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = dropLocalUser_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -2704,22 +2757,23 @@ class Client(Iface): self._oprot.trans.flush() def recv_getUserAuthorizations(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = getUserAuthorizations_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: raise result.ouch2 - raise TApplicationException(TApplicationException.MISSING_RESULT, "getUserAuthorizations failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "getUserAuthorizations failed: unknown result") def grantSystemPermission(self, login, user, perm): """ @@ -2742,15 +2796,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_grantSystemPermission(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = grantSystemPermission_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -2780,15 +2835,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_grantTablePermission(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = grantTablePermission_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -2818,22 +2874,23 @@ class Client(Iface): self._oprot.trans.flush() def recv_hasSystemPermission(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = hasSystemPermission_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: raise result.ouch2 - raise TApplicationException(TApplicationException.MISSING_RESULT, "hasSystemPermission failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "hasSystemPermission failed: unknown result") def hasTablePermission(self, login, user, table, perm): """ @@ -2858,15 +2915,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_hasTablePermission(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = hasTablePermission_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: @@ -2875,7 +2933,7 @@ class Client(Iface): raise result.ouch2 if result.ouch3 is not None: raise result.ouch3 - raise TApplicationException(TApplicationException.MISSING_RESULT, "hasTablePermission failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "hasTablePermission failed: unknown result") def listLocalUsers(self, login): """ @@ -2894,15 +2952,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_listLocalUsers(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = listLocalUsers_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: @@ -2911,7 +2970,7 @@ class Client(Iface): raise result.ouch2 if result.ouch3 is not None: raise result.ouch3 - raise TApplicationException(TApplicationException.MISSING_RESULT, "listLocalUsers failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "listLocalUsers failed: unknown result") def revokeSystemPermission(self, login, user, perm): """ @@ -2934,15 +2993,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_revokeSystemPermission(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = revokeSystemPermission_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -2972,15 +3032,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_revokeTablePermission(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = revokeTablePermission_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -3010,15 +3071,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_createBatchScanner(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = createBatchScanner_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: @@ -3027,7 +3089,7 @@ class Client(Iface): raise result.ouch2 if result.ouch3 is not None: raise result.ouch3 - raise TApplicationException(TApplicationException.MISSING_RESULT, "createBatchScanner failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "createBatchScanner failed: unknown result") def createScanner(self, login, tableName, options): """ @@ -3050,15 +3112,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_createScanner(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = createScanner_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: @@ -3067,7 +3130,7 @@ class Client(Iface): raise result.ouch2 if result.ouch3 is not None: raise result.ouch3 - raise TApplicationException(TApplicationException.MISSING_RESULT, "createScanner failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "createScanner failed: unknown result") def hasNext(self, scanner): """ @@ -3086,20 +3149,21 @@ class Client(Iface): self._oprot.trans.flush() def recv_hasNext(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = hasNext_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: raise result.ouch1 - raise TApplicationException(TApplicationException.MISSING_RESULT, "hasNext failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "hasNext failed: unknown result") def nextEntry(self, scanner): """ @@ -3118,15 +3182,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_nextEntry(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = nextEntry_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: @@ -3135,7 +3200,7 @@ class Client(Iface): raise result.ouch2 if result.ouch3 is not None: raise result.ouch3 - raise TApplicationException(TApplicationException.MISSING_RESULT, "nextEntry failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "nextEntry failed: unknown result") def nextK(self, scanner, k): """ @@ -3156,15 +3221,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_nextK(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = nextK_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: @@ -3173,7 +3239,7 @@ class Client(Iface): raise result.ouch2 if result.ouch3 is not None: raise result.ouch3 - raise TApplicationException(TApplicationException.MISSING_RESULT, "nextK failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "nextK failed: unknown result") def closeScanner(self, scanner): """ @@ -3192,15 +3258,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_closeScanner(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = closeScanner_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 return @@ -3226,15 +3293,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_updateAndFlush(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = updateAndFlush_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.outch1 is not None: raise result.outch1 if result.ouch2 is not None: @@ -3266,15 +3334,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_createWriter(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = createWriter_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.outch1 is not None: @@ -3283,7 +3352,7 @@ class Client(Iface): raise result.ouch2 if result.ouch3 is not None: raise result.ouch3 - raise TApplicationException(TApplicationException.MISSING_RESULT, "createWriter failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "createWriter failed: unknown result") def update(self, writer, cells): """ @@ -3294,7 +3363,7 @@ class Client(Iface): self.send_update(writer, cells) def send_update(self, writer, cells): - self._oprot.writeMessageBegin('update', TMessageType.CALL, self._seqid) + self._oprot.writeMessageBegin('update', TMessageType.ONEWAY, self._seqid) args = update_args() args.writer = writer args.cells = cells @@ -3318,15 +3387,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_flush(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = flush_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -3350,15 +3420,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_closeWriter(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = closeWriter_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.ouch1 is not None: raise result.ouch1 if result.ouch2 is not None: @@ -3388,15 +3459,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_updateRowConditionally(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = updateRowConditionally_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: @@ -3405,7 +3477,7 @@ class Client(Iface): raise result.ouch2 if result.ouch3 is not None: raise result.ouch3 - raise TApplicationException(TApplicationException.MISSING_RESULT, "updateRowConditionally failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "updateRowConditionally failed: unknown result") def createConditionalWriter(self, login, tableName, options): """ @@ -3428,15 +3500,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_createConditionalWriter(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = createConditionalWriter_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: @@ -3445,7 +3518,7 @@ class Client(Iface): raise result.ouch2 if result.ouch3 is not None: raise result.ouch3 - raise TApplicationException(TApplicationException.MISSING_RESULT, "createConditionalWriter failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "createConditionalWriter failed: unknown result") def updateRowsConditionally(self, conditionalWriter, updates): """ @@ -3466,15 +3539,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_updateRowsConditionally(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = updateRowsConditionally_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success if result.ouch1 is not None: @@ -3483,7 +3557,7 @@ class Client(Iface): raise result.ouch2 if result.ouch3 is not None: raise result.ouch3 - raise TApplicationException(TApplicationException.MISSING_RESULT, "updateRowsConditionally failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "updateRowsConditionally failed: unknown result") def closeConditionalWriter(self, conditionalWriter): """ @@ -3502,15 +3576,16 @@ class Client(Iface): self._oprot.trans.flush() def recv_closeConditionalWriter(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = closeConditionalWriter_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() return def getRowRange(self, row): @@ -3530,18 +3605,19 @@ class Client(Iface): self._oprot.trans.flush() def recv_getRowRange(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = getRowRange_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success - raise TApplicationException(TApplicationException.MISSING_RESULT, "getRowRange failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "getRowRange failed: unknown result") def getFollowing(self, key, part): """ @@ -3562,18 +3638,19 @@ class Client(Iface): self._oprot.trans.flush() def recv_getFollowing(self): - (fname, mtype, rseqid) = self._iprot.readMessageBegin() + iprot = self._iprot + (fname, mtype, rseqid) = iprot.readMessageBegin() if mtype == TMessageType.EXCEPTION: x = TApplicationException() - x.read(self._iprot) - self._iprot.readMessageEnd() + x.read(iprot) + iprot.readMessageEnd() raise x result = getFollowing_result() - result.read(self._iprot) - self._iprot.readMessageEnd() + result.read(iprot) + iprot.readMessageEnd() if result.success is not None: return result.success - raise TApplicationException(TApplicationException.MISSING_RESULT, "getFollowing failed: unknown result"); + raise TApplicationException(TApplicationException.MISSING_RESULT, "getFollowing failed: unknown result") class Processor(Iface, TProcessor): @@ -3680,9 +3757,17 @@ class Processor(Iface, TProcessor): result = login_result() try: result.success = self._handler.login(args.principal, args.loginProperties) - except AccumuloSecurityException, ouch2: + msg_type = TMessageType.REPLY + except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): + raise + except AccumuloSecurityException as ouch2: + msg_type = TMessageType.REPLY result.ouch2 = ouch2 - oprot.writeMessageBegin("login", TMessageType.REPLY, seqid) + except Exception as ex: + msg_type = TMessageType.EXCEPTION + logging.exception(ex) + result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error') + oprot.writeMessageBegin("login", msg_type, seqid) result.write(oprot) oprot.writeMessageEnd() oprot.trans.flush() @@ -3694,13 +3779,23 @@ class Processor(Iface, TProcessor): result = addConstraint_result() try: result.success = self._handler.addConstraint(args.login, args.tableName, args.constraintClassName) - except AccumuloException, ouch1: + msg_type = TMessageType.REPLY + except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): + raise + except AccumuloException as ouch1: + msg_type = TMessageType.REPLY result.ouch1 = ouch1 - except AccumuloSecurityException, ouch2: + except AccumuloSecurityException as ouch2: + msg_type = TMessageType.REPLY result.ouch2 = ouch2 - except TableNotFoundException, ouch3: + except TableNotFoundException as ouch3: + msg_type = TMessageType.REPLY result.ouch3 = ouch3 - oprot.writeMessageBegin("addConstraint", TMessageType.REPLY, seqid) + except Exception as ex: + msg_type = TMessageType.EXCEPTION + logging.exception(ex) + result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error') + oprot.writeMessageBegin("addConstraint", msg_type, seqid) result.write(oprot) oprot.writeMessageEnd() oprot.trans.flush() @@ -3712,13 +3807,23 @@ class Processor(Iface, TProcessor): result = addSplits_result() try: self._handler.addSplits(args.login, args.tableName, args.splits) - except AccumuloException, ouch1: + msg_type = TMessageType.REPLY + except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): + raise + except AccumuloException as ouch1: + msg_type = TMessageType.REPLY result.ouch1 = ouch1 - except AccumuloSecurityException, ouch2: + except AccumuloSecurityException as ouch2: + msg_type = TMessageType.REPLY result.ouch2 = ouch2 - except TableNotFoundException, ouch3: + except TableNotFoundException as ouch3: + msg_type = TMessageType.REPLY result.ouch3 = ouch3 - oprot.writeMessageBegin("addSplits", TMessageType.REPLY, seqid) + except Exception as ex: + msg_type = TMessageType.EXCEPTION + logging.exception(ex) + result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error') + oprot.writeMessageBegin("addSplits", msg_type, seqid) result.write(oprot) oprot.writeMessageEnd() oprot.trans.flush() @@ -3730,13 +3835,23 @@ class Processor(Iface, TProcessor): result = attachIterator_result() try: self._handler.attachIterator(args.login, args.tableName, args.setting, args.scopes) - except AccumuloSecurityException, ouch1: + msg_type = TMessageType.REPLY + except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): + raise + except AccumuloSecurityException as ouch1: + msg_type = TMessageType.REPLY result.ouch1 = ouch1 - except AccumuloException, ouch2: + except AccumuloException as ouch2: + msg_type = TMessageType.REPLY result.ouch2 = ouch2 - except TableNotFoundException, ouch3: + except TableNotFoundException as ouch3: + msg_type = TMessageType.REPLY result.ouch3 = ouch3 - oprot.writeMessageBegin("attachIterator", TMessageType.REPLY, seqid) + except Exception as ex: + msg_type = TMessageType.EXCEPTION + logging.exception(ex) + result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error') + oprot.writeMessageBegin("attachIterator", msg_type, seqid) result.write(oprot) oprot.writeMessageEnd() oprot.trans.flush() @@ -3748,13 +3863,23 @@ class Processor(Iface, TProcessor): result = checkIteratorConflicts_result() try: self._handler.checkIteratorConflicts(args.login, args.tableName, args.setting, args.scopes) - except AccumuloSecurityException, ouch1: + msg_type = TMessageType.REPLY + except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): + raise + except AccumuloSecurityException as ouch1: + msg_type = TMessageType.REPLY result.ouch1 = ouch1 - except AccumuloException, ouch2: + except AccumuloException as ouch2: + msg_type = TMessageType.REPLY result.ouch2 = ouch2 - except TableNotFoundException, ouch3: + except TableNotFoundException as ouch3: + msg_type = TMessageType.REPLY result.ouch3 = ouch3 - oprot.writeMessageBegin("checkIteratorConflicts", TMessageType.REPLY, seqid) + except Exception as ex: + msg_type = TMessageType.EXCEPTION + logging.exception(ex) + result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error') + oprot.writeMessageBegin("checkIteratorConflicts", msg_type, seqid) result.write(oprot) oprot.writeMessageEnd() oprot.trans.flush() @@ -3766,9 +3891,17 @@ class Processor(Iface, TProcessor): result = clearLocatorCache_result() try: self._handler.clearLocatorCache(args.login, args.tableName) - except TableNotFoundException, ouch1: + msg_type = TMessageType.REPLY + except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): + raise + except TableNotFoundException as ouch1: + msg_type = TMessageType.REPLY result.ouch1 = ouch1 - oprot.writeMessageBegin("clearLocatorCache", TMessageType.REPLY, seqid) + except Exception as ex: + msg_type = TMessageType.EXCEPTION + logging.exception(ex) + result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error') + oprot.writeMessageBegin("clearLocatorCache", msg_type, seqid) result.write(oprot) oprot.writeMessageEnd() oprot.trans.flush() @@ -3780,15 +3913,26 @@ class Processor(Iface, TProcessor): result = cloneTable_result() try: self._handler.cloneTable(args.login, args.tableName, args.newTableName, args.flush, args.propertiesToSet, args.propertiesToExclude) - except AccumuloException, ouch1: + msg_type = TMessageType.REPLY + except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): + raise + except AccumuloException as ouch1: + msg_type = TMessageType.REPLY result.ouch1 = ouch1 - except AccumuloSecurityException, ouch2: + except AccumuloSecurityException as ouch2: + msg_type = TMessageType.REPLY result.ouch2 = ouch2 - except TableNotFoundException, ouch3: + except TableNotFoundException as ouch3: + msg_type = TMessageType.REPLY result.ouch3 = ouch3 - except TableExistsException, ouch4: + except TableExistsException as ouch4: + msg_type = TMessageType.REPLY result.ouch4 = ouch4 - oprot.writeMessageBegin("cloneTable", TMessageType.REPLY, seqid) + except Exception as ex: + msg_type = TMessageType.EXCEPTION + logging.exception(ex) + result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error') + oprot.writeMessageBegin("cloneTable", msg_type, seqid) result.write(oprot) oprot.writeMessageEnd() oprot.trans.flush() @@ -3800,13 +3944,23 @@ class Processor(Iface, TProcessor): result = compactTable_result() try: self._handler.compactTable(args.login, args.tableName, args.startRow, args.endRow, args.iterators, args.flush, args.wait, args.compactionStrategy) - except AccumuloSecurityException, ouch1: + msg_type = TMessageType.REPLY + except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): + raise + except AccumuloSecurityException as ouch1: + msg_type = TMessageType.REPLY result.ouch1 = ouch1 - except TableNotFoundException, ouch2: + except TableNotFoundException as ouch2: + msg_type = TMessageType.REPLY result.ouch2 = ouch2 - except AccumuloException, ouch3: + except AccumuloException as ouch3: + msg_type = TMessageType.REPLY result.ouch3 = ouch3 - oprot.writeMessageBegin("compactTable", TMessageType.REPLY, seqid) + except Exception as ex: + msg_type = TMessageType.EXCEPTION + logging.exception(ex) + result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error') + oprot.writeMessageBegin("compactTable", msg_type, seqid) result.write(oprot) oprot.writeMessageEnd() oprot.trans.flush() @@ -3818,13 +3972,23 @@ class Processor(Iface, TProcessor): result = cancelCompaction_result() try: self._handler.cancelCompaction(args.login, args.tableName) - except AccumuloSecurityException, ouch1: + msg_type = TMessageType.REPLY + except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): + raise + except AccumuloSecurityException as ouch1: + msg_type = TMessageType.REPLY result.ouch1 = ouch1 - except TableNotFoundException, ouch2: + except TableNotFoundException as ouch2: + msg_type = TMessageType.REPLY result.ouch2 = ouch2 - except AccumuloException, ouch3: + except AccumuloException as ouch3: + msg_type = TMessageType.REPLY result.ouch3 = ouch3 - oprot.writeMessageBegin("cancelCompaction", TMessageType.REPLY, seqid) + except Exception as ex: + msg_type = TMessageType.EXCEPTION + logging.exception(ex) + result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error') + oprot.writeMessageBegin("cancelCompaction", msg_type, seqid) result.write(oprot) oprot.writeMessageEnd() oprot.trans.flush() @@ -3836,13 +4000,23 @@ class Processor(Iface, TProcessor): result = createTable_result() try: self._handler.createTable(args.login, args.tableName, args.versioningIter, args.type) - except AccumuloException, ouch1: + msg_type = TMessageType.REPLY + except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): + raise + except AccumuloException as ouch1: + msg_type = TMessageType.REPLY result.ouch1 = ouch1 - except AccumuloSecurityException, ouch2: + except AccumuloSecurityException as ouch2: + msg_type = TMessageType.REPLY result.ouch2 = ouch2 - except TableExistsException, ouch3: + except TableExistsException as ouch3: + msg_type = TMessageType.REPLY result.ouch3 = ouch3 - oprot.writeMessageBegin("createTable", TMessageType.REPLY, seqid) + except Exception as ex: + msg_type = TMessageType.EXCEPTION + logging.exception(ex) + result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error') + oprot.writeMessageBegin("createTable", msg_type, seqid) result.write(oprot) oprot.writeMessageEnd() oprot.trans.flush() @@ -3854,13 +4028,23 @@ class Processor(Iface, TProcessor): result = deleteTable_result() try: self._handler.deleteTable(args.login, args.tableName) - except AccumuloException, ouch1: + msg_type = TMessageType.REPLY + except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): + raise + except AccumuloException as ouch1: + msg_type = TMessageType.REPLY result.ouch1 = ouch1 - except AccumuloSecurityException, ouch2: + except AccumuloSecurityException as ouch2: + msg_type = TMessageType.REPLY result.ouch2 = ouch2 - except TableNotFoundException, ouch3: + except TableNotFoundException as ouch3: + msg_type = TMessageType.REPLY result.ouch3 = ouch3 - oprot.writeMessageBegin("deleteTable", TMessageType.REPLY, seqid) + except Exception as ex: + msg_type = TMessageType.EXCEPTION + logging.exception(ex) + result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error') + oprot.writeMessageBegin("deleteTable", msg_type, seqid) result.write(oprot) oprot.writeMessageEnd() oprot.trans.flush() @@ -3872,13 +4056,23 @@ class Processor(Iface, TProcessor): result = deleteRows_result() try: self._handler.deleteRows(args.login, args.tableName, args.startRow, args.endRow) - except AccumuloException, ouch1: + msg_type = TMessageType.REPLY + except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): + raise + except AccumuloException as ouch1: + msg_type = TMessageType.REPLY result.ouch1 = ouch1 - except AccumuloSecurityException, ouch2: + except AccumuloSecurityException as ouch2: + msg_type = TMessageType.REPLY result.ouch2 = ouch2 - except TableNotFoundException, ouch3: + except TableNotFoundException as ouch3: + msg_type = TMessageType.REPLY result.ouch3 = ouch3 - oprot.writeMessageBegin("deleteRows", TMessageType.REPLY, seqid) + except Exception as ex: + msg_type = TMessageType.EXCEPTION + logging.exception(ex) + result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error') + oprot.writeMessageBegin("deleteRows", msg_type, seqid) result.write(oprot) oprot.writeMessageEnd() oprot.trans.flush() @@ -3890,13 +4084,23 @@ class Processor(Iface, TProcessor): result = exportTable_result() try: self._handler.exportTable(args.login, args.tableName, args.exportDir) - except AccumuloException, ouch1: + msg_type = TMessageType.REPLY + except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): + raise + except AccumuloException as ouch1: + msg_type = TMessageType.REPLY result.ouch1 = ouch1 - except AccumuloSecurityException, ouch2: + except AccumuloSecurityException as ouch2: + msg_type = TMessageType.REPLY result.ouch2 = ouch2 - except TableNotFoundException, ouch3: + except TableNotFoundException as ouch3: + msg_type = TMessageType.REPLY result.ouch3 = ouch3 - oprot.writeMessageBegin("exportTable", TMessageType.REPLY, seqid) + except Exception as ex: + msg_type = TMessageType.EXCEPTION + logging.exception(ex) + result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error') + oprot.writeMessageBegin("exportTable", msg_type, seqid) result.write(oprot) oprot.writeMessageEnd() oprot.trans.flush() @@ -3908,13 +4112,23 @@ class Processor(Iface, TProcessor): result = flushTable_result() try: self._handler.flushTable(args.login, args.tableName, args.startRow, args.endRow, args.wait) - except AccumuloException, ouch1: + msg_type = TMessageType.REPLY + except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): + raise + except AccumuloException as ouch1: + msg_type = TMessageType.REPLY result.ouch1 = ouch1 - except AccumuloSecurityException, ouch2: + except AccumuloSecurityException as ouch2: + msg_type = TMessageType.REPLY result.ouch2 = ouch2 - except TableNotFoundException, ouch3: + except TableNotFoundException as ouch3: + msg_type = TMessageType.REPLY result.ouch3 = ouch3 - oprot.writeMessageBegin("flushTable", TMessageType.REPLY, seqid) + except Exception as ex: + msg_type = TMessageType.EXCEPTION + logging.exception(ex) + result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error') + oprot.writeMessageBegin("flushTable", msg_type, seqid) result.write(oprot) oprot.writeMessageEnd() oprot.trans.flush() @@ -3926,13 +4140,23 @@ class Processor(Iface, TProcessor): result = getDiskUsage_result() try: result.success = self._handler.getDiskUsage(args.login, args.tables) - except AccumuloException, ouch1: + msg_type = TMessageType.REPLY + except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): + raise + except AccumuloException as ouch1: + msg_type = TMessageType.REPLY result.ouch1 = ouch1 - except AccumuloSecurityException, ouch2: + except AccumuloSecurityException as ouch2: + msg_type = TMessageType.REPLY result.ouch2 = ouch2 - except TableNotFoundException, ouch3: + except TableNotFoundException as ouch3: + msg_type = TMessageType.REPLY result.ouch3 = ouch3 - oprot.writeMessageBegin("getDiskUsage", TMessageType.REPLY, seqid) + except Exception as ex: + msg_type = TMessageType.EXCEPTION + logging.exception(ex) + result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error') + oprot.writeMessageBegin("getDiskUsage", msg_type, seqid) result.write(oprot) oprot.writeMessageEnd() oprot.trans.flush() @@ -3944,13 +4168,23 @@ class Processor(Iface, TProcessor): result = getLocalityGroups_result() try: result.success = self._handler.getLocalityGroups(args.login, args.tableName) - except AccumuloException, ouch1: + msg_type = TMessageType.REPLY + except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): + raise + except AccumuloException as ouch1: + msg_type = TMessageType.REPLY result.ouch1 = ouch1 - except AccumuloSecurityException, ouch2: + except AccumuloSecurityException as ouch2: + msg_type = TMessageType.REPLY result.ouch2 = ouch2 - except TableNotFoundException, ouch3: + except TableNotFoundException as ouch3: + msg_type = TMessageType.REPLY result.ouch3 = ouch3 - oprot.writeMessageBegin("getLocalityGroups", TMessageType.REPLY, seqid) + except Exception as ex: + msg_type = TMessageType.EXCEPTION + logging.exception(ex) + result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error') + oprot.writeMessageBegin("getLocalityGroups", msg_type, seqid) result.write(oprot) oprot.writeMessageEnd() oprot.trans.flush() @@ -3962,13 +4196,23 @@ class Processor(Iface, TProcessor): result = getIteratorSetting_result() try: result.success = self._handler.getIteratorSetting(args.login, args.tableName, args.iteratorName, args.scope) - except AccumuloException, ouch1: + msg_type = TMessageType.REPLY + except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): + raise + except AccumuloException as ouch1: + msg_type = TMessageType.REPLY result.ouch1 = ouch1 - except AccumuloSecurityException, ouch2: + except AccumuloSecurityException as ouch2: + msg_type = TMessageType.REPLY result.ouch2 = ouch2 - except TableNotFoundException, ouch3: + except TableNotFoundException as ouch3: + msg_type = TMessageType.REPLY result.ouch3 = ouch3 - oprot.writeMessageBegin("getIteratorSetting", TMessageType.REPLY, seqid) + except Exception as ex: + msg_type = TMessageType.EXCEPTION + logging.exception(ex) + result = TApplicationException(TApplicationException.INTERNAL_ERROR, 'Internal error') + oprot.writeMessageBegin("getIteratorSetting", msg_type, seqid) result.write(oprot) oprot.writeMessageEnd() oprot.trans.flush() @@ -3980,13 +4224,23 @@ class Processor(Iface, TProcessor): result = getMaxRow_result() try: result.success = self._handler.getMaxRow(args.login, args.tableName, args.auths, args.startRow, args.startInclusive, args.endRow, args.endInclusive) - except AccumuloException, ouch1: + msg_type = TMessageType.REPLY + except (TTransport.TTransportException, KeyboardInterrupt, SystemExit): + raise + except AccumuloException as ouch1: + msg_type = TMessageType.REPLY result.ouch1 = ouch1 - except AccumuloSecurityException, ouch2: + except AccumuloSecurityException as ouch2: + msg_type = TMessageType.REPLY result.ouch2 = ouch2 - except TableNotFoundException, ouc
<TRUNCATED>
