Skip to content

Commit

Permalink
Update to newer upstream Thrift API definition
Browse files Browse the repository at this point in the history 
Regenerated Thrift interaction code, and adapt to API changes..
  • Loading branch information
@wbolster
wbolster committed Nov 3, 2013
2 parents 7dbe079 + 019059a commit dd7878c
Show file tree
Hide file tree
Showing 5 changed files with 2,488 additions and 784 deletions.
4 changes: 2 additions & 2 deletions happybase/batch.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,10 +51,10 @@ def send(self):
logger.debug("Sending batch for '%s' (%d mutations on %d rows)",
self._table.name, self._mutation_count, len(bms))
if self._timestamp is None:
self._table.connection.client.mutateRows(self._table.name, bms)
self._table.connection.client.mutateRows(self._table.name, bms, {})
else:
self._table.connection.client.mutateRowsTs(
self._table.name, bms, self._timestamp)
self._table.name, bms, self._timestamp, {})

self._reset_mutations()

Expand Down
228 changes: 128 additions & 100 deletions happybase/hbase/Hbase-remote
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,35 +33,39 @@ if len(sys.argv) <= 1 or sys.argv[1] == '--help':
print ' getTableRegions(Text tableName)'
print ' void createTable(Text tableName, columnFamilies)'
print ' void deleteTable(Text tableName)'
print ' get(Text tableName, Text row, Text column)'
print ' getVer(Text tableName, Text row, Text column, i32 numVersions)'
print ' getVerTs(Text tableName, Text row, Text column, i64 timestamp, i32 numVersions)'
print ' getRow(Text tableName, Text row)'
print ' getRowWithColumns(Text tableName, Text row, columns)'
print ' getRowTs(Text tableName, Text row, i64 timestamp)'
print ' getRowWithColumnsTs(Text tableName, Text row, columns, i64 timestamp)'
print ' getRows(Text tableName, rows)'
print ' getRowsWithColumns(Text tableName, rows, columns)'
print ' getRowsTs(Text tableName, rows, i64 timestamp)'
print ' getRowsWithColumnsTs(Text tableName, rows, columns, i64 timestamp)'
print ' void mutateRow(Text tableName, Text row, mutations)'
print ' void mutateRowTs(Text tableName, Text row, mutations, i64 timestamp)'
print ' void mutateRows(Text tableName, rowBatches)'
print ' void mutateRowsTs(Text tableName, rowBatches, i64 timestamp)'
print ' get(Text tableName, Text row, Text column, attributes)'
print ' getVer(Text tableName, Text row, Text column, i32 numVersions, attributes)'
print ' getVerTs(Text tableName, Text row, Text column, i64 timestamp, i32 numVersions, attributes)'
print ' getRow(Text tableName, Text row, attributes)'
print ' getRowWithColumns(Text tableName, Text row, columns, attributes)'
print ' getRowTs(Text tableName, Text row, i64 timestamp, attributes)'
print ' getRowWithColumnsTs(Text tableName, Text row, columns, i64 timestamp, attributes)'
print ' getRows(Text tableName, rows, attributes)'
print ' getRowsWithColumns(Text tableName, rows, columns, attributes)'
print ' getRowsTs(Text tableName, rows, i64 timestamp, attributes)'
print ' getRowsWithColumnsTs(Text tableName, rows, columns, i64 timestamp, attributes)'
print ' void mutateRow(Text tableName, Text row, mutations, attributes)'
print ' void mutateRowTs(Text tableName, Text row, mutations, i64 timestamp, attributes)'
print ' void mutateRows(Text tableName, rowBatches, attributes)'
print ' void mutateRowsTs(Text tableName, rowBatches, i64 timestamp, attributes)'
print ' i64 atomicIncrement(Text tableName, Text row, Text column, i64 value)'
print ' void deleteAll(Text tableName, Text row, Text column)'
print ' void deleteAllTs(Text tableName, Text row, Text column, i64 timestamp)'
print ' void deleteAllRow(Text tableName, Text row)'
print ' void deleteAllRowTs(Text tableName, Text row, i64 timestamp)'
print ' ScannerID scannerOpenWithScan(Text tableName, TScan scan)'
print ' ScannerID scannerOpen(Text tableName, Text startRow, columns)'
print ' ScannerID scannerOpenWithStop(Text tableName, Text startRow, Text stopRow, columns)'
print ' ScannerID scannerOpenWithPrefix(Text tableName, Text startAndPrefix, columns)'
print ' ScannerID scannerOpenTs(Text tableName, Text startRow, columns, i64 timestamp)'
print ' ScannerID scannerOpenWithStopTs(Text tableName, Text startRow, Text stopRow, columns, i64 timestamp)'
print ' void deleteAll(Text tableName, Text row, Text column, attributes)'
print ' void deleteAllTs(Text tableName, Text row, Text column, i64 timestamp, attributes)'
print ' void deleteAllRow(Text tableName, Text row, attributes)'
print ' void increment(TIncrement increment)'
print ' void incrementRows( increments)'
print ' void deleteAllRowTs(Text tableName, Text row, i64 timestamp, attributes)'
print ' ScannerID scannerOpenWithScan(Text tableName, TScan scan, attributes)'
print ' ScannerID scannerOpen(Text tableName, Text startRow, columns, attributes)'
print ' ScannerID scannerOpenWithStop(Text tableName, Text startRow, Text stopRow, columns, attributes)'
print ' ScannerID scannerOpenWithPrefix(Text tableName, Text startAndPrefix, columns, attributes)'
print ' ScannerID scannerOpenTs(Text tableName, Text startRow, columns, i64 timestamp, attributes)'
print ' ScannerID scannerOpenWithStopTs(Text tableName, Text startRow, Text stopRow, columns, i64 timestamp, attributes)'
print ' scannerGet(ScannerID id)'
print ' scannerGetList(ScannerID id, i32 nbRows)'
print ' void scannerClose(ScannerID id)'
print ' getRowOrBefore(Text tableName, Text row, Text family)'
print ' TRegionInfo getRegionInfo(Text row)'
print ''
sys.exit(0)

Expand Down Expand Up @@ -174,94 +178,94 @@ elif cmd == 'deleteTable':
pp.pprint(client.deleteTable(eval(args[0]),))

elif cmd == 'get':
if len(args) != 3:
print 'get requires 3 args'
if len(args) != 4:
print 'get requires 4 args'
sys.exit(1)
pp.pprint(client.get(eval(args[0]),eval(args[1]),eval(args[2]),))
pp.pprint(client.get(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),))

elif cmd == 'getVer':
if len(args) != 4:
print 'getVer requires 4 args'
if len(args) != 5:
print 'getVer requires 5 args'
sys.exit(1)
pp.pprint(client.getVer(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),))
pp.pprint(client.getVer(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),eval(args[4]),))

elif cmd == 'getVerTs':
if len(args) != 5:
print 'getVerTs requires 5 args'
if len(args) != 6:
print 'getVerTs requires 6 args'
sys.exit(1)
pp.pprint(client.getVerTs(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),eval(args[4]),))
pp.pprint(client.getVerTs(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),eval(args[4]),eval(args[5]),))

elif cmd == 'getRow':
if len(args) != 2:
print 'getRow requires 2 args'
if len(args) != 3:
print 'getRow requires 3 args'
sys.exit(1)
pp.pprint(client.getRow(eval(args[0]),eval(args[1]),))
pp.pprint(client.getRow(eval(args[0]),eval(args[1]),eval(args[2]),))

elif cmd == 'getRowWithColumns':
if len(args) != 3:
print 'getRowWithColumns requires 3 args'
if len(args) != 4:
print 'getRowWithColumns requires 4 args'
sys.exit(1)
pp.pprint(client.getRowWithColumns(eval(args[0]),eval(args[1]),eval(args[2]),))
pp.pprint(client.getRowWithColumns(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),))

elif cmd == 'getRowTs':
if len(args) != 3:
print 'getRowTs requires 3 args'
if len(args) != 4:
print 'getRowTs requires 4 args'
sys.exit(1)
pp.pprint(client.getRowTs(eval(args[0]),eval(args[1]),eval(args[2]),))
pp.pprint(client.getRowTs(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),))

elif cmd == 'getRowWithColumnsTs':
if len(args) != 4:
print 'getRowWithColumnsTs requires 4 args'
if len(args) != 5:
print 'getRowWithColumnsTs requires 5 args'
sys.exit(1)
pp.pprint(client.getRowWithColumnsTs(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),))
pp.pprint(client.getRowWithColumnsTs(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),eval(args[4]),))

elif cmd == 'getRows':
if len(args) != 2:
print 'getRows requires 2 args'
if len(args) != 3:
print 'getRows requires 3 args'
sys.exit(1)
pp.pprint(client.getRows(eval(args[0]),eval(args[1]),))
pp.pprint(client.getRows(eval(args[0]),eval(args[1]),eval(args[2]),))

elif cmd == 'getRowsWithColumns':
if len(args) != 3:
print 'getRowsWithColumns requires 3 args'
if len(args) != 4:
print 'getRowsWithColumns requires 4 args'
sys.exit(1)
pp.pprint(client.getRowsWithColumns(eval(args[0]),eval(args[1]),eval(args[2]),))
pp.pprint(client.getRowsWithColumns(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),))

elif cmd == 'getRowsTs':
if len(args) != 3:
print 'getRowsTs requires 3 args'
if len(args) != 4:
print 'getRowsTs requires 4 args'
sys.exit(1)
pp.pprint(client.getRowsTs(eval(args[0]),eval(args[1]),eval(args[2]),))
pp.pprint(client.getRowsTs(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),))

elif cmd == 'getRowsWithColumnsTs':
if len(args) != 4:
print 'getRowsWithColumnsTs requires 4 args'
if len(args) != 5:
print 'getRowsWithColumnsTs requires 5 args'
sys.exit(1)
pp.pprint(client.getRowsWithColumnsTs(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),))
pp.pprint(client.getRowsWithColumnsTs(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),eval(args[4]),))

elif cmd == 'mutateRow':
if len(args) != 3:
print 'mutateRow requires 3 args'
if len(args) != 4:
print 'mutateRow requires 4 args'
sys.exit(1)
pp.pprint(client.mutateRow(eval(args[0]),eval(args[1]),eval(args[2]),))
pp.pprint(client.mutateRow(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),))

elif cmd == 'mutateRowTs':
if len(args) != 4:
print 'mutateRowTs requires 4 args'
if len(args) != 5:
print 'mutateRowTs requires 5 args'
sys.exit(1)
pp.pprint(client.mutateRowTs(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),))
pp.pprint(client.mutateRowTs(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),eval(args[4]),))

elif cmd == 'mutateRows':
if len(args) != 2:
print 'mutateRows requires 2 args'
if len(args) != 3:
print 'mutateRows requires 3 args'
sys.exit(1)
pp.pprint(client.mutateRows(eval(args[0]),eval(args[1]),))
pp.pprint(client.mutateRows(eval(args[0]),eval(args[1]),eval(args[2]),))

elif cmd == 'mutateRowsTs':
if len(args) != 3:
print 'mutateRowsTs requires 3 args'
if len(args) != 4:
print 'mutateRowsTs requires 4 args'
sys.exit(1)
pp.pprint(client.mutateRowsTs(eval(args[0]),eval(args[1]),eval(args[2]),))
pp.pprint(client.mutateRowsTs(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),))

elif cmd == 'atomicIncrement':
if len(args) != 4:
Expand All @@ -270,64 +274,76 @@ elif cmd == 'atomicIncrement':
pp.pprint(client.atomicIncrement(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),))

elif cmd == 'deleteAll':
if len(args) != 3:
print 'deleteAll requires 3 args'
if len(args) != 4:
print 'deleteAll requires 4 args'
sys.exit(1)
pp.pprint(client.deleteAll(eval(args[0]),eval(args[1]),eval(args[2]),))
pp.pprint(client.deleteAll(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),))

elif cmd == 'deleteAllTs':
if len(args) != 4:
print 'deleteAllTs requires 4 args'
if len(args) != 5:
print 'deleteAllTs requires 5 args'
sys.exit(1)
pp.pprint(client.deleteAllTs(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),))
pp.pprint(client.deleteAllTs(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),eval(args[4]),))

elif cmd == 'deleteAllRow':
if len(args) != 2:
print 'deleteAllRow requires 2 args'
if len(args) != 3:
print 'deleteAllRow requires 3 args'
sys.exit(1)
pp.pprint(client.deleteAllRow(eval(args[0]),eval(args[1]),eval(args[2]),))

elif cmd == 'increment':
if len(args) != 1:
print 'increment requires 1 args'
sys.exit(1)
pp.pprint(client.deleteAllRow(eval(args[0]),eval(args[1]),))
pp.pprint(client.increment(eval(args[0]),))

elif cmd == 'incrementRows':
if len(args) != 1:
print 'incrementRows requires 1 args'
sys.exit(1)
pp.pprint(client.incrementRows(eval(args[0]),))

elif cmd == 'deleteAllRowTs':
if len(args) != 3:
print 'deleteAllRowTs requires 3 args'
if len(args) != 4:
print 'deleteAllRowTs requires 4 args'
sys.exit(1)
pp.pprint(client.deleteAllRowTs(eval(args[0]),eval(args[1]),eval(args[2]),))
pp.pprint(client.deleteAllRowTs(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),))

elif cmd == 'scannerOpenWithScan':
if len(args) != 2:
print 'scannerOpenWithScan requires 2 args'
if len(args) != 3:
print 'scannerOpenWithScan requires 3 args'
sys.exit(1)
pp.pprint(client.scannerOpenWithScan(eval(args[0]),eval(args[1]),))
pp.pprint(client.scannerOpenWithScan(eval(args[0]),eval(args[1]),eval(args[2]),))

elif cmd == 'scannerOpen':
if len(args) != 3:
print 'scannerOpen requires 3 args'
if len(args) != 4:
print 'scannerOpen requires 4 args'
sys.exit(1)
pp.pprint(client.scannerOpen(eval(args[0]),eval(args[1]),eval(args[2]),))
pp.pprint(client.scannerOpen(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),))

elif cmd == 'scannerOpenWithStop':
if len(args) != 4:
print 'scannerOpenWithStop requires 4 args'
if len(args) != 5:
print 'scannerOpenWithStop requires 5 args'
sys.exit(1)
pp.pprint(client.scannerOpenWithStop(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),))
pp.pprint(client.scannerOpenWithStop(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),eval(args[4]),))

elif cmd == 'scannerOpenWithPrefix':
if len(args) != 3:
print 'scannerOpenWithPrefix requires 3 args'
if len(args) != 4:
print 'scannerOpenWithPrefix requires 4 args'
sys.exit(1)
pp.pprint(client.scannerOpenWithPrefix(eval(args[0]),eval(args[1]),eval(args[2]),))
pp.pprint(client.scannerOpenWithPrefix(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),))

elif cmd == 'scannerOpenTs':
if len(args) != 4:
print 'scannerOpenTs requires 4 args'
if len(args) != 5:
print 'scannerOpenTs requires 5 args'
sys.exit(1)
pp.pprint(client.scannerOpenTs(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),))
pp.pprint(client.scannerOpenTs(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),eval(args[4]),))

elif cmd == 'scannerOpenWithStopTs':
if len(args) != 5:
print 'scannerOpenWithStopTs requires 5 args'
if len(args) != 6:
print 'scannerOpenWithStopTs requires 6 args'
sys.exit(1)
pp.pprint(client.scannerOpenWithStopTs(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),eval(args[4]),))
pp.pprint(client.scannerOpenWithStopTs(eval(args[0]),eval(args[1]),eval(args[2]),eval(args[3]),eval(args[4]),eval(args[5]),))

elif cmd == 'scannerGet':
if len(args) != 1:
Expand All @@ -347,6 +363,18 @@ elif cmd == 'scannerClose':
sys.exit(1)
pp.pprint(client.scannerClose(eval(args[0]),))

elif cmd == 'getRowOrBefore':
if len(args) != 3:
print 'getRowOrBefore requires 3 args'
sys.exit(1)
pp.pprint(client.getRowOrBefore(eval(args[0]),eval(args[1]),eval(args[2]),))

elif cmd == 'getRegionInfo':
if len(args) != 1:
print 'getRegionInfo requires 1 args'
sys.exit(1)
pp.pprint(client.getRegionInfo(eval(args[0]),))

else:
print 'Unrecognized method %s' % cmd
sys.exit(1)
Expand Down
Loading

0 comments on commit dd7878c

Please sign in to comment.