From e30ed932bb10814527d16483059c6247cb9178b5 Mon Sep 17 00:00:00 2001 From: Michael Stack Date: Sat, 16 Aug 2008 22:04:16 +0000 Subject: [PATCH] HBASE-697 thrift idl needs update/edit to match new 0.2 API (and to fix bugs) git-svn-id: https://svn.apache.org/repos/asf/hadoop/hbase/trunk@686568 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES.txt | 3 + ...rift-r746.jar => libthrift-20080411p1.jar} | Bin 45296 -> 56897 bytes .../apache/hadoop/hbase/thrift/Hbase.thrift | 93 +- .../hadoop/hbase/thrift/ThriftServer.java | 209 +- .../hadoop/hbase/thrift/ThriftUtilities.java | 43 +- .../hbase/thrift/generated/AlreadyExists.java | 34 +- .../hbase/thrift/generated/BatchMutation.java | 49 +- .../thrift/generated/ColumnDescriptor.java | 129 +- .../hbase/thrift/generated/Constants.java | 4 +- .../hadoop/hbase/thrift/generated/Hbase.java | 3638 ++++++++++++++--- .../hbase/thrift/generated/IOError.java | 34 +- .../thrift/generated/IllegalArgument.java | 34 +- .../hbase/thrift/generated/Mutation.java | 52 +- .../hbase/thrift/generated/NotFound.java | 34 +- .../thrift/generated/RegionDescriptor.java | 111 - .../hbase/thrift/generated/ScanEntry.java | 153 - .../apache/hadoop/hbase/thrift/package.html | 6 +- 17 files changed, 3590 insertions(+), 1036 deletions(-) rename lib/{libthrift-r746.jar => libthrift-20080411p1.jar} (51%) diff --git a/CHANGES.txt b/CHANGES.txt index 46268e9f697..1e67c3e7620 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -3,6 +3,9 @@ Hbase Change Log Release 0.3.0 - Unreleased INCOMPATIBLE CHANGES + HBASE-697 Thrift idl needs update/edit to match new 0.2 API (and to fix bugs) + (Tim Sell via Stack) + BUG FIXES HBASE-805 Remove unnecessary getRow overloads in HRS (Jonathan Gray via Jim Kellerman) (Fix whitespace diffs in HRegionServer) diff --git a/lib/libthrift-r746.jar b/lib/libthrift-20080411p1.jar similarity index 51% rename from lib/libthrift-r746.jar rename to lib/libthrift-20080411p1.jar index 49d07c5a50c37fe5e3c9e2fd4f2feb06c7816cb0..7e4602abed661843676e5d9c8c6e7bbf1f989220 100644 GIT binary patch delta 22001 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 columns + 2:map columns } // @@ -146,7 +159,28 @@ exception AlreadyExists { // service Hbase { + /** + * Brings a table on-line (enables it) + * @param tableName name of the table + */ + void enableTable(1:Bytes tableName) + throws (1:IOError io) + + /** + * Disables a table (takes it off-line) If it is being served, the master + * will tell the servers to stop serving it. + * @param tableName name of the table + */ + void disableTable(1:Bytes tableName) + throws (1:IOError io) + /** + * @param tableName name of table to check + * @return true if table is on-line + */ + bool isTableEnabled(1:Bytes tableName) + throws (1:IOError io) + /** * List all the userspace tables. * @return - returns a list of names @@ -167,7 +201,7 @@ service Hbase { * @param tableName table name * @return list of region descriptors */ - list getTableRegions(1:Text tableName) + list getTableRegions(1:Text tableName) throws (1:IOError io) /** @@ -194,7 +228,7 @@ service Hbase { throws (1:IOError io, 2:NotFound nf) /** - * Get a single value for the specified table, row, and column at the + * Get a single TCell for the specified table, row, and column at the * latest timestamp. * * @param tableName name of table @@ -202,7 +236,7 @@ service Hbase { * @param column column name * @return value for specified row/column */ - Bytes get(1:Text tableName, 2:Text row, 3:Text column) + TCell get(1:Text tableName, 2:Text row, 3:Text column) throws (1:IOError io, 2:NotFound nf) /** @@ -213,9 +247,9 @@ service Hbase { * @param row row key * @param column column name * @param numVersions number of versions to retrieve - * @return list of values for specified row/column + * @return list of cells for specified row/column */ - list getVer(1:Text tableName, 2:Text row, 3:Text column, 4:i32 numVersions) + list getVer(1:Text tableName, 2:Text row, 3:Text column, 4:i32 numVersions) throws (1:IOError io, 2:NotFound nf) /** @@ -228,9 +262,9 @@ service Hbase { * @param column column name * @param timestamp timestamp * @param numVersions number of versions to retrieve - * @return list of values for specified row/column + * @return list of cells for specified row/column */ - list getVerTs(1:Text tableName, 2:Text row, 3:Text column, 4:i64 timestamp, 5:i32 numVersions) + list getVerTs(1:Text tableName, 2:Text row, 3:Text column, 4:i64 timestamp, 5:i32 numVersions) throws (1:IOError io, 2:NotFound nf) /** @@ -239,9 +273,9 @@ service Hbase { * * @param tableName name of table * @param row row key - * @return Map of columns to values. Map is empty if row does not exist. + * @return TRowResult containing the row and map of columns to TCells. Map is empty if row does not exist. */ - map getRow(1:Text tableName, 2:Text row) + TRowResult getRow(1:Text tableName, 2:Text row) throws (1:IOError io) /** @@ -251,24 +285,11 @@ service Hbase { * @param tableName of table * @param row row key * @param timestamp timestamp - * @return Map of columns to values. Map is empty if row does not exist. + * @return TRowResult containing the row and map of columns to TCells. Map is empty if row does not exist. */ - map getRowTs(1:Text tableName, 2:Text row, 3:i64 timestamp) + TRowResult getRowTs(1:Text tableName, 2:Text row, 3:i64 timestamp) throws (1:IOError io) - /** - * Put a single value at the specified table, row, and column. - * To put muliple values in a single transaction, or to specify - * a non-default timestamp, use {@link #mutateRow} and/or - * {@link #mutateRowTs} - * - * @param tableName name of table - * @param row row key - * @param column column name - */ - void put(1:Text tableName, 2:Text row, 3:Text column, 4:Bytes value) - throws (1:IOError io, 2:IllegalArgument ia) - /** * Apply a series of mutations (updates/deletes) to a row in a * single transaction. If an exception is thrown, then the @@ -456,11 +477,11 @@ service Hbase { * a NotFound exception is returned. * * @param id id of a scanner returned by scannerOpen - * @return a ScanEntry object representing the current row's values + * @return a TRowResult containing the current row and a map of the columns to TCells. * @throws IllegalArgument if ScannerID is invalid * @throws NotFound when the scanner reaches the end */ - ScanEntry scannerGet(1:ScannerID id) + TRowResult scannerGet(1:ScannerID id) throws (1:IOError io, 2:IllegalArgument ia, 3:NotFound nf) /** diff --git a/src/java/org/apache/hadoop/hbase/thrift/ThriftServer.java b/src/java/org/apache/hadoop/hbase/thrift/ThriftServer.java index a8ca10db0e2..7610495b514 100644 --- a/src/java/org/apache/hadoop/hbase/thrift/ThriftServer.java +++ b/src/java/org/apache/hadoop/hbase/thrift/ThriftServer.java @@ -20,18 +20,19 @@ package org.apache.hadoop.hbase.thrift; import java.io.IOException; import java.nio.charset.MalformedInputException; -import java.util.AbstractMap; import java.util.ArrayList; import java.util.HashMap; +import java.util.List; import java.util.Map; import java.util.TreeMap; -import java.util.Map.Entry; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.hadoop.hbase.HBaseConfiguration; import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HConstants; +import org.apache.hadoop.hbase.HRegionInfo; +import org.apache.hadoop.hbase.HServerAddress; import org.apache.hadoop.hbase.HTableDescriptor; import org.apache.hadoop.hbase.MasterNotRunningException; import org.apache.hadoop.hbase.client.HBaseAdmin; @@ -48,8 +49,9 @@ import org.apache.hadoop.hbase.thrift.generated.IOError; import org.apache.hadoop.hbase.thrift.generated.IllegalArgument; import org.apache.hadoop.hbase.thrift.generated.Mutation; import org.apache.hadoop.hbase.thrift.generated.NotFound; -import org.apache.hadoop.hbase.thrift.generated.RegionDescriptor; -import org.apache.hadoop.hbase.thrift.generated.ScanEntry; +import org.apache.hadoop.hbase.thrift.generated.TRegionInfo; +import org.apache.hadoop.hbase.thrift.generated.TCell; +import org.apache.hadoop.hbase.thrift.generated.TRowResult; import org.apache.hadoop.hbase.util.Bytes; import org.apache.hadoop.io.Text; @@ -164,7 +166,34 @@ public class ThriftServer { // used to generate the interface. // - public ArrayList getTableNames() throws IOError { + public void enableTable(final byte[] tableName) throws IOError { + LOG.debug("enableTable"); + try{ + admin.enableTable(tableName); + } catch (IOException e) { + throw new IOError(e.getMessage()); + } + } + + public void disableTable(final byte[] tableName) throws IOError{ + LOG.debug("disableTable"); + try{ + admin.disableTable(tableName); + } catch (IOException e) { + throw new IOError(e.getMessage()); + } + } + + public boolean isTableEnabled(final byte[] tableName) throws IOError { + LOG.debug("isTableEnabled"); + try { + return HTable.isTableEnabled(tableName); + } catch (IOException e) { + throw new IOError(e.getMessage()); + } + } + + public List getTableNames() throws IOError { LOG.debug("getTableNames"); try { HTableDescriptor[] tables = this.admin.listTables(); @@ -178,25 +207,31 @@ public class ThriftServer { } } - public ArrayList getTableRegions(byte[] tableName) - throws IOError { - LOG.debug("getTableRegions: " + new String(tableName)); - try { + public List getTableRegions(byte[] tableName) + throws IOError { + try{ + LOG.debug("getTableRegions: " + new String(tableName)); + HTable table = getTable(tableName); - byte [][] startKeys = table.getStartKeys(); - ArrayList regions = new ArrayList(); - for (int i = 0; i < startKeys.length; i++) { - RegionDescriptor region = new RegionDescriptor(); - region.startKey = startKeys[i]; + Map regionsInfo = table.getRegionsInfo(); + List regions = new ArrayList(); + + for (HRegionInfo regionInfo : regionsInfo.keySet()){ + TRegionInfo region = new TRegionInfo(); + region.startKey = regionInfo.getStartKey(); + region.endKey = regionInfo.getEndKey(); + region.id = regionInfo.getRegionId(); + region.name = regionInfo.getRegionName(); + region.version = regionInfo.getVersion(); regions.add(region); } return regions; - } catch (IOException e) { + } catch (IOException e){ throw new IOError(e.getMessage()); } } - public byte[] get(byte[] tableName, byte[] row, byte[] column) + public TCell get(byte[] tableName, byte[] row, byte[] column) throws NotFound, IOError { if (LOG.isDebugEnabled()) { LOG.debug("get: table=" + new String(tableName) + ", row=" @@ -204,17 +239,17 @@ public class ThriftServer { } try { HTable table = getTable(tableName); - Cell value = table.get(getText(row), getText(column)); - if (value == null) { + Cell cell = table.get(getText(row), getText(column)); + if (cell == null) { throw new NotFound(); } - return value.getValue(); + return ThriftUtilities.cellFromHBase(cell); } catch (IOException e) { throw new IOError(e.getMessage()); } } - public ArrayList getVer(byte[] tableName, byte[] row, + public List getVer(byte[] tableName, byte[] row, byte[] column, int numVersions) throws IOError, NotFound { if (LOG.isDebugEnabled()) { LOG.debug("getVer: table=" + new String(tableName) + ", row=" @@ -223,14 +258,14 @@ public class ThriftServer { } try { HTable table = getTable(tableName); - Cell[] values = + Cell[] cells = table.get(getText(row), getText(column), numVersions); - if (values == null) { + if (cells == null) { throw new NotFound(); } - ArrayList list = new ArrayList(); - for (int i = 0; i < values.length; i++) { - list.add(values[i].getValue()); + List list = new ArrayList(); + for (int i = 0; i < cells.length; i++) { + list.add(ThriftUtilities.cellFromHBase(cells[i])); } return list; } catch (IOException e) { @@ -238,7 +273,7 @@ public class ThriftServer { } } - public ArrayList getVerTs(byte[] tableName, byte[] row, + public List getVerTs(byte[] tableName, byte[] row, byte[] column, long timestamp, int numVersions) throws IOError, NotFound { if (LOG.isDebugEnabled()) { @@ -248,14 +283,14 @@ public class ThriftServer { } try { HTable table = getTable(tableName); - Cell[] values = table.get(getText(row), + Cell[] cells = table.get(getText(row), getText(column), timestamp, numVersions); - if (values == null) { + if (cells == null) { throw new NotFound(); } - ArrayList list = new ArrayList(); - for (int i = 0; i < values.length; i++) { - list.add(values[i].getValue()); + List list = new ArrayList(); + for (int i = 0; i < cells.length; i++) { + list.add(ThriftUtilities.cellFromHBase(cells[i])); } return list; } catch (IOException e) { @@ -263,12 +298,12 @@ public class ThriftServer { } } - public AbstractMap getRow(byte[] tableName, byte[] row) + public TRowResult getRow(byte[] tableName, byte[] row) throws IOError { return getRowTs(tableName, row, HConstants.LATEST_TIMESTAMP); } - public AbstractMap getRowTs(byte[] tableName, byte[] row, + public TRowResult getRowTs(byte[] tableName, byte[] row, long timestamp) throws IOError { if (LOG.isDebugEnabled()) { LOG.debug("getRowTs: table=" + new String(tableName) + ", row=" @@ -276,39 +311,12 @@ public class ThriftServer { } try { HTable table = getTable(tableName); - Map values = - table.getRow(getText(row), timestamp); - // copy the map from type to - TreeMap returnValues = - new TreeMap(Bytes.BYTES_COMPARATOR); - for (Entry e : values.entrySet()) { - returnValues.put(e.getKey(), e.getValue().getValue()); - } - return returnValues; + return ThriftUtilities.rowResultFromHBase(table.getRow(getText(row), timestamp)); } catch (IOException e) { throw new IOError(e.getMessage()); } } - public void put(byte[] tableName, byte[] row, byte[] column, byte[] value) - throws IOError, IllegalArgument { - if (LOG.isDebugEnabled()) { - LOG.debug("put: table=" + new String(tableName) + ", row=" - + new String(row) + ", col=" + new String(column) - + ", value.length=" + value.length); - } - try { - HTable table = getTable(tableName); - BatchUpdate batchUpdate = new BatchUpdate(getText(row)); - batchUpdate.put(getText(column), value); - table.commit(batchUpdate); - } catch (IOException e) { - throw new IOError(e.getMessage()); - } catch (IllegalArgumentException e) { - throw new IllegalArgument(e.getMessage()); - } - } - public void deleteAll(byte[] tableName, byte[] row, byte[] column) throws IOError { deleteAllTs(tableName, row, column, HConstants.LATEST_TIMESTAMP); @@ -348,7 +356,7 @@ public class ThriftServer { } public void createTable(byte[] tableName, - ArrayList columnFamilies) throws IOError, + List columnFamilies) throws IOError, IllegalArgument, AlreadyExists { if (LOG.isDebugEnabled()) { LOG.debug("createTable: table=" + new String(tableName)); @@ -363,7 +371,7 @@ public class ThriftServer { HColumnDescriptor colDesc = ThriftUtilities.colDescFromThrift(col); desc.addFamily(colDesc); if (LOG.isDebugEnabled()) { - LOG.debug("createTable: col=" + colDesc.getName()); + LOG.debug("createTable: col=" + new String(colDesc.getName())); } } admin.createTable(desc); @@ -390,29 +398,27 @@ public class ThriftServer { } public void mutateRow(byte[] tableName, byte[] row, - ArrayList mutations) throws IOError, IllegalArgument { + List mutations) throws IOError, IllegalArgument { mutateRowTs(tableName, row, mutations, HConstants.LATEST_TIMESTAMP); } public void mutateRowTs(byte[] tableName, byte[] row, - ArrayList mutations, long timestamp) throws IOError, IllegalArgument { + List mutations, long timestamp) throws IOError, IllegalArgument { if (LOG.isDebugEnabled()) { LOG.debug("mutateRowTs: table=" + new String(tableName) + ", row=" + new String(row) + ", ts=" + timestamp + " mutations=" + mutations.size()); for (Mutation m : mutations) { if (m.isDelete) { - LOG.debug("mutateRowTs: : delete - " + getText(m.column)); + LOG.debug("mutateRowTs: : delete - " + new String(getText(m.column))); } else { - LOG.debug("mutateRowTs: : put - " + getText(m.column) + " => " - + m.value); + LOG.debug("mutateRowTs: : put - " + new String(getText(m.column)) + " => " + + new String(m.value)); } } } - Long lockid = null; HTable table = null; - try { table = getTable(tableName); BatchUpdate batchUpdate = new BatchUpdate(getText(row), timestamp); @@ -431,29 +437,30 @@ public class ThriftServer { } } - - public void mutateRows(byte[] tableName, ArrayList rowBatches) + public void mutateRows(byte[] tableName, List rowBatches) throws IOError, IllegalArgument, TException { mutateRowsTs(tableName, rowBatches, HConstants.LATEST_TIMESTAMP); } - public void mutateRowsTs(byte[] tableName, ArrayList rowBatches, long timestamp) + public void mutateRowsTs(byte[] tableName, List rowBatches, long timestamp) throws IOError, IllegalArgument, TException { - ArrayList batchUpdates = new ArrayList(); + List batchUpdates = new ArrayList(); + if (LOG.isDebugEnabled()) { + LOG.debug("mutateRowsTs: table=" + new String(tableName) + ", rows=" + + rowBatches.size() + ", ts=" + timestamp); + } for (BatchMutation batch : rowBatches) { byte[] row = batch.row; - ArrayList mutations = batch.mutations; + List mutations = batch.mutations; if (LOG.isDebugEnabled()) { - LOG.debug("mutateRowTs: table=" + new String(tableName) + ", row=" - + new String(row) + ", ts=" + timestamp + " mutations=" - + mutations.size()); + LOG.debug("mutateRowsTs: : row=" + new String(row) + " mutations=" + mutations.size()); for (Mutation m : mutations) { if (m.isDelete) { - LOG.debug("mutateRowTs: : delete - " + getText(m.column)); + LOG.debug("mutateRowsTs: : delete - " + new String(getText(m.column))); } else { - LOG.debug("mutateRowTs: : put - " + getText(m.column) + " => " - + m.value); + LOG.debug("mutateRowsTs: : put - " + new String(getText(m.column)) + " => " + + new String(m.value)); } } } @@ -489,7 +496,7 @@ public class ThriftServer { removeScanner(id); } - public ScanEntry scannerGet(int id) throws IllegalArgument, NotFound, + public TRowResult scannerGet(int id) throws IllegalArgument, NotFound, IOError { LOG.debug("scannerGet: id=" + id); Scanner scanner = getScanner(id); @@ -507,22 +514,14 @@ public class ThriftServer { } catch (IOException e) { throw new IOError(e.getMessage()); } - - ScanEntry retval = new ScanEntry(); - retval.row = results.getRow(); - retval.columns = new TreeMap(Bytes.BYTES_COMPARATOR); - - for (Map.Entry e : results.entrySet()) { - retval.columns.put(e.getKey(), e.getValue().getValue()); - } - return retval; + return ThriftUtilities.rowResultFromHBase(results); } public int scannerOpen(byte[] tableName, byte[] startRow, - ArrayList columns) throws IOError { + List columns) throws IOError { if (LOG.isDebugEnabled()) { - LOG.debug("scannerOpen: table=" + getText(tableName) + ", start=" - + getText(startRow) + ", columns=" + columns.toString()); + LOG.debug("scannerOpen: table=" + new String(getText(tableName)) + ", start=" + + new String(getText(startRow)) + ", columns=" + columns.toString()); } try { HTable table = getTable(tableName); @@ -539,10 +538,10 @@ public class ThriftServer { } public int scannerOpenWithStop(byte[] tableName, byte[] startRow, - byte[] stopRow, ArrayList columns) throws IOError, TException { + byte[] stopRow, List columns) throws IOError, TException { if (LOG.isDebugEnabled()) { - LOG.debug("scannerOpen: table=" + getText(tableName) + ", start=" - + getText(startRow) + ", stop=" + getText(stopRow) + ", columns=" + LOG.debug("scannerOpen: table=" + new String(getText(tableName)) + ", start=" + + new String(getText(startRow)) + ", stop=" + new String(getText(stopRow)) + ", columns=" + columns.toString()); } try { @@ -560,10 +559,10 @@ public class ThriftServer { } public int scannerOpenTs(byte[] tableName, byte[] startRow, - ArrayList columns, long timestamp) throws IOError, TException { + List columns, long timestamp) throws IOError, TException { if (LOG.isDebugEnabled()) { - LOG.debug("scannerOpen: table=" + getText(tableName) + ", start=" - + getText(startRow) + ", columns=" + columns.toString() + LOG.debug("scannerOpen: table=" + new String(getText(tableName)) + ", start=" + + new String(getText(startRow)) + ", columns=" + columns.toString() + ", timestamp=" + timestamp); } try { @@ -581,11 +580,11 @@ public class ThriftServer { } public int scannerOpenWithStopTs(byte[] tableName, byte[] startRow, - byte[] stopRow, ArrayList columns, long timestamp) + byte[] stopRow, List columns, long timestamp) throws IOError, TException { if (LOG.isDebugEnabled()) { - LOG.debug("scannerOpen: table=" + getText(tableName) + ", start=" - + getText(startRow) + ", stop=" + getText(stopRow) + ", columns=" + LOG.debug("scannerOpen: table=" + new String(getText(tableName)) + ", start=" + + new String(getText(startRow)) + ", stop=" + new String(getText(stopRow)) + ", columns=" + columns.toString() + ", timestamp=" + timestamp); } try { @@ -602,7 +601,7 @@ public class ThriftServer { } } - public AbstractMap getColumnDescriptors( + public Map getColumnDescriptors( byte[] tableName) throws IOError, TException { if (LOG.isDebugEnabled()) { LOG.debug("getColumnDescriptors: table=" + new String(tableName)); @@ -612,7 +611,7 @@ public class ThriftServer { new TreeMap(Bytes.BYTES_COMPARATOR); HTable table = getTable(tableName); - HTableDescriptor desc = table.getMetadata(); + HTableDescriptor desc = table.getTableDescriptor(); for (HColumnDescriptor e : desc.getFamilies()) { ColumnDescriptor col = ThriftUtilities.colDescFromHbase(e); diff --git a/src/java/org/apache/hadoop/hbase/thrift/ThriftUtilities.java b/src/java/org/apache/hadoop/hbase/thrift/ThriftUtilities.java index ae261235ea8..dbe1d286c4f 100644 --- a/src/java/org/apache/hadoop/hbase/thrift/ThriftUtilities.java +++ b/src/java/org/apache/hadoop/hbase/thrift/ThriftUtilities.java @@ -18,10 +18,21 @@ package org.apache.hadoop.hbase.thrift; +import java.io.IOException; +import java.util.Map; +import java.util.TreeMap; + import org.apache.hadoop.hbase.HColumnDescriptor; import org.apache.hadoop.hbase.HColumnDescriptor.CompressionType; +import org.apache.hadoop.hbase.io.Cell; +import org.apache.hadoop.hbase.io.RowResult; import org.apache.hadoop.hbase.thrift.generated.ColumnDescriptor; +import org.apache.hadoop.hbase.thrift.generated.IOError; import org.apache.hadoop.hbase.thrift.generated.IllegalArgument; +import org.apache.hadoop.hbase.thrift.generated.NotFound; +import org.apache.hadoop.hbase.thrift.generated.TCell; +import org.apache.hadoop.hbase.thrift.generated.TRowResult; +import org.apache.hadoop.hbase.util.Bytes; public class ThriftUtilities { @@ -71,4 +82,34 @@ public class ThriftUtilities { return col; } -} \ No newline at end of file + /** + * This utility method creates a new Thrift TCell "struct" based on + * an Hbase Cell object. + * + * @param in + * Hbase Cell object + * @return Thrift TCell + */ + static public TCell cellFromHBase(Cell in) { + return new TCell(in.getValue(), in.getTimestamp()); + } + + /** + * This utility method creates a new Thrift TRowResult "struct" based on + * an Hbase RowResult object. + * + * @param in + * Hbase RowResult object + * @return Thrift TRowResult + */ + static public TRowResult rowResultFromHBase(RowResult in) { + TRowResult result = new TRowResult(); + result.row = in.getRow(); + result.columns = new TreeMap(Bytes.BYTES_COMPARATOR); + for (Map.Entry entry : in.entrySet()){ + result.columns.put(entry.getKey(), ThriftUtilities.cellFromHBase(entry.getValue())); + } + return result; + } +} + diff --git a/src/java/org/apache/hadoop/hbase/thrift/generated/AlreadyExists.java b/src/java/org/apache/hadoop/hbase/thrift/generated/AlreadyExists.java index c1be39f4c9f..314269d556c 100644 --- a/src/java/org/apache/hadoop/hbase/thrift/generated/AlreadyExists.java +++ b/src/java/org/apache/hadoop/hbase/thrift/generated/AlreadyExists.java @@ -23,9 +23,11 @@ */ package org.apache.hadoop.hbase.thrift.generated; +import java.util.List; import java.util.ArrayList; -import java.util.AbstractMap; +import java.util.Map; import java.util.HashMap; +import java.util.Set; import java.util.HashSet; import com.facebook.thrift.*; @@ -40,7 +42,7 @@ public class AlreadyExists extends Exception implements TBase, java.io.Serializa public String message; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean message = false; } @@ -55,6 +57,34 @@ public class AlreadyExists extends Exception implements TBase, java.io.Serializa this.__isset.message = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof AlreadyExists) + return this.equals((AlreadyExists)that); + return false; + } + + public boolean equals(AlreadyExists that) { + if (that == null) + return false; + + boolean this_present_message = true && (this.message != null); + boolean that_present_message = true && (that.message != null); + if (this_present_message || that_present_message) { + if (!(this_present_message && that_present_message)) + return false; + if (!this.message.equals(that.message)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); diff --git a/src/java/org/apache/hadoop/hbase/thrift/generated/BatchMutation.java b/src/java/org/apache/hadoop/hbase/thrift/generated/BatchMutation.java index 5d506bfdf74..c2a1b77bdd2 100644 --- a/src/java/org/apache/hadoop/hbase/thrift/generated/BatchMutation.java +++ b/src/java/org/apache/hadoop/hbase/thrift/generated/BatchMutation.java @@ -15,7 +15,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + /** * Autogenerated by Thrift * @@ -23,9 +23,11 @@ */ package org.apache.hadoop.hbase.thrift.generated; +import java.util.List; import java.util.ArrayList; -import java.util.AbstractMap; +import java.util.Map; import java.util.HashMap; +import java.util.Set; import java.util.HashSet; import com.facebook.thrift.*; @@ -37,10 +39,10 @@ import com.facebook.thrift.transport.*; */ public class BatchMutation implements TBase, java.io.Serializable { public byte[] row; - public ArrayList mutations; + public List mutations; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean row = false; public boolean mutations = false; } @@ -50,7 +52,7 @@ public class BatchMutation implements TBase, java.io.Serializable { public BatchMutation( byte[] row, - ArrayList mutations) + List mutations) { this(); this.row = row; @@ -59,6 +61,43 @@ public class BatchMutation implements TBase, java.io.Serializable { this.__isset.mutations = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof BatchMutation) + return this.equals((BatchMutation)that); + return false; + } + + public boolean equals(BatchMutation that) { + if (that == null) + return false; + + boolean this_present_row = true && (this.row != null); + boolean that_present_row = true && (that.row != null); + if (this_present_row || that_present_row) { + if (!(this_present_row && that_present_row)) + return false; + if (!java.util.Arrays.equals(this.row, that.row)) + return false; + } + + boolean this_present_mutations = true && (this.mutations != null); + boolean that_present_mutations = true && (that.mutations != null); + if (this_present_mutations || that_present_mutations) { + if (!(this_present_mutations && that_present_mutations)) + return false; + if (!this.mutations.equals(that.mutations)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); diff --git a/src/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java b/src/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java index b05740e3695..3f538bd6163 100644 --- a/src/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java +++ b/src/java/org/apache/hadoop/hbase/thrift/generated/ColumnDescriptor.java @@ -23,9 +23,11 @@ */ package org.apache.hadoop.hbase.thrift.generated; +import java.util.List; import java.util.ArrayList; -import java.util.AbstractMap; +import java.util.Map; import java.util.HashMap; +import java.util.Set; import java.util.HashSet; import com.facebook.thrift.*; @@ -50,7 +52,7 @@ public class ColumnDescriptor implements TBase, java.io.Serializable { public int timeToLive; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean name = false; public boolean maxVersions = false; public boolean compression = false; @@ -119,6 +121,115 @@ public class ColumnDescriptor implements TBase, java.io.Serializable { this.__isset.timeToLive = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof ColumnDescriptor) + return this.equals((ColumnDescriptor)that); + return false; + } + + public boolean equals(ColumnDescriptor that) { + if (that == null) + return false; + + boolean this_present_name = true && (this.name != null); + boolean that_present_name = true && (that.name != null); + if (this_present_name || that_present_name) { + if (!(this_present_name && that_present_name)) + return false; + if (!java.util.Arrays.equals(this.name, that.name)) + return false; + } + + boolean this_present_maxVersions = true; + boolean that_present_maxVersions = true; + if (this_present_maxVersions || that_present_maxVersions) { + if (!(this_present_maxVersions && that_present_maxVersions)) + return false; + if (this.maxVersions != that.maxVersions) + return false; + } + + boolean this_present_compression = true && (this.compression != null); + boolean that_present_compression = true && (that.compression != null); + if (this_present_compression || that_present_compression) { + if (!(this_present_compression && that_present_compression)) + return false; + if (!this.compression.equals(that.compression)) + return false; + } + + boolean this_present_inMemory = true; + boolean that_present_inMemory = true; + if (this_present_inMemory || that_present_inMemory) { + if (!(this_present_inMemory && that_present_inMemory)) + return false; + if (this.inMemory != that.inMemory) + return false; + } + + boolean this_present_maxValueLength = true; + boolean that_present_maxValueLength = true; + if (this_present_maxValueLength || that_present_maxValueLength) { + if (!(this_present_maxValueLength && that_present_maxValueLength)) + return false; + if (this.maxValueLength != that.maxValueLength) + return false; + } + + boolean this_present_bloomFilterType = true && (this.bloomFilterType != null); + boolean that_present_bloomFilterType = true && (that.bloomFilterType != null); + if (this_present_bloomFilterType || that_present_bloomFilterType) { + if (!(this_present_bloomFilterType && that_present_bloomFilterType)) + return false; + if (!this.bloomFilterType.equals(that.bloomFilterType)) + return false; + } + + boolean this_present_bloomFilterVectorSize = true; + boolean that_present_bloomFilterVectorSize = true; + if (this_present_bloomFilterVectorSize || that_present_bloomFilterVectorSize) { + if (!(this_present_bloomFilterVectorSize && that_present_bloomFilterVectorSize)) + return false; + if (this.bloomFilterVectorSize != that.bloomFilterVectorSize) + return false; + } + + boolean this_present_bloomFilterNbHashes = true; + boolean that_present_bloomFilterNbHashes = true; + if (this_present_bloomFilterNbHashes || that_present_bloomFilterNbHashes) { + if (!(this_present_bloomFilterNbHashes && that_present_bloomFilterNbHashes)) + return false; + if (this.bloomFilterNbHashes != that.bloomFilterNbHashes) + return false; + } + + boolean this_present_blockCacheEnabled = true; + boolean that_present_blockCacheEnabled = true; + if (this_present_blockCacheEnabled || that_present_blockCacheEnabled) { + if (!(this_present_blockCacheEnabled && that_present_blockCacheEnabled)) + return false; + if (this.blockCacheEnabled != that.blockCacheEnabled) + return false; + } + + boolean this_present_timeToLive = true; + boolean that_present_timeToLive = true; + if (this_present_timeToLive || that_present_timeToLive) { + if (!(this_present_timeToLive && that_present_timeToLive)) + return false; + if (this.timeToLive != that.timeToLive) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -203,13 +314,13 @@ public class ColumnDescriptor implements TBase, java.io.Serializable { } break; case 10: - if (field.type == TType.I32) { - this.timeToLive = iprot.readI32(); - this.__isset.timeToLive = true; - } else { - TProtocolUtil.skip(iprot, field.type); - } - break; + if (field.type == TType.I32) { + this.timeToLive = iprot.readI32(); + this.__isset.timeToLive = true; + } else { + TProtocolUtil.skip(iprot, field.type); + } + break; default: TProtocolUtil.skip(iprot, field.type); break; diff --git a/src/java/org/apache/hadoop/hbase/thrift/generated/Constants.java b/src/java/org/apache/hadoop/hbase/thrift/generated/Constants.java index bee2177e556..1f73410c7ef 100644 --- a/src/java/org/apache/hadoop/hbase/thrift/generated/Constants.java +++ b/src/java/org/apache/hadoop/hbase/thrift/generated/Constants.java @@ -23,9 +23,11 @@ */ package org.apache.hadoop.hbase.thrift.generated; +import java.util.List; import java.util.ArrayList; -import java.util.AbstractMap; +import java.util.Map; import java.util.HashMap; +import java.util.Set; import java.util.HashSet; import com.facebook.thrift.*; diff --git a/src/java/org/apache/hadoop/hbase/thrift/generated/Hbase.java b/src/java/org/apache/hadoop/hbase/thrift/generated/Hbase.java index f7d881cd74c..b5382e2364e 100644 --- a/src/java/org/apache/hadoop/hbase/thrift/generated/Hbase.java +++ b/src/java/org/apache/hadoop/hbase/thrift/generated/Hbase.java @@ -23,9 +23,11 @@ */ package org.apache.hadoop.hbase.thrift.generated; +import java.util.List; import java.util.ArrayList; -import java.util.AbstractMap; +import java.util.Map; import java.util.HashMap; +import java.util.Set; import java.util.HashSet; import com.facebook.thrift.*; @@ -36,25 +38,44 @@ public class Hbase { public interface Iface { + /** + * Brings a table on-line (enables it) + * @param tableName name of the table + */ + public void enableTable(byte[] tableName) throws IOError, TException; + + /** + * Disables a table (takes it off-line) If it is being served, the master + * will tell the servers to stop serving it. + * @param tableName name of the table + */ + public void disableTable(byte[] tableName) throws IOError, TException; + + /** + * @param tableName name of table to check + * @return true if table is on-line + */ + public boolean isTableEnabled(byte[] tableName) throws IOError, TException; + /** * List all the userspace tables. * @return - returns a list of names */ - public ArrayList getTableNames() throws IOError, TException; + public List getTableNames() throws IOError, TException; /** * List all the column families assoicated with a table. * @param tableName table name * @return list of column family descriptors */ - public AbstractMap getColumnDescriptors(byte[] tableName) throws IOError, TException; + public Map getColumnDescriptors(byte[] tableName) throws IOError, TException; /** * List the regions associated with a table. * @param tableName table name * @return list of region descriptors */ - public ArrayList getTableRegions(byte[] tableName) throws IOError, TException; + public List getTableRegions(byte[] tableName) throws IOError, TException; /** * Create a table with the specified column families. The name @@ -68,7 +89,7 @@ public class Hbase { * @throws IllegalArgument if an input parameter is invalid * @throws AlreadyExists if the table name already exists */ - public void createTable(byte[] tableName, ArrayList columnFamilies) throws IOError, IllegalArgument, AlreadyExists, TException; + public void createTable(byte[] tableName, List columnFamilies) throws IOError, IllegalArgument, AlreadyExists, TException; /** * Deletes a table @@ -78,7 +99,7 @@ public class Hbase { public void deleteTable(byte[] tableName) throws IOError, NotFound, TException; /** - * Get a single value for the specified table, row, and column at the + * Get a single TCell for the specified table, row, and column at the * latest timestamp. * * @param tableName name of table @@ -86,7 +107,7 @@ public class Hbase { * @param column column name * @return value for specified row/column */ - public byte[] get(byte[] tableName, byte[] row, byte[] column) throws IOError, NotFound, TException; + public TCell get(byte[] tableName, byte[] row, byte[] column) throws IOError, NotFound, TException; /** * Get the specified number of versions for the specified table, @@ -96,9 +117,9 @@ public class Hbase { * @param row row key * @param column column name * @param numVersions number of versions to retrieve - * @return list of values for specified row/column + * @return list of cells for specified row/column */ - public ArrayList getVer(byte[] tableName, byte[] row, byte[] column, int numVersions) throws IOError, NotFound, TException; + public List getVer(byte[] tableName, byte[] row, byte[] column, int numVersions) throws IOError, NotFound, TException; /** * Get the specified number of versions for the specified table, @@ -110,9 +131,9 @@ public class Hbase { * @param column column name * @param timestamp timestamp * @param numVersions number of versions to retrieve - * @return list of values for specified row/column + * @return list of cells for specified row/column */ - public ArrayList getVerTs(byte[] tableName, byte[] row, byte[] column, long timestamp, int numVersions) throws IOError, NotFound, TException; + public List getVerTs(byte[] tableName, byte[] row, byte[] column, long timestamp, int numVersions) throws IOError, NotFound, TException; /** * Get all the data for the specified table and row at the latest @@ -120,9 +141,9 @@ public class Hbase { * * @param tableName name of table * @param row row key - * @return Map of columns to values. Map is empty if row does not exist. + * @return TRowResult containing the row and map of columns to TCells. Map is empty if row does not exist. */ - public AbstractMap getRow(byte[] tableName, byte[] row) throws IOError, TException; + public TRowResult getRow(byte[] tableName, byte[] row) throws IOError, TException; /** * Get all the data for the specified table and row at the specified @@ -131,21 +152,9 @@ public class Hbase { * @param tableName of table * @param row row key * @param timestamp timestamp - * @return Map of columns to values. Map is empty if row does not exist. + * @return TRowResult containing the row and map of columns to TCells. Map is empty if row does not exist. */ - public AbstractMap getRowTs(byte[] tableName, byte[] row, long timestamp) throws IOError, TException; - - /** - * Put a single value at the specified table, row, and column. - * To put muliple values in a single transaction, or to specify - * a non-default timestamp, use {@link #mutateRow} and/or - * {@link #mutateRowTs} - * - * @param tableName name of table - * @param row row key - * @param column column name - */ - public void put(byte[] tableName, byte[] row, byte[] column, byte[] value) throws IOError, IllegalArgument, TException; + public TRowResult getRowTs(byte[] tableName, byte[] row, long timestamp) throws IOError, TException; /** * Apply a series of mutations (updates/deletes) to a row in a @@ -157,7 +166,7 @@ public class Hbase { * @param row row key * @param mutations list of mutation commands */ - public void mutateRow(byte[] tableName, byte[] row, ArrayList mutations) throws IOError, IllegalArgument, TException; + public void mutateRow(byte[] tableName, byte[] row, List mutations) throws IOError, IllegalArgument, TException; /** * Apply a series of mutations (updates/deletes) to a row in a @@ -170,7 +179,7 @@ public class Hbase { * @param mutations list of mutation commands * @param timestamp timestamp */ - public void mutateRowTs(byte[] tableName, byte[] row, ArrayList mutations, long timestamp) throws IOError, IllegalArgument, TException; + public void mutateRowTs(byte[] tableName, byte[] row, List mutations, long timestamp) throws IOError, IllegalArgument, TException; /** * Apply a series of batches (each a series of mutations on a single row) @@ -181,7 +190,7 @@ public class Hbase { * @param tableName name of table * @param rowBatches list of row batches */ - public void mutateRows(byte[] tableName, ArrayList rowBatches) throws IOError, IllegalArgument, TException; + public void mutateRows(byte[] tableName, List rowBatches) throws IOError, IllegalArgument, TException; /** * Apply a series of batches (each a series of mutations on a single row) @@ -193,7 +202,7 @@ public class Hbase { * @param rowBatches list of row batches * @param timestamp timestamp */ - public void mutateRowsTs(byte[] tableName, ArrayList rowBatches, long timestamp) throws IOError, IllegalArgument, TException; + public void mutateRowsTs(byte[] tableName, List rowBatches, long timestamp) throws IOError, IllegalArgument, TException; /** * Delete all cells that match the passed row and column. @@ -246,7 +255,7 @@ public class Hbase { * * @return scanner id to be used with other scanner procedures */ - public int scannerOpen(byte[] tableName, byte[] startRow, ArrayList columns) throws IOError, TException; + public int scannerOpen(byte[] tableName, byte[] startRow, List columns) throws IOError, TException; /** * Get a scanner on the current table starting and stopping at the @@ -264,7 +273,7 @@ public class Hbase { * * @return scanner id to be used with other scanner procedures */ - public int scannerOpenWithStop(byte[] tableName, byte[] startRow, byte[] stopRow, ArrayList columns) throws IOError, TException; + public int scannerOpenWithStop(byte[] tableName, byte[] startRow, byte[] stopRow, List columns) throws IOError, TException; /** * Get a scanner on the current table starting at the specified row and @@ -281,7 +290,7 @@ public class Hbase { * * @return scanner id to be used with other scanner procedures */ - public int scannerOpenTs(byte[] tableName, byte[] startRow, ArrayList columns, long timestamp) throws IOError, TException; + public int scannerOpenTs(byte[] tableName, byte[] startRow, List columns, long timestamp) throws IOError, TException; /** * Get a scanner on the current table starting and stopping at the @@ -301,7 +310,7 @@ public class Hbase { * * @return scanner id to be used with other scanner procedures */ - public int scannerOpenWithStopTs(byte[] tableName, byte[] startRow, byte[] stopRow, ArrayList columns, long timestamp) throws IOError, TException; + public int scannerOpenWithStopTs(byte[] tableName, byte[] startRow, byte[] stopRow, List columns, long timestamp) throws IOError, TException; /** * Returns the scanner's current row value and advances to the next @@ -310,11 +319,11 @@ public class Hbase { * a NotFound exception is returned. * * @param id id of a scanner returned by scannerOpen - * @return a ScanEntry object representing the current row's values + * @return a TRowResult containing the current row and a map of the columns to TCells. * @throws IllegalArgument if ScannerID is invalid * @throws NotFound when the scanner reaches the end */ - public ScanEntry scannerGet(int id) throws IOError, IllegalArgument, NotFound, TException; + public TRowResult scannerGet(int id) throws IOError, IllegalArgument, NotFound, TException; /** * Closes the server-state associated with an open scanner. @@ -343,7 +352,119 @@ public class Hbase { protected int seqid_; - public ArrayList getTableNames() throws IOError, TException + public TProtocol getInputProtocol() + { + return this.iprot_; + } + + public TProtocol getOutputProtocol() + { + return this.oprot_; + } + + public void enableTable(byte[] tableName) throws IOError, TException + { + send_enableTable(tableName); + recv_enableTable(); + } + + public void send_enableTable(byte[] tableName) throws TException + { + oprot_.writeMessageBegin(new TMessage("enableTable", TMessageType.CALL, seqid_)); + enableTable_args args = new enableTable_args(); + args.tableName = tableName; + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); + } + + public void recv_enableTable() throws IOError, TException + { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + enableTable_result result = new enableTable_result(); + result.read(iprot_); + iprot_.readMessageEnd(); + if (result.__isset.io) { + throw result.io; + } + return; + } + + public void disableTable(byte[] tableName) throws IOError, TException + { + send_disableTable(tableName); + recv_disableTable(); + } + + public void send_disableTable(byte[] tableName) throws TException + { + oprot_.writeMessageBegin(new TMessage("disableTable", TMessageType.CALL, seqid_)); + disableTable_args args = new disableTable_args(); + args.tableName = tableName; + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); + } + + public void recv_disableTable() throws IOError, TException + { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + disableTable_result result = new disableTable_result(); + result.read(iprot_); + iprot_.readMessageEnd(); + if (result.__isset.io) { + throw result.io; + } + return; + } + + public boolean isTableEnabled(byte[] tableName) throws IOError, TException + { + send_isTableEnabled(tableName); + return recv_isTableEnabled(); + } + + public void send_isTableEnabled(byte[] tableName) throws TException + { + oprot_.writeMessageBegin(new TMessage("isTableEnabled", TMessageType.CALL, seqid_)); + isTableEnabled_args args = new isTableEnabled_args(); + args.tableName = tableName; + args.write(oprot_); + oprot_.writeMessageEnd(); + oprot_.getTransport().flush(); + } + + public boolean recv_isTableEnabled() throws IOError, TException + { + TMessage msg = iprot_.readMessageBegin(); + if (msg.type == TMessageType.EXCEPTION) { + TApplicationException x = TApplicationException.read(iprot_); + iprot_.readMessageEnd(); + throw x; + } + isTableEnabled_result result = new isTableEnabled_result(); + result.read(iprot_); + iprot_.readMessageEnd(); + if (result.__isset.success) { + return result.success; + } + if (result.__isset.io) { + throw result.io; + } + throw new TApplicationException(TApplicationException.MISSING_RESULT, "isTableEnabled failed: unknown result"); + } + + public List getTableNames() throws IOError, TException { send_getTableNames(); return recv_getTableNames(); @@ -358,7 +479,7 @@ public class Hbase { oprot_.getTransport().flush(); } - public ArrayList recv_getTableNames() throws IOError, TException + public List recv_getTableNames() throws IOError, TException { TMessage msg = iprot_.readMessageBegin(); if (msg.type == TMessageType.EXCEPTION) { @@ -378,7 +499,7 @@ public class Hbase { throw new TApplicationException(TApplicationException.MISSING_RESULT, "getTableNames failed: unknown result"); } - public AbstractMap getColumnDescriptors(byte[] tableName) throws IOError, TException + public Map getColumnDescriptors(byte[] tableName) throws IOError, TException { send_getColumnDescriptors(tableName); return recv_getColumnDescriptors(); @@ -394,7 +515,7 @@ public class Hbase { oprot_.getTransport().flush(); } - public AbstractMap recv_getColumnDescriptors() throws IOError, TException + public Map recv_getColumnDescriptors() throws IOError, TException { TMessage msg = iprot_.readMessageBegin(); if (msg.type == TMessageType.EXCEPTION) { @@ -414,7 +535,7 @@ public class Hbase { throw new TApplicationException(TApplicationException.MISSING_RESULT, "getColumnDescriptors failed: unknown result"); } - public ArrayList getTableRegions(byte[] tableName) throws IOError, TException + public List getTableRegions(byte[] tableName) throws IOError, TException { send_getTableRegions(tableName); return recv_getTableRegions(); @@ -430,7 +551,7 @@ public class Hbase { oprot_.getTransport().flush(); } - public ArrayList recv_getTableRegions() throws IOError, TException + public List recv_getTableRegions() throws IOError, TException { TMessage msg = iprot_.readMessageBegin(); if (msg.type == TMessageType.EXCEPTION) { @@ -450,13 +571,13 @@ public class Hbase { throw new TApplicationException(TApplicationException.MISSING_RESULT, "getTableRegions failed: unknown result"); } - public void createTable(byte[] tableName, ArrayList columnFamilies) throws IOError, IllegalArgument, AlreadyExists, TException + public void createTable(byte[] tableName, List columnFamilies) throws IOError, IllegalArgument, AlreadyExists, TException { send_createTable(tableName, columnFamilies); recv_createTable(); } - public void send_createTable(byte[] tableName, ArrayList columnFamilies) throws TException + public void send_createTable(byte[] tableName, List columnFamilies) throws TException { oprot_.writeMessageBegin(new TMessage("createTable", TMessageType.CALL, seqid_)); createTable_args args = new createTable_args(); @@ -526,7 +647,7 @@ public class Hbase { return; } - public byte[] get(byte[] tableName, byte[] row, byte[] column) throws IOError, NotFound, TException + public TCell get(byte[] tableName, byte[] row, byte[] column) throws IOError, NotFound, TException { send_get(tableName, row, column); return recv_get(); @@ -544,7 +665,7 @@ public class Hbase { oprot_.getTransport().flush(); } - public byte[] recv_get() throws IOError, NotFound, TException + public TCell recv_get() throws IOError, NotFound, TException { TMessage msg = iprot_.readMessageBegin(); if (msg.type == TMessageType.EXCEPTION) { @@ -567,7 +688,7 @@ public class Hbase { throw new TApplicationException(TApplicationException.MISSING_RESULT, "get failed: unknown result"); } - public ArrayList getVer(byte[] tableName, byte[] row, byte[] column, int numVersions) throws IOError, NotFound, TException + public List getVer(byte[] tableName, byte[] row, byte[] column, int numVersions) throws IOError, NotFound, TException { send_getVer(tableName, row, column, numVersions); return recv_getVer(); @@ -586,7 +707,7 @@ public class Hbase { oprot_.getTransport().flush(); } - public ArrayList recv_getVer() throws IOError, NotFound, TException + public List recv_getVer() throws IOError, NotFound, TException { TMessage msg = iprot_.readMessageBegin(); if (msg.type == TMessageType.EXCEPTION) { @@ -609,7 +730,7 @@ public class Hbase { throw new TApplicationException(TApplicationException.MISSING_RESULT, "getVer failed: unknown result"); } - public ArrayList getVerTs(byte[] tableName, byte[] row, byte[] column, long timestamp, int numVersions) throws IOError, NotFound, TException + public List getVerTs(byte[] tableName, byte[] row, byte[] column, long timestamp, int numVersions) throws IOError, NotFound, TException { send_getVerTs(tableName, row, column, timestamp, numVersions); return recv_getVerTs(); @@ -629,7 +750,7 @@ public class Hbase { oprot_.getTransport().flush(); } - public ArrayList recv_getVerTs() throws IOError, NotFound, TException + public List recv_getVerTs() throws IOError, NotFound, TException { TMessage msg = iprot_.readMessageBegin(); if (msg.type == TMessageType.EXCEPTION) { @@ -652,7 +773,7 @@ public class Hbase { throw new TApplicationException(TApplicationException.MISSING_RESULT, "getVerTs failed: unknown result"); } - public AbstractMap getRow(byte[] tableName, byte[] row) throws IOError, TException + public TRowResult getRow(byte[] tableName, byte[] row) throws IOError, TException { send_getRow(tableName, row); return recv_getRow(); @@ -669,7 +790,7 @@ public class Hbase { oprot_.getTransport().flush(); } - public AbstractMap recv_getRow() throws IOError, TException + public TRowResult recv_getRow() throws IOError, TException { TMessage msg = iprot_.readMessageBegin(); if (msg.type == TMessageType.EXCEPTION) { @@ -689,7 +810,7 @@ public class Hbase { throw new TApplicationException(TApplicationException.MISSING_RESULT, "getRow failed: unknown result"); } - public AbstractMap getRowTs(byte[] tableName, byte[] row, long timestamp) throws IOError, TException + public TRowResult getRowTs(byte[] tableName, byte[] row, long timestamp) throws IOError, TException { send_getRowTs(tableName, row, timestamp); return recv_getRowTs(); @@ -707,7 +828,7 @@ public class Hbase { oprot_.getTransport().flush(); } - public AbstractMap recv_getRowTs() throws IOError, TException + public TRowResult recv_getRowTs() throws IOError, TException { TMessage msg = iprot_.readMessageBegin(); if (msg.type == TMessageType.EXCEPTION) { @@ -727,52 +848,13 @@ public class Hbase { throw new TApplicationException(TApplicationException.MISSING_RESULT, "getRowTs failed: unknown result"); } - public void put(byte[] tableName, byte[] row, byte[] column, byte[] value) throws IOError, IllegalArgument, TException - { - send_put(tableName, row, column, value); - recv_put(); - } - - public void send_put(byte[] tableName, byte[] row, byte[] column, byte[] value) throws TException - { - oprot_.writeMessageBegin(new TMessage("put", TMessageType.CALL, seqid_)); - put_args args = new put_args(); - args.tableName = tableName; - args.row = row; - args.column = column; - args.value = value; - args.write(oprot_); - oprot_.writeMessageEnd(); - oprot_.getTransport().flush(); - } - - public void recv_put() throws IOError, IllegalArgument, TException - { - TMessage msg = iprot_.readMessageBegin(); - if (msg.type == TMessageType.EXCEPTION) { - TApplicationException x = TApplicationException.read(iprot_); - iprot_.readMessageEnd(); - throw x; - } - put_result result = new put_result(); - result.read(iprot_); - iprot_.readMessageEnd(); - if (result.__isset.io) { - throw result.io; - } - if (result.__isset.ia) { - throw result.ia; - } - return; - } - - public void mutateRow(byte[] tableName, byte[] row, ArrayList mutations) throws IOError, IllegalArgument, TException + public void mutateRow(byte[] tableName, byte[] row, List mutations) throws IOError, IllegalArgument, TException { send_mutateRow(tableName, row, mutations); recv_mutateRow(); } - public void send_mutateRow(byte[] tableName, byte[] row, ArrayList mutations) throws TException + public void send_mutateRow(byte[] tableName, byte[] row, List mutations) throws TException { oprot_.writeMessageBegin(new TMessage("mutateRow", TMessageType.CALL, seqid_)); mutateRow_args args = new mutateRow_args(); @@ -804,13 +886,13 @@ public class Hbase { return; } - public void mutateRowTs(byte[] tableName, byte[] row, ArrayList mutations, long timestamp) throws IOError, IllegalArgument, TException + public void mutateRowTs(byte[] tableName, byte[] row, List mutations, long timestamp) throws IOError, IllegalArgument, TException { send_mutateRowTs(tableName, row, mutations, timestamp); recv_mutateRowTs(); } - public void send_mutateRowTs(byte[] tableName, byte[] row, ArrayList mutations, long timestamp) throws TException + public void send_mutateRowTs(byte[] tableName, byte[] row, List mutations, long timestamp) throws TException { oprot_.writeMessageBegin(new TMessage("mutateRowTs", TMessageType.CALL, seqid_)); mutateRowTs_args args = new mutateRowTs_args(); @@ -843,13 +925,13 @@ public class Hbase { return; } - public void mutateRows(byte[] tableName, ArrayList rowBatches) throws IOError, IllegalArgument, TException + public void mutateRows(byte[] tableName, List rowBatches) throws IOError, IllegalArgument, TException { send_mutateRows(tableName, rowBatches); recv_mutateRows(); } - public void send_mutateRows(byte[] tableName, ArrayList rowBatches) throws TException + public void send_mutateRows(byte[] tableName, List rowBatches) throws TException { oprot_.writeMessageBegin(new TMessage("mutateRows", TMessageType.CALL, seqid_)); mutateRows_args args = new mutateRows_args(); @@ -880,13 +962,13 @@ public class Hbase { return; } - public void mutateRowsTs(byte[] tableName, ArrayList rowBatches, long timestamp) throws IOError, IllegalArgument, TException + public void mutateRowsTs(byte[] tableName, List rowBatches, long timestamp) throws IOError, IllegalArgument, TException { send_mutateRowsTs(tableName, rowBatches, timestamp); recv_mutateRowsTs(); } - public void send_mutateRowsTs(byte[] tableName, ArrayList rowBatches, long timestamp) throws TException + public void send_mutateRowsTs(byte[] tableName, List rowBatches, long timestamp) throws TException { oprot_.writeMessageBegin(new TMessage("mutateRowsTs", TMessageType.CALL, seqid_)); mutateRowsTs_args args = new mutateRowsTs_args(); @@ -1058,13 +1140,13 @@ public class Hbase { return; } - public int scannerOpen(byte[] tableName, byte[] startRow, ArrayList columns) throws IOError, TException + public int scannerOpen(byte[] tableName, byte[] startRow, List columns) throws IOError, TException { send_scannerOpen(tableName, startRow, columns); return recv_scannerOpen(); } - public void send_scannerOpen(byte[] tableName, byte[] startRow, ArrayList columns) throws TException + public void send_scannerOpen(byte[] tableName, byte[] startRow, List columns) throws TException { oprot_.writeMessageBegin(new TMessage("scannerOpen", TMessageType.CALL, seqid_)); scannerOpen_args args = new scannerOpen_args(); @@ -1096,13 +1178,13 @@ public class Hbase { throw new TApplicationException(TApplicationException.MISSING_RESULT, "scannerOpen failed: unknown result"); } - public int scannerOpenWithStop(byte[] tableName, byte[] startRow, byte[] stopRow, ArrayList columns) throws IOError, TException + public int scannerOpenWithStop(byte[] tableName, byte[] startRow, byte[] stopRow, List columns) throws IOError, TException { send_scannerOpenWithStop(tableName, startRow, stopRow, columns); return recv_scannerOpenWithStop(); } - public void send_scannerOpenWithStop(byte[] tableName, byte[] startRow, byte[] stopRow, ArrayList columns) throws TException + public void send_scannerOpenWithStop(byte[] tableName, byte[] startRow, byte[] stopRow, List columns) throws TException { oprot_.writeMessageBegin(new TMessage("scannerOpenWithStop", TMessageType.CALL, seqid_)); scannerOpenWithStop_args args = new scannerOpenWithStop_args(); @@ -1135,13 +1217,13 @@ public class Hbase { throw new TApplicationException(TApplicationException.MISSING_RESULT, "scannerOpenWithStop failed: unknown result"); } - public int scannerOpenTs(byte[] tableName, byte[] startRow, ArrayList columns, long timestamp) throws IOError, TException + public int scannerOpenTs(byte[] tableName, byte[] startRow, List columns, long timestamp) throws IOError, TException { send_scannerOpenTs(tableName, startRow, columns, timestamp); return recv_scannerOpenTs(); } - public void send_scannerOpenTs(byte[] tableName, byte[] startRow, ArrayList columns, long timestamp) throws TException + public void send_scannerOpenTs(byte[] tableName, byte[] startRow, List columns, long timestamp) throws TException { oprot_.writeMessageBegin(new TMessage("scannerOpenTs", TMessageType.CALL, seqid_)); scannerOpenTs_args args = new scannerOpenTs_args(); @@ -1174,13 +1256,13 @@ public class Hbase { throw new TApplicationException(TApplicationException.MISSING_RESULT, "scannerOpenTs failed: unknown result"); } - public int scannerOpenWithStopTs(byte[] tableName, byte[] startRow, byte[] stopRow, ArrayList columns, long timestamp) throws IOError, TException + public int scannerOpenWithStopTs(byte[] tableName, byte[] startRow, byte[] stopRow, List columns, long timestamp) throws IOError, TException { send_scannerOpenWithStopTs(tableName, startRow, stopRow, columns, timestamp); return recv_scannerOpenWithStopTs(); } - public void send_scannerOpenWithStopTs(byte[] tableName, byte[] startRow, byte[] stopRow, ArrayList columns, long timestamp) throws TException + public void send_scannerOpenWithStopTs(byte[] tableName, byte[] startRow, byte[] stopRow, List columns, long timestamp) throws TException { oprot_.writeMessageBegin(new TMessage("scannerOpenWithStopTs", TMessageType.CALL, seqid_)); scannerOpenWithStopTs_args args = new scannerOpenWithStopTs_args(); @@ -1214,7 +1296,7 @@ public class Hbase { throw new TApplicationException(TApplicationException.MISSING_RESULT, "scannerOpenWithStopTs failed: unknown result"); } - public ScanEntry scannerGet(int id) throws IOError, IllegalArgument, NotFound, TException + public TRowResult scannerGet(int id) throws IOError, IllegalArgument, NotFound, TException { send_scannerGet(id); return recv_scannerGet(); @@ -1230,7 +1312,7 @@ public class Hbase { oprot_.getTransport().flush(); } - public ScanEntry recv_scannerGet() throws IOError, IllegalArgument, NotFound, TException + public TRowResult recv_scannerGet() throws IOError, IllegalArgument, NotFound, TException { TMessage msg = iprot_.readMessageBegin(); if (msg.type == TMessageType.EXCEPTION) { @@ -1297,6 +1379,9 @@ public class Hbase { public Processor(Iface iface) { iface_ = iface; + processMap_.put("enableTable", new enableTable()); + processMap_.put("disableTable", new disableTable()); + processMap_.put("isTableEnabled", new isTableEnabled()); processMap_.put("getTableNames", new getTableNames()); processMap_.put("getColumnDescriptors", new getColumnDescriptors()); processMap_.put("getTableRegions", new getTableRegions()); @@ -1307,7 +1392,6 @@ public class Hbase { processMap_.put("getVerTs", new getVerTs()); processMap_.put("getRow", new getRow()); processMap_.put("getRowTs", new getRowTs()); - processMap_.put("put", new put()); processMap_.put("mutateRow", new mutateRow()); processMap_.put("mutateRowTs", new mutateRowTs()); processMap_.put("mutateRows", new mutateRows()); @@ -1349,6 +1433,70 @@ public class Hbase { return true; } + private class enableTable implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + enableTable_args args = new enableTable_args(); + args.read(iprot); + iprot.readMessageEnd(); + enableTable_result result = new enableTable_result(); + try { + iface_.enableTable(args.tableName); + } catch (IOError io) { + result.io = io; + result.__isset.io = true; + } + oprot.writeMessageBegin(new TMessage("enableTable", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + } + + } + + private class disableTable implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + disableTable_args args = new disableTable_args(); + args.read(iprot); + iprot.readMessageEnd(); + disableTable_result result = new disableTable_result(); + try { + iface_.disableTable(args.tableName); + } catch (IOError io) { + result.io = io; + result.__isset.io = true; + } + oprot.writeMessageBegin(new TMessage("disableTable", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + } + + } + + private class isTableEnabled implements ProcessFunction { + public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException + { + isTableEnabled_args args = new isTableEnabled_args(); + args.read(iprot); + iprot.readMessageEnd(); + isTableEnabled_result result = new isTableEnabled_result(); + try { + result.success = iface_.isTableEnabled(args.tableName); + result.__isset.success = true; + } catch (IOError io) { + result.io = io; + result.__isset.io = true; + } + oprot.writeMessageBegin(new TMessage("isTableEnabled", TMessageType.REPLY, seqid)); + result.write(oprot); + oprot.writeMessageEnd(); + oprot.getTransport().flush(); + } + + } + private class getTableNames implements ProcessFunction { public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException { @@ -1585,30 +1733,6 @@ public class Hbase { } - private class put implements ProcessFunction { - public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException - { - put_args args = new put_args(); - args.read(iprot); - iprot.readMessageEnd(); - put_result result = new put_result(); - try { - iface_.put(args.tableName, args.row, args.column, args.value); - } catch (IOError io) { - result.io = io; - result.__isset.io = true; - } catch (IllegalArgument ia) { - result.ia = ia; - result.__isset.ia = true; - } - oprot.writeMessageBegin(new TMessage("put", TMessageType.REPLY, seqid)); - result.write(oprot); - oprot.writeMessageEnd(); - oprot.getTransport().flush(); - } - - } - private class mutateRow implements ProcessFunction { public void process(int seqid, TProtocol iprot, TProtocol oprot) throws TException { @@ -1931,10 +2055,678 @@ public class Hbase { } + public static class enableTable_args implements TBase, java.io.Serializable { + public byte[] tableName; + + public final Isset __isset = new Isset(); + public static final class Isset implements java.io.Serializable { + public boolean tableName = false; + } + + public enableTable_args() { + } + + public enableTable_args( + byte[] tableName) + { + this(); + this.tableName = tableName; + this.__isset.tableName = true; + } + + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof enableTable_args) + return this.equals((enableTable_args)that); + return false; + } + + public boolean equals(enableTable_args that) { + if (that == null) + return false; + + boolean this_present_tableName = true && (this.tableName != null); + boolean that_present_tableName = true && (that.tableName != null); + if (this_present_tableName || that_present_tableName) { + if (!(this_present_tableName && that_present_tableName)) + return false; + if (!java.util.Arrays.equals(this.tableName, that.tableName)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + + public void read(TProtocol iprot) throws TException { + TField field; + iprot.readStructBegin(); + while (true) + { + field = iprot.readFieldBegin(); + if (field.type == TType.STOP) { + break; + } + switch (field.id) + { + case 1: + if (field.type == TType.STRING) { + this.tableName = iprot.readBinary(); + this.__isset.tableName = true; + } else { + TProtocolUtil.skip(iprot, field.type); + } + break; + default: + TProtocolUtil.skip(iprot, field.type); + break; + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + } + + public void write(TProtocol oprot) throws TException { + TStruct struct = new TStruct("enableTable_args"); + oprot.writeStructBegin(struct); + TField field = new TField(); + if (this.tableName != null) { + field.name = "tableName"; + field.type = TType.STRING; + field.id = 1; + oprot.writeFieldBegin(field); + oprot.writeBinary(this.tableName); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + public String toString() { + StringBuilder sb = new StringBuilder("enableTable_args("); + sb.append("tableName:"); + sb.append(this.tableName); + sb.append(")"); + return sb.toString(); + } + + } + + public static class enableTable_result implements TBase, java.io.Serializable { + public IOError io; + + public final Isset __isset = new Isset(); + public static final class Isset implements java.io.Serializable { + public boolean io = false; + } + + public enableTable_result() { + } + + public enableTable_result( + IOError io) + { + this(); + this.io = io; + this.__isset.io = true; + } + + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof enableTable_result) + return this.equals((enableTable_result)that); + return false; + } + + public boolean equals(enableTable_result that) { + if (that == null) + return false; + + boolean this_present_io = true && (this.io != null); + boolean that_present_io = true && (that.io != null); + if (this_present_io || that_present_io) { + if (!(this_present_io && that_present_io)) + return false; + if (!this.io.equals(that.io)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + + public void read(TProtocol iprot) throws TException { + TField field; + iprot.readStructBegin(); + while (true) + { + field = iprot.readFieldBegin(); + if (field.type == TType.STOP) { + break; + } + switch (field.id) + { + case 1: + if (field.type == TType.STRUCT) { + this.io = new IOError(); + this.io.read(iprot); + this.__isset.io = true; + } else { + TProtocolUtil.skip(iprot, field.type); + } + break; + default: + TProtocolUtil.skip(iprot, field.type); + break; + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + } + + public void write(TProtocol oprot) throws TException { + TStruct struct = new TStruct("enableTable_result"); + oprot.writeStructBegin(struct); + TField field = new TField(); + + if (this.__isset.io) { + if (this.io != null) { + field.name = "io"; + field.type = TType.STRUCT; + field.id = 1; + oprot.writeFieldBegin(field); + this.io.write(oprot); + oprot.writeFieldEnd(); + } + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + public String toString() { + StringBuilder sb = new StringBuilder("enableTable_result("); + sb.append("io:"); + sb.append(this.io.toString()); + sb.append(")"); + return sb.toString(); + } + + } + + public static class disableTable_args implements TBase, java.io.Serializable { + public byte[] tableName; + + public final Isset __isset = new Isset(); + public static final class Isset implements java.io.Serializable { + public boolean tableName = false; + } + + public disableTable_args() { + } + + public disableTable_args( + byte[] tableName) + { + this(); + this.tableName = tableName; + this.__isset.tableName = true; + } + + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof disableTable_args) + return this.equals((disableTable_args)that); + return false; + } + + public boolean equals(disableTable_args that) { + if (that == null) + return false; + + boolean this_present_tableName = true && (this.tableName != null); + boolean that_present_tableName = true && (that.tableName != null); + if (this_present_tableName || that_present_tableName) { + if (!(this_present_tableName && that_present_tableName)) + return false; + if (!java.util.Arrays.equals(this.tableName, that.tableName)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + + public void read(TProtocol iprot) throws TException { + TField field; + iprot.readStructBegin(); + while (true) + { + field = iprot.readFieldBegin(); + if (field.type == TType.STOP) { + break; + } + switch (field.id) + { + case 1: + if (field.type == TType.STRING) { + this.tableName = iprot.readBinary(); + this.__isset.tableName = true; + } else { + TProtocolUtil.skip(iprot, field.type); + } + break; + default: + TProtocolUtil.skip(iprot, field.type); + break; + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + } + + public void write(TProtocol oprot) throws TException { + TStruct struct = new TStruct("disableTable_args"); + oprot.writeStructBegin(struct); + TField field = new TField(); + if (this.tableName != null) { + field.name = "tableName"; + field.type = TType.STRING; + field.id = 1; + oprot.writeFieldBegin(field); + oprot.writeBinary(this.tableName); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + public String toString() { + StringBuilder sb = new StringBuilder("disableTable_args("); + sb.append("tableName:"); + sb.append(this.tableName); + sb.append(")"); + return sb.toString(); + } + + } + + public static class disableTable_result implements TBase, java.io.Serializable { + public IOError io; + + public final Isset __isset = new Isset(); + public static final class Isset implements java.io.Serializable { + public boolean io = false; + } + + public disableTable_result() { + } + + public disableTable_result( + IOError io) + { + this(); + this.io = io; + this.__isset.io = true; + } + + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof disableTable_result) + return this.equals((disableTable_result)that); + return false; + } + + public boolean equals(disableTable_result that) { + if (that == null) + return false; + + boolean this_present_io = true && (this.io != null); + boolean that_present_io = true && (that.io != null); + if (this_present_io || that_present_io) { + if (!(this_present_io && that_present_io)) + return false; + if (!this.io.equals(that.io)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + + public void read(TProtocol iprot) throws TException { + TField field; + iprot.readStructBegin(); + while (true) + { + field = iprot.readFieldBegin(); + if (field.type == TType.STOP) { + break; + } + switch (field.id) + { + case 1: + if (field.type == TType.STRUCT) { + this.io = new IOError(); + this.io.read(iprot); + this.__isset.io = true; + } else { + TProtocolUtil.skip(iprot, field.type); + } + break; + default: + TProtocolUtil.skip(iprot, field.type); + break; + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + } + + public void write(TProtocol oprot) throws TException { + TStruct struct = new TStruct("disableTable_result"); + oprot.writeStructBegin(struct); + TField field = new TField(); + + if (this.__isset.io) { + if (this.io != null) { + field.name = "io"; + field.type = TType.STRUCT; + field.id = 1; + oprot.writeFieldBegin(field); + this.io.write(oprot); + oprot.writeFieldEnd(); + } + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + public String toString() { + StringBuilder sb = new StringBuilder("disableTable_result("); + sb.append("io:"); + sb.append(this.io.toString()); + sb.append(")"); + return sb.toString(); + } + + } + + public static class isTableEnabled_args implements TBase, java.io.Serializable { + public byte[] tableName; + + public final Isset __isset = new Isset(); + public static final class Isset implements java.io.Serializable { + public boolean tableName = false; + } + + public isTableEnabled_args() { + } + + public isTableEnabled_args( + byte[] tableName) + { + this(); + this.tableName = tableName; + this.__isset.tableName = true; + } + + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof isTableEnabled_args) + return this.equals((isTableEnabled_args)that); + return false; + } + + public boolean equals(isTableEnabled_args that) { + if (that == null) + return false; + + boolean this_present_tableName = true && (this.tableName != null); + boolean that_present_tableName = true && (that.tableName != null); + if (this_present_tableName || that_present_tableName) { + if (!(this_present_tableName && that_present_tableName)) + return false; + if (!java.util.Arrays.equals(this.tableName, that.tableName)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + + public void read(TProtocol iprot) throws TException { + TField field; + iprot.readStructBegin(); + while (true) + { + field = iprot.readFieldBegin(); + if (field.type == TType.STOP) { + break; + } + switch (field.id) + { + case 1: + if (field.type == TType.STRING) { + this.tableName = iprot.readBinary(); + this.__isset.tableName = true; + } else { + TProtocolUtil.skip(iprot, field.type); + } + break; + default: + TProtocolUtil.skip(iprot, field.type); + break; + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + } + + public void write(TProtocol oprot) throws TException { + TStruct struct = new TStruct("isTableEnabled_args"); + oprot.writeStructBegin(struct); + TField field = new TField(); + if (this.tableName != null) { + field.name = "tableName"; + field.type = TType.STRING; + field.id = 1; + oprot.writeFieldBegin(field); + oprot.writeBinary(this.tableName); + oprot.writeFieldEnd(); + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + public String toString() { + StringBuilder sb = new StringBuilder("isTableEnabled_args("); + sb.append("tableName:"); + sb.append(this.tableName); + sb.append(")"); + return sb.toString(); + } + + } + + public static class isTableEnabled_result implements TBase, java.io.Serializable { + public boolean success; + public IOError io; + + public final Isset __isset = new Isset(); + public static final class Isset implements java.io.Serializable { + public boolean success = false; + public boolean io = false; + } + + public isTableEnabled_result() { + } + + public isTableEnabled_result( + boolean success, + IOError io) + { + this(); + this.success = success; + this.__isset.success = true; + this.io = io; + this.__isset.io = true; + } + + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof isTableEnabled_result) + return this.equals((isTableEnabled_result)that); + return false; + } + + public boolean equals(isTableEnabled_result that) { + if (that == null) + return false; + + boolean this_present_success = true; + boolean that_present_success = true; + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (this.success != that.success) + return false; + } + + boolean this_present_io = true && (this.io != null); + boolean that_present_io = true && (that.io != null); + if (this_present_io || that_present_io) { + if (!(this_present_io && that_present_io)) + return false; + if (!this.io.equals(that.io)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + + public void read(TProtocol iprot) throws TException { + TField field; + iprot.readStructBegin(); + while (true) + { + field = iprot.readFieldBegin(); + if (field.type == TType.STOP) { + break; + } + switch (field.id) + { + case 0: + if (field.type == TType.BOOL) { + this.success = iprot.readBool(); + this.__isset.success = true; + } else { + TProtocolUtil.skip(iprot, field.type); + } + break; + case 1: + if (field.type == TType.STRUCT) { + this.io = new IOError(); + this.io.read(iprot); + this.__isset.io = true; + } else { + TProtocolUtil.skip(iprot, field.type); + } + break; + default: + TProtocolUtil.skip(iprot, field.type); + break; + } + iprot.readFieldEnd(); + } + iprot.readStructEnd(); + } + + public void write(TProtocol oprot) throws TException { + TStruct struct = new TStruct("isTableEnabled_result"); + oprot.writeStructBegin(struct); + TField field = new TField(); + + if (this.__isset.success) { + field.name = "success"; + field.type = TType.BOOL; + field.id = 0; + oprot.writeFieldBegin(field); + oprot.writeBool(this.success); + oprot.writeFieldEnd(); + } else if (this.__isset.io) { + if (this.io != null) { + field.name = "io"; + field.type = TType.STRUCT; + field.id = 1; + oprot.writeFieldBegin(field); + this.io.write(oprot); + oprot.writeFieldEnd(); + } + } + oprot.writeFieldStop(); + oprot.writeStructEnd(); + } + + public String toString() { + StringBuilder sb = new StringBuilder("isTableEnabled_result("); + sb.append("success:"); + sb.append(this.success); + sb.append(",io:"); + sb.append(this.io.toString()); + sb.append(")"); + return sb.toString(); + } + + } + public static class getTableNames_args implements TBase, java.io.Serializable { public getTableNames_args() { } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof getTableNames_args) + return this.equals((getTableNames_args)that); + return false; + } + + public boolean equals(getTableNames_args that) { + if (that == null) + return false; + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -1971,11 +2763,11 @@ public class Hbase { } public static class getTableNames_result implements TBase, java.io.Serializable { - public ArrayList success; + public List success; public IOError io; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean success = false; public boolean io = false; } @@ -1984,7 +2776,7 @@ public class Hbase { } public getTableNames_result( - ArrayList success, + List success, IOError io) { this(); @@ -1994,6 +2786,43 @@ public class Hbase { this.__isset.io = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof getTableNames_result) + return this.equals((getTableNames_result)that); + return false; + } + + public boolean equals(getTableNames_result that) { + if (that == null) + return false; + + boolean this_present_success = true && (this.success != null); + boolean that_present_success = true && (that.success != null); + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (!this.success.equals(that.success)) + return false; + } + + boolean this_present_io = true && (this.io != null); + boolean that_present_io = true && (that.io != null); + if (this_present_io || that_present_io) { + if (!(this_present_io && that_present_io)) + return false; + if (!this.io.equals(that.io)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -2091,7 +2920,7 @@ public class Hbase { public byte[] tableName; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean tableName = false; } @@ -2106,6 +2935,34 @@ public class Hbase { this.__isset.tableName = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof getColumnDescriptors_args) + return this.equals((getColumnDescriptors_args)that); + return false; + } + + public boolean equals(getColumnDescriptors_args that) { + if (that == null) + return false; + + boolean this_present_tableName = true && (this.tableName != null); + boolean that_present_tableName = true && (that.tableName != null); + if (this_present_tableName || that_present_tableName) { + if (!(this_present_tableName && that_present_tableName)) + return false; + if (!java.util.Arrays.equals(this.tableName, that.tableName)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -2161,11 +3018,11 @@ public class Hbase { } public static class getColumnDescriptors_result implements TBase, java.io.Serializable { - public AbstractMap success; + public Map success; public IOError io; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean success = false; public boolean io = false; } @@ -2174,7 +3031,7 @@ public class Hbase { } public getColumnDescriptors_result( - AbstractMap success, + Map success, IOError io) { this(); @@ -2184,6 +3041,43 @@ public class Hbase { this.__isset.io = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof getColumnDescriptors_result) + return this.equals((getColumnDescriptors_result)that); + return false; + } + + public boolean equals(getColumnDescriptors_result that) { + if (that == null) + return false; + + boolean this_present_success = true && (this.success != null); + boolean that_present_success = true && (that.success != null); + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (!this.success.equals(that.success)) + return false; + } + + boolean this_present_io = true && (this.io != null); + boolean that_present_io = true && (that.io != null); + if (this_present_io || that_present_io) { + if (!(this_present_io && that_present_io)) + return false; + if (!this.io.equals(that.io)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -2285,7 +3179,7 @@ public class Hbase { public byte[] tableName; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean tableName = false; } @@ -2300,6 +3194,34 @@ public class Hbase { this.__isset.tableName = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof getTableRegions_args) + return this.equals((getTableRegions_args)that); + return false; + } + + public boolean equals(getTableRegions_args that) { + if (that == null) + return false; + + boolean this_present_tableName = true && (this.tableName != null); + boolean that_present_tableName = true && (that.tableName != null); + if (this_present_tableName || that_present_tableName) { + if (!(this_present_tableName && that_present_tableName)) + return false; + if (!java.util.Arrays.equals(this.tableName, that.tableName)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -2355,11 +3277,11 @@ public class Hbase { } public static class getTableRegions_result implements TBase, java.io.Serializable { - public ArrayList success; + public List success; public IOError io; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean success = false; public boolean io = false; } @@ -2368,7 +3290,7 @@ public class Hbase { } public getTableRegions_result( - ArrayList success, + List success, IOError io) { this(); @@ -2378,6 +3300,43 @@ public class Hbase { this.__isset.io = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof getTableRegions_result) + return this.equals((getTableRegions_result)that); + return false; + } + + public boolean equals(getTableRegions_result that) { + if (that == null) + return false; + + boolean this_present_success = true && (this.success != null); + boolean that_present_success = true && (that.success != null); + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (!this.success.equals(that.success)) + return false; + } + + boolean this_present_io = true && (this.io != null); + boolean that_present_io = true && (that.io != null); + if (this_present_io || that_present_io) { + if (!(this_present_io && that_present_io)) + return false; + if (!this.io.equals(that.io)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -2393,11 +3352,11 @@ public class Hbase { if (field.type == TType.LIST) { { TList _list18 = iprot.readListBegin(); - this.success = new ArrayList(_list18.size); + this.success = new ArrayList(_list18.size); for (int _i19 = 0; _i19 < _list18.size; ++_i19) { - RegionDescriptor _elem20 = new RegionDescriptor(); - _elem20 = new RegionDescriptor(); + TRegionInfo _elem20 = new TRegionInfo(); + _elem20 = new TRegionInfo(); _elem20.read(iprot); this.success.add(_elem20); } @@ -2439,7 +3398,7 @@ public class Hbase { oprot.writeFieldBegin(field); { oprot.writeListBegin(new TList(TType.STRUCT, this.success.size())); - for (RegionDescriptor _iter21 : this.success) { + for (TRegionInfo _iter21 : this.success) { _iter21.write(oprot); } oprot.writeListEnd(); @@ -2474,10 +3433,10 @@ public class Hbase { public static class createTable_args implements TBase, java.io.Serializable { public byte[] tableName; - public ArrayList columnFamilies; + public List columnFamilies; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean tableName = false; public boolean columnFamilies = false; } @@ -2487,7 +3446,7 @@ public class Hbase { public createTable_args( byte[] tableName, - ArrayList columnFamilies) + List columnFamilies) { this(); this.tableName = tableName; @@ -2496,6 +3455,43 @@ public class Hbase { this.__isset.columnFamilies = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof createTable_args) + return this.equals((createTable_args)that); + return false; + } + + public boolean equals(createTable_args that) { + if (that == null) + return false; + + boolean this_present_tableName = true && (this.tableName != null); + boolean that_present_tableName = true && (that.tableName != null); + if (this_present_tableName || that_present_tableName) { + if (!(this_present_tableName && that_present_tableName)) + return false; + if (!java.util.Arrays.equals(this.tableName, that.tableName)) + return false; + } + + boolean this_present_columnFamilies = true && (this.columnFamilies != null); + boolean that_present_columnFamilies = true && (that.columnFamilies != null); + if (this_present_columnFamilies || that_present_columnFamilies) { + if (!(this_present_columnFamilies && that_present_columnFamilies)) + return false; + if (!this.columnFamilies.equals(that.columnFamilies)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -2591,7 +3587,7 @@ public class Hbase { public AlreadyExists exist; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean io = false; public boolean ia = false; public boolean exist = false; @@ -2614,6 +3610,52 @@ public class Hbase { this.__isset.exist = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof createTable_result) + return this.equals((createTable_result)that); + return false; + } + + public boolean equals(createTable_result that) { + if (that == null) + return false; + + boolean this_present_io = true && (this.io != null); + boolean that_present_io = true && (that.io != null); + if (this_present_io || that_present_io) { + if (!(this_present_io && that_present_io)) + return false; + if (!this.io.equals(that.io)) + return false; + } + + boolean this_present_ia = true && (this.ia != null); + boolean that_present_ia = true && (that.ia != null); + if (this_present_ia || that_present_ia) { + if (!(this_present_ia && that_present_ia)) + return false; + if (!this.ia.equals(that.ia)) + return false; + } + + boolean this_present_exist = true && (this.exist != null); + boolean that_present_exist = true && (that.exist != null); + if (this_present_exist || that_present_exist) { + if (!(this_present_exist && that_present_exist)) + return false; + if (!this.exist.equals(that.exist)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -2716,7 +3758,7 @@ public class Hbase { public byte[] tableName; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean tableName = false; } @@ -2731,6 +3773,34 @@ public class Hbase { this.__isset.tableName = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof deleteTable_args) + return this.equals((deleteTable_args)that); + return false; + } + + public boolean equals(deleteTable_args that) { + if (that == null) + return false; + + boolean this_present_tableName = true && (this.tableName != null); + boolean that_present_tableName = true && (that.tableName != null); + if (this_present_tableName || that_present_tableName) { + if (!(this_present_tableName && that_present_tableName)) + return false; + if (!java.util.Arrays.equals(this.tableName, that.tableName)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -2790,7 +3860,7 @@ public class Hbase { public NotFound nf; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean io = false; public boolean nf = false; } @@ -2809,6 +3879,43 @@ public class Hbase { this.__isset.nf = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof deleteTable_result) + return this.equals((deleteTable_result)that); + return false; + } + + public boolean equals(deleteTable_result that) { + if (that == null) + return false; + + boolean this_present_io = true && (this.io != null); + boolean that_present_io = true && (that.io != null); + if (this_present_io || that_present_io) { + if (!(this_present_io && that_present_io)) + return false; + if (!this.io.equals(that.io)) + return false; + } + + boolean this_present_nf = true && (this.nf != null); + boolean that_present_nf = true && (that.nf != null); + if (this_present_nf || that_present_nf) { + if (!(this_present_nf && that_present_nf)) + return false; + if (!this.nf.equals(that.nf)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -2893,7 +4000,7 @@ public class Hbase { public byte[] column; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean tableName = false; public boolean row = false; public boolean column = false; @@ -2916,6 +4023,52 @@ public class Hbase { this.__isset.column = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof get_args) + return this.equals((get_args)that); + return false; + } + + public boolean equals(get_args that) { + if (that == null) + return false; + + boolean this_present_tableName = true && (this.tableName != null); + boolean that_present_tableName = true && (that.tableName != null); + if (this_present_tableName || that_present_tableName) { + if (!(this_present_tableName && that_present_tableName)) + return false; + if (!java.util.Arrays.equals(this.tableName, that.tableName)) + return false; + } + + boolean this_present_row = true && (this.row != null); + boolean that_present_row = true && (that.row != null); + if (this_present_row || that_present_row) { + if (!(this_present_row && that_present_row)) + return false; + if (!java.util.Arrays.equals(this.row, that.row)) + return false; + } + + boolean this_present_column = true && (this.column != null); + boolean that_present_column = true && (that.column != null); + if (this_present_column || that_present_column) { + if (!(this_present_column && that_present_column)) + return false; + if (!java.util.Arrays.equals(this.column, that.column)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -3007,12 +4160,12 @@ public class Hbase { } public static class get_result implements TBase, java.io.Serializable { - public byte[] success; + public TCell success; public IOError io; public NotFound nf; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean success = false; public boolean io = false; public boolean nf = false; @@ -3022,7 +4175,7 @@ public class Hbase { } public get_result( - byte[] success, + TCell success, IOError io, NotFound nf) { @@ -3035,6 +4188,52 @@ public class Hbase { this.__isset.nf = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof get_result) + return this.equals((get_result)that); + return false; + } + + public boolean equals(get_result that) { + if (that == null) + return false; + + boolean this_present_success = true && (this.success != null); + boolean that_present_success = true && (that.success != null); + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (!this.success.equals(that.success)) + return false; + } + + boolean this_present_io = true && (this.io != null); + boolean that_present_io = true && (that.io != null); + if (this_present_io || that_present_io) { + if (!(this_present_io && that_present_io)) + return false; + if (!this.io.equals(that.io)) + return false; + } + + boolean this_present_nf = true && (this.nf != null); + boolean that_present_nf = true && (that.nf != null); + if (this_present_nf || that_present_nf) { + if (!(this_present_nf && that_present_nf)) + return false; + if (!this.nf.equals(that.nf)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -3047,8 +4246,9 @@ public class Hbase { switch (field.id) { case 0: - if (field.type == TType.STRING) { - this.success = iprot.readBinary(); + if (field.type == TType.STRUCT) { + this.success = new TCell(); + this.success.read(iprot); this.__isset.success = true; } else { TProtocolUtil.skip(iprot, field.type); @@ -3089,10 +4289,10 @@ public class Hbase { if (this.__isset.success) { if (this.success != null) { field.name = "success"; - field.type = TType.STRING; + field.type = TType.STRUCT; field.id = 0; oprot.writeFieldBegin(field); - oprot.writeBinary(this.success); + this.success.write(oprot); oprot.writeFieldEnd(); } } else if (this.__isset.io) { @@ -3121,7 +4321,7 @@ public class Hbase { public String toString() { StringBuilder sb = new StringBuilder("get_result("); sb.append("success:"); - sb.append(this.success); + sb.append(this.success.toString()); sb.append(",io:"); sb.append(this.io.toString()); sb.append(",nf:"); @@ -3139,7 +4339,7 @@ public class Hbase { public int numVersions; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean tableName = false; public boolean row = false; public boolean column = false; @@ -3166,6 +4366,61 @@ public class Hbase { this.__isset.numVersions = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof getVer_args) + return this.equals((getVer_args)that); + return false; + } + + public boolean equals(getVer_args that) { + if (that == null) + return false; + + boolean this_present_tableName = true && (this.tableName != null); + boolean that_present_tableName = true && (that.tableName != null); + if (this_present_tableName || that_present_tableName) { + if (!(this_present_tableName && that_present_tableName)) + return false; + if (!java.util.Arrays.equals(this.tableName, that.tableName)) + return false; + } + + boolean this_present_row = true && (this.row != null); + boolean that_present_row = true && (that.row != null); + if (this_present_row || that_present_row) { + if (!(this_present_row && that_present_row)) + return false; + if (!java.util.Arrays.equals(this.row, that.row)) + return false; + } + + boolean this_present_column = true && (this.column != null); + boolean that_present_column = true && (that.column != null); + if (this_present_column || that_present_column) { + if (!(this_present_column && that_present_column)) + return false; + if (!java.util.Arrays.equals(this.column, that.column)) + return false; + } + + boolean this_present_numVersions = true; + boolean that_present_numVersions = true; + if (this_present_numVersions || that_present_numVersions) { + if (!(this_present_numVersions && that_present_numVersions)) + return false; + if (this.numVersions != that.numVersions) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -3273,12 +4528,12 @@ public class Hbase { } public static class getVer_result implements TBase, java.io.Serializable { - public ArrayList success; + public List success; public IOError io; public NotFound nf; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean success = false; public boolean io = false; public boolean nf = false; @@ -3288,7 +4543,7 @@ public class Hbase { } public getVer_result( - ArrayList success, + List success, IOError io, NotFound nf) { @@ -3301,6 +4556,52 @@ public class Hbase { this.__isset.nf = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof getVer_result) + return this.equals((getVer_result)that); + return false; + } + + public boolean equals(getVer_result that) { + if (that == null) + return false; + + boolean this_present_success = true && (this.success != null); + boolean that_present_success = true && (that.success != null); + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (!this.success.equals(that.success)) + return false; + } + + boolean this_present_io = true && (this.io != null); + boolean that_present_io = true && (that.io != null); + if (this_present_io || that_present_io) { + if (!(this_present_io && that_present_io)) + return false; + if (!this.io.equals(that.io)) + return false; + } + + boolean this_present_nf = true && (this.nf != null); + boolean that_present_nf = true && (that.nf != null); + if (this_present_nf || that_present_nf) { + if (!(this_present_nf && that_present_nf)) + return false; + if (!this.nf.equals(that.nf)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -3316,11 +4617,12 @@ public class Hbase { if (field.type == TType.LIST) { { TList _list26 = iprot.readListBegin(); - this.success = new ArrayList(_list26.size); + this.success = new ArrayList(_list26.size); for (int _i27 = 0; _i27 < _list26.size; ++_i27) { - byte[] _elem28 = null; - _elem28 = iprot.readBinary(); + TCell _elem28 = new TCell(); + _elem28 = new TCell(); + _elem28.read(iprot); this.success.add(_elem28); } iprot.readListEnd(); @@ -3369,9 +4671,9 @@ public class Hbase { field.id = 0; oprot.writeFieldBegin(field); { - oprot.writeListBegin(new TList(TType.STRING, this.success.size())); - for (byte[] _iter29 : this.success) { - oprot.writeBinary(_iter29); + oprot.writeListBegin(new TList(TType.STRUCT, this.success.size())); + for (TCell _iter29 : this.success) { + _iter29.write(oprot); } oprot.writeListEnd(); } @@ -3422,7 +4724,7 @@ public class Hbase { public int numVersions; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean tableName = false; public boolean row = false; public boolean column = false; @@ -3453,6 +4755,70 @@ public class Hbase { this.__isset.numVersions = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof getVerTs_args) + return this.equals((getVerTs_args)that); + return false; + } + + public boolean equals(getVerTs_args that) { + if (that == null) + return false; + + boolean this_present_tableName = true && (this.tableName != null); + boolean that_present_tableName = true && (that.tableName != null); + if (this_present_tableName || that_present_tableName) { + if (!(this_present_tableName && that_present_tableName)) + return false; + if (!java.util.Arrays.equals(this.tableName, that.tableName)) + return false; + } + + boolean this_present_row = true && (this.row != null); + boolean that_present_row = true && (that.row != null); + if (this_present_row || that_present_row) { + if (!(this_present_row && that_present_row)) + return false; + if (!java.util.Arrays.equals(this.row, that.row)) + return false; + } + + boolean this_present_column = true && (this.column != null); + boolean that_present_column = true && (that.column != null); + if (this_present_column || that_present_column) { + if (!(this_present_column && that_present_column)) + return false; + if (!java.util.Arrays.equals(this.column, that.column)) + return false; + } + + boolean this_present_timestamp = true; + boolean that_present_timestamp = true; + if (this_present_timestamp || that_present_timestamp) { + if (!(this_present_timestamp && that_present_timestamp)) + return false; + if (this.timestamp != that.timestamp) + return false; + } + + boolean this_present_numVersions = true; + boolean that_present_numVersions = true; + if (this_present_numVersions || that_present_numVersions) { + if (!(this_present_numVersions && that_present_numVersions)) + return false; + if (this.numVersions != that.numVersions) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -3576,12 +4942,12 @@ public class Hbase { } public static class getVerTs_result implements TBase, java.io.Serializable { - public ArrayList success; + public List success; public IOError io; public NotFound nf; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean success = false; public boolean io = false; public boolean nf = false; @@ -3591,7 +4957,7 @@ public class Hbase { } public getVerTs_result( - ArrayList success, + List success, IOError io, NotFound nf) { @@ -3604,6 +4970,52 @@ public class Hbase { this.__isset.nf = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof getVerTs_result) + return this.equals((getVerTs_result)that); + return false; + } + + public boolean equals(getVerTs_result that) { + if (that == null) + return false; + + boolean this_present_success = true && (this.success != null); + boolean that_present_success = true && (that.success != null); + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (!this.success.equals(that.success)) + return false; + } + + boolean this_present_io = true && (this.io != null); + boolean that_present_io = true && (that.io != null); + if (this_present_io || that_present_io) { + if (!(this_present_io && that_present_io)) + return false; + if (!this.io.equals(that.io)) + return false; + } + + boolean this_present_nf = true && (this.nf != null); + boolean that_present_nf = true && (that.nf != null); + if (this_present_nf || that_present_nf) { + if (!(this_present_nf && that_present_nf)) + return false; + if (!this.nf.equals(that.nf)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -3619,11 +5031,12 @@ public class Hbase { if (field.type == TType.LIST) { { TList _list30 = iprot.readListBegin(); - this.success = new ArrayList(_list30.size); + this.success = new ArrayList(_list30.size); for (int _i31 = 0; _i31 < _list30.size; ++_i31) { - byte[] _elem32 = null; - _elem32 = iprot.readBinary(); + TCell _elem32 = new TCell(); + _elem32 = new TCell(); + _elem32.read(iprot); this.success.add(_elem32); } iprot.readListEnd(); @@ -3672,9 +5085,9 @@ public class Hbase { field.id = 0; oprot.writeFieldBegin(field); { - oprot.writeListBegin(new TList(TType.STRING, this.success.size())); - for (byte[] _iter33 : this.success) { - oprot.writeBinary(_iter33); + oprot.writeListBegin(new TList(TType.STRUCT, this.success.size())); + for (TCell _iter33 : this.success) { + _iter33.write(oprot); } oprot.writeListEnd(); } @@ -3722,7 +5135,7 @@ public class Hbase { public byte[] row; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean tableName = false; public boolean row = false; } @@ -3741,6 +5154,43 @@ public class Hbase { this.__isset.row = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof getRow_args) + return this.equals((getRow_args)that); + return false; + } + + public boolean equals(getRow_args that) { + if (that == null) + return false; + + boolean this_present_tableName = true && (this.tableName != null); + boolean that_present_tableName = true && (that.tableName != null); + if (this_present_tableName || that_present_tableName) { + if (!(this_present_tableName && that_present_tableName)) + return false; + if (!java.util.Arrays.equals(this.tableName, that.tableName)) + return false; + } + + boolean this_present_row = true && (this.row != null); + boolean that_present_row = true && (that.row != null); + if (this_present_row || that_present_row) { + if (!(this_present_row && that_present_row)) + return false; + if (!java.util.Arrays.equals(this.row, that.row)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -3814,11 +5264,11 @@ public class Hbase { } public static class getRow_result implements TBase, java.io.Serializable { - public AbstractMap success; + public TRowResult success; public IOError io; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean success = false; public boolean io = false; } @@ -3827,7 +5277,7 @@ public class Hbase { } public getRow_result( - AbstractMap success, + TRowResult success, IOError io) { this(); @@ -3837,6 +5287,43 @@ public class Hbase { this.__isset.io = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof getRow_result) + return this.equals((getRow_result)that); + return false; + } + + public boolean equals(getRow_result that) { + if (that == null) + return false; + + boolean this_present_success = true && (this.success != null); + boolean that_present_success = true && (that.success != null); + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (!this.success.equals(that.success)) + return false; + } + + boolean this_present_io = true && (this.io != null); + boolean that_present_io = true && (that.io != null); + if (this_present_io || that_present_io) { + if (!(this_present_io && that_present_io)) + return false; + if (!this.io.equals(that.io)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -3849,20 +5336,9 @@ public class Hbase { switch (field.id) { case 0: - if (field.type == TType.MAP) { - { - TMap _map34 = iprot.readMapBegin(); - this.success = new HashMap(2*_map34.size); - for (int _i35 = 0; _i35 < _map34.size; ++_i35) - { - byte[] _key36; - byte[] _val37; - _key36 = iprot.readBinary(); - _val37 = iprot.readBinary(); - this.success.put(_key36, _val37); - } - iprot.readMapEnd(); - } + if (field.type == TType.STRUCT) { + this.success = new TRowResult(); + this.success.read(iprot); this.__isset.success = true; } else { TProtocolUtil.skip(iprot, field.type); @@ -3894,17 +5370,10 @@ public class Hbase { if (this.__isset.success) { if (this.success != null) { field.name = "success"; - field.type = TType.MAP; + field.type = TType.STRUCT; field.id = 0; oprot.writeFieldBegin(field); - { - oprot.writeMapBegin(new TMap(TType.STRING, TType.STRING, this.success.size())); - for (byte[] _iter38 : this.success.keySet()) { - oprot.writeBinary(_iter38); - oprot.writeBinary(this.success.get(_iter38)); - } - oprot.writeMapEnd(); - } + this.success.write(oprot); oprot.writeFieldEnd(); } } else if (this.__isset.io) { @@ -3924,7 +5393,7 @@ public class Hbase { public String toString() { StringBuilder sb = new StringBuilder("getRow_result("); sb.append("success:"); - sb.append(this.success); + sb.append(this.success.toString()); sb.append(",io:"); sb.append(this.io.toString()); sb.append(")"); @@ -3939,7 +5408,7 @@ public class Hbase { public long timestamp; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean tableName = false; public boolean row = false; public boolean timestamp = false; @@ -3962,6 +5431,52 @@ public class Hbase { this.__isset.timestamp = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof getRowTs_args) + return this.equals((getRowTs_args)that); + return false; + } + + public boolean equals(getRowTs_args that) { + if (that == null) + return false; + + boolean this_present_tableName = true && (this.tableName != null); + boolean that_present_tableName = true && (that.tableName != null); + if (this_present_tableName || that_present_tableName) { + if (!(this_present_tableName && that_present_tableName)) + return false; + if (!java.util.Arrays.equals(this.tableName, that.tableName)) + return false; + } + + boolean this_present_row = true && (this.row != null); + boolean that_present_row = true && (that.row != null); + if (this_present_row || that_present_row) { + if (!(this_present_row && that_present_row)) + return false; + if (!java.util.Arrays.equals(this.row, that.row)) + return false; + } + + boolean this_present_timestamp = true; + boolean that_present_timestamp = true; + if (this_present_timestamp || that_present_timestamp) { + if (!(this_present_timestamp && that_present_timestamp)) + return false; + if (this.timestamp != that.timestamp) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -4051,11 +5566,11 @@ public class Hbase { } public static class getRowTs_result implements TBase, java.io.Serializable { - public AbstractMap success; + public TRowResult success; public IOError io; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean success = false; public boolean io = false; } @@ -4064,7 +5579,7 @@ public class Hbase { } public getRowTs_result( - AbstractMap success, + TRowResult success, IOError io) { this(); @@ -4074,6 +5589,43 @@ public class Hbase { this.__isset.io = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof getRowTs_result) + return this.equals((getRowTs_result)that); + return false; + } + + public boolean equals(getRowTs_result that) { + if (that == null) + return false; + + boolean this_present_success = true && (this.success != null); + boolean that_present_success = true && (that.success != null); + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (!this.success.equals(that.success)) + return false; + } + + boolean this_present_io = true && (this.io != null); + boolean that_present_io = true && (that.io != null); + if (this_present_io || that_present_io) { + if (!(this_present_io && that_present_io)) + return false; + if (!this.io.equals(that.io)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -4086,20 +5638,9 @@ public class Hbase { switch (field.id) { case 0: - if (field.type == TType.MAP) { - { - TMap _map39 = iprot.readMapBegin(); - this.success = new HashMap(2*_map39.size); - for (int _i40 = 0; _i40 < _map39.size; ++_i40) - { - byte[] _key41; - byte[] _val42; - _key41 = iprot.readBinary(); - _val42 = iprot.readBinary(); - this.success.put(_key41, _val42); - } - iprot.readMapEnd(); - } + if (field.type == TType.STRUCT) { + this.success = new TRowResult(); + this.success.read(iprot); this.__isset.success = true; } else { TProtocolUtil.skip(iprot, field.type); @@ -4131,17 +5672,10 @@ public class Hbase { if (this.__isset.success) { if (this.success != null) { field.name = "success"; - field.type = TType.MAP; + field.type = TType.STRUCT; field.id = 0; oprot.writeFieldBegin(field); - { - oprot.writeMapBegin(new TMap(TType.STRING, TType.STRING, this.success.size())); - for (byte[] _iter43 : this.success.keySet()) { - oprot.writeBinary(_iter43); - oprot.writeBinary(this.success.get(_iter43)); - } - oprot.writeMapEnd(); - } + this.success.write(oprot); oprot.writeFieldEnd(); } } else if (this.__isset.io) { @@ -4161,7 +5695,7 @@ public class Hbase { public String toString() { StringBuilder sb = new StringBuilder("getRowTs_result("); sb.append("success:"); - sb.append(this.success); + sb.append(this.success.toString()); sb.append(",io:"); sb.append(this.io.toString()); sb.append(")"); @@ -4170,257 +5704,13 @@ public class Hbase { } - public static class put_args implements TBase, java.io.Serializable { - public byte[] tableName; - public byte[] row; - public byte[] column; - public byte[] value; - - public final Isset __isset = new Isset(); - public static final class Isset { - public boolean tableName = false; - public boolean row = false; - public boolean column = false; - public boolean value = false; - } - - public put_args() { - } - - public put_args( - byte[] tableName, - byte[] row, - byte[] column, - byte[] value) - { - this(); - this.tableName = tableName; - this.__isset.tableName = true; - this.row = row; - this.__isset.row = true; - this.column = column; - this.__isset.column = true; - this.value = value; - this.__isset.value = true; - } - - public void read(TProtocol iprot) throws TException { - TField field; - iprot.readStructBegin(); - while (true) - { - field = iprot.readFieldBegin(); - if (field.type == TType.STOP) { - break; - } - switch (field.id) - { - case 1: - if (field.type == TType.STRING) { - this.tableName = iprot.readBinary(); - this.__isset.tableName = true; - } else { - TProtocolUtil.skip(iprot, field.type); - } - break; - case 2: - if (field.type == TType.STRING) { - this.row = iprot.readBinary(); - this.__isset.row = true; - } else { - TProtocolUtil.skip(iprot, field.type); - } - break; - case 3: - if (field.type == TType.STRING) { - this.column = iprot.readBinary(); - this.__isset.column = true; - } else { - TProtocolUtil.skip(iprot, field.type); - } - break; - case 4: - if (field.type == TType.STRING) { - this.value = iprot.readBinary(); - this.__isset.value = true; - } else { - TProtocolUtil.skip(iprot, field.type); - } - break; - default: - TProtocolUtil.skip(iprot, field.type); - break; - } - iprot.readFieldEnd(); - } - iprot.readStructEnd(); - } - - public void write(TProtocol oprot) throws TException { - TStruct struct = new TStruct("put_args"); - oprot.writeStructBegin(struct); - TField field = new TField(); - if (this.tableName != null) { - field.name = "tableName"; - field.type = TType.STRING; - field.id = 1; - oprot.writeFieldBegin(field); - oprot.writeBinary(this.tableName); - oprot.writeFieldEnd(); - } - if (this.row != null) { - field.name = "row"; - field.type = TType.STRING; - field.id = 2; - oprot.writeFieldBegin(field); - oprot.writeBinary(this.row); - oprot.writeFieldEnd(); - } - if (this.column != null) { - field.name = "column"; - field.type = TType.STRING; - field.id = 3; - oprot.writeFieldBegin(field); - oprot.writeBinary(this.column); - oprot.writeFieldEnd(); - } - if (this.value != null) { - field.name = "value"; - field.type = TType.STRING; - field.id = 4; - oprot.writeFieldBegin(field); - oprot.writeBinary(this.value); - oprot.writeFieldEnd(); - } - oprot.writeFieldStop(); - oprot.writeStructEnd(); - } - - public String toString() { - StringBuilder sb = new StringBuilder("put_args("); - sb.append("tableName:"); - sb.append(this.tableName); - sb.append(",row:"); - sb.append(this.row); - sb.append(",column:"); - sb.append(this.column); - sb.append(",value:"); - sb.append(this.value); - sb.append(")"); - return sb.toString(); - } - - } - - public static class put_result implements TBase, java.io.Serializable { - public IOError io; - public IllegalArgument ia; - - public final Isset __isset = new Isset(); - public static final class Isset { - public boolean io = false; - public boolean ia = false; - } - - public put_result() { - } - - public put_result( - IOError io, - IllegalArgument ia) - { - this(); - this.io = io; - this.__isset.io = true; - this.ia = ia; - this.__isset.ia = true; - } - - public void read(TProtocol iprot) throws TException { - TField field; - iprot.readStructBegin(); - while (true) - { - field = iprot.readFieldBegin(); - if (field.type == TType.STOP) { - break; - } - switch (field.id) - { - case 1: - if (field.type == TType.STRUCT) { - this.io = new IOError(); - this.io.read(iprot); - this.__isset.io = true; - } else { - TProtocolUtil.skip(iprot, field.type); - } - break; - case 2: - if (field.type == TType.STRUCT) { - this.ia = new IllegalArgument(); - this.ia.read(iprot); - this.__isset.ia = true; - } else { - TProtocolUtil.skip(iprot, field.type); - } - break; - default: - TProtocolUtil.skip(iprot, field.type); - break; - } - iprot.readFieldEnd(); - } - iprot.readStructEnd(); - } - - public void write(TProtocol oprot) throws TException { - TStruct struct = new TStruct("put_result"); - oprot.writeStructBegin(struct); - TField field = new TField(); - - if (this.__isset.io) { - if (this.io != null) { - field.name = "io"; - field.type = TType.STRUCT; - field.id = 1; - oprot.writeFieldBegin(field); - this.io.write(oprot); - oprot.writeFieldEnd(); - } - } else if (this.__isset.ia) { - if (this.ia != null) { - field.name = "ia"; - field.type = TType.STRUCT; - field.id = 2; - oprot.writeFieldBegin(field); - this.ia.write(oprot); - oprot.writeFieldEnd(); - } - } - oprot.writeFieldStop(); - oprot.writeStructEnd(); - } - - public String toString() { - StringBuilder sb = new StringBuilder("put_result("); - sb.append("io:"); - sb.append(this.io.toString()); - sb.append(",ia:"); - sb.append(this.ia.toString()); - sb.append(")"); - return sb.toString(); - } - - } - public static class mutateRow_args implements TBase, java.io.Serializable { public byte[] tableName; public byte[] row; - public ArrayList mutations; + public List mutations; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean tableName = false; public boolean row = false; public boolean mutations = false; @@ -4432,7 +5722,7 @@ public class Hbase { public mutateRow_args( byte[] tableName, byte[] row, - ArrayList mutations) + List mutations) { this(); this.tableName = tableName; @@ -4443,6 +5733,52 @@ public class Hbase { this.__isset.mutations = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof mutateRow_args) + return this.equals((mutateRow_args)that); + return false; + } + + public boolean equals(mutateRow_args that) { + if (that == null) + return false; + + boolean this_present_tableName = true && (this.tableName != null); + boolean that_present_tableName = true && (that.tableName != null); + if (this_present_tableName || that_present_tableName) { + if (!(this_present_tableName && that_present_tableName)) + return false; + if (!java.util.Arrays.equals(this.tableName, that.tableName)) + return false; + } + + boolean this_present_row = true && (this.row != null); + boolean that_present_row = true && (that.row != null); + if (this_present_row || that_present_row) { + if (!(this_present_row && that_present_row)) + return false; + if (!java.util.Arrays.equals(this.row, that.row)) + return false; + } + + boolean this_present_mutations = true && (this.mutations != null); + boolean that_present_mutations = true && (that.mutations != null); + if (this_present_mutations || that_present_mutations) { + if (!(this_present_mutations && that_present_mutations)) + return false; + if (!this.mutations.equals(that.mutations)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -4473,14 +5809,14 @@ public class Hbase { case 3: if (field.type == TType.LIST) { { - TList _list44 = iprot.readListBegin(); - this.mutations = new ArrayList(_list44.size); - for (int _i45 = 0; _i45 < _list44.size; ++_i45) + TList _list34 = iprot.readListBegin(); + this.mutations = new ArrayList(_list34.size); + for (int _i35 = 0; _i35 < _list34.size; ++_i35) { - Mutation _elem46 = new Mutation(); - _elem46 = new Mutation(); - _elem46.read(iprot); - this.mutations.add(_elem46); + Mutation _elem36 = new Mutation(); + _elem36 = new Mutation(); + _elem36.read(iprot); + this.mutations.add(_elem36); } iprot.readListEnd(); } @@ -4525,8 +5861,8 @@ public class Hbase { oprot.writeFieldBegin(field); { oprot.writeListBegin(new TList(TType.STRUCT, this.mutations.size())); - for (Mutation _iter47 : this.mutations) { - _iter47.write(oprot); + for (Mutation _iter37 : this.mutations) { + _iter37.write(oprot); } oprot.writeListEnd(); } @@ -4555,7 +5891,7 @@ public class Hbase { public IllegalArgument ia; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean io = false; public boolean ia = false; } @@ -4574,6 +5910,43 @@ public class Hbase { this.__isset.ia = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof mutateRow_result) + return this.equals((mutateRow_result)that); + return false; + } + + public boolean equals(mutateRow_result that) { + if (that == null) + return false; + + boolean this_present_io = true && (this.io != null); + boolean that_present_io = true && (that.io != null); + if (this_present_io || that_present_io) { + if (!(this_present_io && that_present_io)) + return false; + if (!this.io.equals(that.io)) + return false; + } + + boolean this_present_ia = true && (this.ia != null); + boolean that_present_ia = true && (that.ia != null); + if (this_present_ia || that_present_ia) { + if (!(this_present_ia && that_present_ia)) + return false; + if (!this.ia.equals(that.ia)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -4655,11 +6028,11 @@ public class Hbase { public static class mutateRowTs_args implements TBase, java.io.Serializable { public byte[] tableName; public byte[] row; - public ArrayList mutations; + public List mutations; public long timestamp; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean tableName = false; public boolean row = false; public boolean mutations = false; @@ -4672,7 +6045,7 @@ public class Hbase { public mutateRowTs_args( byte[] tableName, byte[] row, - ArrayList mutations, + List mutations, long timestamp) { this(); @@ -4686,6 +6059,61 @@ public class Hbase { this.__isset.timestamp = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof mutateRowTs_args) + return this.equals((mutateRowTs_args)that); + return false; + } + + public boolean equals(mutateRowTs_args that) { + if (that == null) + return false; + + boolean this_present_tableName = true && (this.tableName != null); + boolean that_present_tableName = true && (that.tableName != null); + if (this_present_tableName || that_present_tableName) { + if (!(this_present_tableName && that_present_tableName)) + return false; + if (!java.util.Arrays.equals(this.tableName, that.tableName)) + return false; + } + + boolean this_present_row = true && (this.row != null); + boolean that_present_row = true && (that.row != null); + if (this_present_row || that_present_row) { + if (!(this_present_row && that_present_row)) + return false; + if (!java.util.Arrays.equals(this.row, that.row)) + return false; + } + + boolean this_present_mutations = true && (this.mutations != null); + boolean that_present_mutations = true && (that.mutations != null); + if (this_present_mutations || that_present_mutations) { + if (!(this_present_mutations && that_present_mutations)) + return false; + if (!this.mutations.equals(that.mutations)) + return false; + } + + boolean this_present_timestamp = true; + boolean that_present_timestamp = true; + if (this_present_timestamp || that_present_timestamp) { + if (!(this_present_timestamp && that_present_timestamp)) + return false; + if (this.timestamp != that.timestamp) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -4716,14 +6144,14 @@ public class Hbase { case 3: if (field.type == TType.LIST) { { - TList _list48 = iprot.readListBegin(); - this.mutations = new ArrayList(_list48.size); - for (int _i49 = 0; _i49 < _list48.size; ++_i49) + TList _list38 = iprot.readListBegin(); + this.mutations = new ArrayList(_list38.size); + for (int _i39 = 0; _i39 < _list38.size; ++_i39) { - Mutation _elem50 = new Mutation(); - _elem50 = new Mutation(); - _elem50.read(iprot); - this.mutations.add(_elem50); + Mutation _elem40 = new Mutation(); + _elem40 = new Mutation(); + _elem40.read(iprot); + this.mutations.add(_elem40); } iprot.readListEnd(); } @@ -4776,8 +6204,8 @@ public class Hbase { oprot.writeFieldBegin(field); { oprot.writeListBegin(new TList(TType.STRUCT, this.mutations.size())); - for (Mutation _iter51 : this.mutations) { - _iter51.write(oprot); + for (Mutation _iter41 : this.mutations) { + _iter41.write(oprot); } oprot.writeListEnd(); } @@ -4814,7 +6242,7 @@ public class Hbase { public IllegalArgument ia; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean io = false; public boolean ia = false; } @@ -4833,6 +6261,43 @@ public class Hbase { this.__isset.ia = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof mutateRowTs_result) + return this.equals((mutateRowTs_result)that); + return false; + } + + public boolean equals(mutateRowTs_result that) { + if (that == null) + return false; + + boolean this_present_io = true && (this.io != null); + boolean that_present_io = true && (that.io != null); + if (this_present_io || that_present_io) { + if (!(this_present_io && that_present_io)) + return false; + if (!this.io.equals(that.io)) + return false; + } + + boolean this_present_ia = true && (this.ia != null); + boolean that_present_ia = true && (that.ia != null); + if (this_present_ia || that_present_ia) { + if (!(this_present_ia && that_present_ia)) + return false; + if (!this.ia.equals(that.ia)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -4913,10 +6378,10 @@ public class Hbase { public static class mutateRows_args implements TBase, java.io.Serializable { public byte[] tableName; - public ArrayList rowBatches; + public List rowBatches; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean tableName = false; public boolean rowBatches = false; } @@ -4926,7 +6391,7 @@ public class Hbase { public mutateRows_args( byte[] tableName, - ArrayList rowBatches) + List rowBatches) { this(); this.tableName = tableName; @@ -4935,6 +6400,43 @@ public class Hbase { this.__isset.rowBatches = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof mutateRows_args) + return this.equals((mutateRows_args)that); + return false; + } + + public boolean equals(mutateRows_args that) { + if (that == null) + return false; + + boolean this_present_tableName = true && (this.tableName != null); + boolean that_present_tableName = true && (that.tableName != null); + if (this_present_tableName || that_present_tableName) { + if (!(this_present_tableName && that_present_tableName)) + return false; + if (!java.util.Arrays.equals(this.tableName, that.tableName)) + return false; + } + + boolean this_present_rowBatches = true && (this.rowBatches != null); + boolean that_present_rowBatches = true && (that.rowBatches != null); + if (this_present_rowBatches || that_present_rowBatches) { + if (!(this_present_rowBatches && that_present_rowBatches)) + return false; + if (!this.rowBatches.equals(that.rowBatches)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -4957,14 +6459,14 @@ public class Hbase { case 2: if (field.type == TType.LIST) { { - TList _list52 = iprot.readListBegin(); - this.rowBatches = new ArrayList(_list52.size); - for (int _i53 = 0; _i53 < _list52.size; ++_i53) + TList _list42 = iprot.readListBegin(); + this.rowBatches = new ArrayList(_list42.size); + for (int _i43 = 0; _i43 < _list42.size; ++_i43) { - BatchMutation _elem54 = new BatchMutation(); - _elem54 = new BatchMutation(); - _elem54.read(iprot); - this.rowBatches.add(_elem54); + BatchMutation _elem44 = new BatchMutation(); + _elem44 = new BatchMutation(); + _elem44.read(iprot); + this.rowBatches.add(_elem44); } iprot.readListEnd(); } @@ -5001,8 +6503,8 @@ public class Hbase { oprot.writeFieldBegin(field); { oprot.writeListBegin(new TList(TType.STRUCT, this.rowBatches.size())); - for (BatchMutation _iter55 : this.rowBatches) { - _iter55.write(oprot); + for (BatchMutation _iter45 : this.rowBatches) { + _iter45.write(oprot); } oprot.writeListEnd(); } @@ -5029,7 +6531,7 @@ public class Hbase { public IllegalArgument ia; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean io = false; public boolean ia = false; } @@ -5048,6 +6550,43 @@ public class Hbase { this.__isset.ia = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof mutateRows_result) + return this.equals((mutateRows_result)that); + return false; + } + + public boolean equals(mutateRows_result that) { + if (that == null) + return false; + + boolean this_present_io = true && (this.io != null); + boolean that_present_io = true && (that.io != null); + if (this_present_io || that_present_io) { + if (!(this_present_io && that_present_io)) + return false; + if (!this.io.equals(that.io)) + return false; + } + + boolean this_present_ia = true && (this.ia != null); + boolean that_present_ia = true && (that.ia != null); + if (this_present_ia || that_present_ia) { + if (!(this_present_ia && that_present_ia)) + return false; + if (!this.ia.equals(that.ia)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -5128,11 +6667,11 @@ public class Hbase { public static class mutateRowsTs_args implements TBase, java.io.Serializable { public byte[] tableName; - public ArrayList rowBatches; + public List rowBatches; public long timestamp; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean tableName = false; public boolean rowBatches = false; public boolean timestamp = false; @@ -5143,7 +6682,7 @@ public class Hbase { public mutateRowsTs_args( byte[] tableName, - ArrayList rowBatches, + List rowBatches, long timestamp) { this(); @@ -5155,6 +6694,52 @@ public class Hbase { this.__isset.timestamp = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof mutateRowsTs_args) + return this.equals((mutateRowsTs_args)that); + return false; + } + + public boolean equals(mutateRowsTs_args that) { + if (that == null) + return false; + + boolean this_present_tableName = true && (this.tableName != null); + boolean that_present_tableName = true && (that.tableName != null); + if (this_present_tableName || that_present_tableName) { + if (!(this_present_tableName && that_present_tableName)) + return false; + if (!java.util.Arrays.equals(this.tableName, that.tableName)) + return false; + } + + boolean this_present_rowBatches = true && (this.rowBatches != null); + boolean that_present_rowBatches = true && (that.rowBatches != null); + if (this_present_rowBatches || that_present_rowBatches) { + if (!(this_present_rowBatches && that_present_rowBatches)) + return false; + if (!this.rowBatches.equals(that.rowBatches)) + return false; + } + + boolean this_present_timestamp = true; + boolean that_present_timestamp = true; + if (this_present_timestamp || that_present_timestamp) { + if (!(this_present_timestamp && that_present_timestamp)) + return false; + if (this.timestamp != that.timestamp) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -5177,14 +6762,14 @@ public class Hbase { case 2: if (field.type == TType.LIST) { { - TList _list56 = iprot.readListBegin(); - this.rowBatches = new ArrayList(_list56.size); - for (int _i57 = 0; _i57 < _list56.size; ++_i57) + TList _list46 = iprot.readListBegin(); + this.rowBatches = new ArrayList(_list46.size); + for (int _i47 = 0; _i47 < _list46.size; ++_i47) { - BatchMutation _elem58 = new BatchMutation(); - _elem58 = new BatchMutation(); - _elem58.read(iprot); - this.rowBatches.add(_elem58); + BatchMutation _elem48 = new BatchMutation(); + _elem48 = new BatchMutation(); + _elem48.read(iprot); + this.rowBatches.add(_elem48); } iprot.readListEnd(); } @@ -5229,8 +6814,8 @@ public class Hbase { oprot.writeFieldBegin(field); { oprot.writeListBegin(new TList(TType.STRUCT, this.rowBatches.size())); - for (BatchMutation _iter59 : this.rowBatches) { - _iter59.write(oprot); + for (BatchMutation _iter49 : this.rowBatches) { + _iter49.write(oprot); } oprot.writeListEnd(); } @@ -5265,7 +6850,7 @@ public class Hbase { public IllegalArgument ia; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean io = false; public boolean ia = false; } @@ -5284,6 +6869,43 @@ public class Hbase { this.__isset.ia = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof mutateRowsTs_result) + return this.equals((mutateRowsTs_result)that); + return false; + } + + public boolean equals(mutateRowsTs_result that) { + if (that == null) + return false; + + boolean this_present_io = true && (this.io != null); + boolean that_present_io = true && (that.io != null); + if (this_present_io || that_present_io) { + if (!(this_present_io && that_present_io)) + return false; + if (!this.io.equals(that.io)) + return false; + } + + boolean this_present_ia = true && (this.ia != null); + boolean that_present_ia = true && (that.ia != null); + if (this_present_ia || that_present_ia) { + if (!(this_present_ia && that_present_ia)) + return false; + if (!this.ia.equals(that.ia)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -5368,7 +6990,7 @@ public class Hbase { public byte[] column; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean tableName = false; public boolean row = false; public boolean column = false; @@ -5391,6 +7013,52 @@ public class Hbase { this.__isset.column = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof deleteAll_args) + return this.equals((deleteAll_args)that); + return false; + } + + public boolean equals(deleteAll_args that) { + if (that == null) + return false; + + boolean this_present_tableName = true && (this.tableName != null); + boolean that_present_tableName = true && (that.tableName != null); + if (this_present_tableName || that_present_tableName) { + if (!(this_present_tableName && that_present_tableName)) + return false; + if (!java.util.Arrays.equals(this.tableName, that.tableName)) + return false; + } + + boolean this_present_row = true && (this.row != null); + boolean that_present_row = true && (that.row != null); + if (this_present_row || that_present_row) { + if (!(this_present_row && that_present_row)) + return false; + if (!java.util.Arrays.equals(this.row, that.row)) + return false; + } + + boolean this_present_column = true && (this.column != null); + boolean that_present_column = true && (that.column != null); + if (this_present_column || that_present_column) { + if (!(this_present_column && that_present_column)) + return false; + if (!java.util.Arrays.equals(this.column, that.column)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -5485,7 +7153,7 @@ public class Hbase { public IOError io; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean io = false; } @@ -5500,6 +7168,34 @@ public class Hbase { this.__isset.io = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof deleteAll_result) + return this.equals((deleteAll_result)that); + return false; + } + + public boolean equals(deleteAll_result that) { + if (that == null) + return false; + + boolean this_present_io = true && (this.io != null); + boolean that_present_io = true && (that.io != null); + if (this_present_io || that_present_io) { + if (!(this_present_io && that_present_io)) + return false; + if (!this.io.equals(that.io)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -5565,7 +7261,7 @@ public class Hbase { public long timestamp; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean tableName = false; public boolean row = false; public boolean column = false; @@ -5592,6 +7288,61 @@ public class Hbase { this.__isset.timestamp = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof deleteAllTs_args) + return this.equals((deleteAllTs_args)that); + return false; + } + + public boolean equals(deleteAllTs_args that) { + if (that == null) + return false; + + boolean this_present_tableName = true && (this.tableName != null); + boolean that_present_tableName = true && (that.tableName != null); + if (this_present_tableName || that_present_tableName) { + if (!(this_present_tableName && that_present_tableName)) + return false; + if (!java.util.Arrays.equals(this.tableName, that.tableName)) + return false; + } + + boolean this_present_row = true && (this.row != null); + boolean that_present_row = true && (that.row != null); + if (this_present_row || that_present_row) { + if (!(this_present_row && that_present_row)) + return false; + if (!java.util.Arrays.equals(this.row, that.row)) + return false; + } + + boolean this_present_column = true && (this.column != null); + boolean that_present_column = true && (that.column != null); + if (this_present_column || that_present_column) { + if (!(this_present_column && that_present_column)) + return false; + if (!java.util.Arrays.equals(this.column, that.column)) + return false; + } + + boolean this_present_timestamp = true; + boolean that_present_timestamp = true; + if (this_present_timestamp || that_present_timestamp) { + if (!(this_present_timestamp && that_present_timestamp)) + return false; + if (this.timestamp != that.timestamp) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -5702,7 +7453,7 @@ public class Hbase { public IOError io; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean io = false; } @@ -5717,6 +7468,34 @@ public class Hbase { this.__isset.io = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof deleteAllTs_result) + return this.equals((deleteAllTs_result)that); + return false; + } + + public boolean equals(deleteAllTs_result that) { + if (that == null) + return false; + + boolean this_present_io = true && (this.io != null); + boolean that_present_io = true && (that.io != null); + if (this_present_io || that_present_io) { + if (!(this_present_io && that_present_io)) + return false; + if (!this.io.equals(that.io)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -5780,7 +7559,7 @@ public class Hbase { public byte[] row; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean tableName = false; public boolean row = false; } @@ -5799,6 +7578,43 @@ public class Hbase { this.__isset.row = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof deleteAllRow_args) + return this.equals((deleteAllRow_args)that); + return false; + } + + public boolean equals(deleteAllRow_args that) { + if (that == null) + return false; + + boolean this_present_tableName = true && (this.tableName != null); + boolean that_present_tableName = true && (that.tableName != null); + if (this_present_tableName || that_present_tableName) { + if (!(this_present_tableName && that_present_tableName)) + return false; + if (!java.util.Arrays.equals(this.tableName, that.tableName)) + return false; + } + + boolean this_present_row = true && (this.row != null); + boolean that_present_row = true && (that.row != null); + if (this_present_row || that_present_row) { + if (!(this_present_row && that_present_row)) + return false; + if (!java.util.Arrays.equals(this.row, that.row)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -5875,7 +7691,7 @@ public class Hbase { public IOError io; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean io = false; } @@ -5890,6 +7706,34 @@ public class Hbase { this.__isset.io = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof deleteAllRow_result) + return this.equals((deleteAllRow_result)that); + return false; + } + + public boolean equals(deleteAllRow_result that) { + if (that == null) + return false; + + boolean this_present_io = true && (this.io != null); + boolean that_present_io = true && (that.io != null); + if (this_present_io || that_present_io) { + if (!(this_present_io && that_present_io)) + return false; + if (!this.io.equals(that.io)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -5954,7 +7798,7 @@ public class Hbase { public long timestamp; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean tableName = false; public boolean row = false; public boolean timestamp = false; @@ -5977,6 +7821,52 @@ public class Hbase { this.__isset.timestamp = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof deleteAllRowTs_args) + return this.equals((deleteAllRowTs_args)that); + return false; + } + + public boolean equals(deleteAllRowTs_args that) { + if (that == null) + return false; + + boolean this_present_tableName = true && (this.tableName != null); + boolean that_present_tableName = true && (that.tableName != null); + if (this_present_tableName || that_present_tableName) { + if (!(this_present_tableName && that_present_tableName)) + return false; + if (!java.util.Arrays.equals(this.tableName, that.tableName)) + return false; + } + + boolean this_present_row = true && (this.row != null); + boolean that_present_row = true && (that.row != null); + if (this_present_row || that_present_row) { + if (!(this_present_row && that_present_row)) + return false; + if (!java.util.Arrays.equals(this.row, that.row)) + return false; + } + + boolean this_present_timestamp = true; + boolean that_present_timestamp = true; + if (this_present_timestamp || that_present_timestamp) { + if (!(this_present_timestamp && that_present_timestamp)) + return false; + if (this.timestamp != that.timestamp) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -6069,7 +7959,7 @@ public class Hbase { public IOError io; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean io = false; } @@ -6084,6 +7974,34 @@ public class Hbase { this.__isset.io = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof deleteAllRowTs_result) + return this.equals((deleteAllRowTs_result)that); + return false; + } + + public boolean equals(deleteAllRowTs_result that) { + if (that == null) + return false; + + boolean this_present_io = true && (this.io != null); + boolean that_present_io = true && (that.io != null); + if (this_present_io || that_present_io) { + if (!(this_present_io && that_present_io)) + return false; + if (!this.io.equals(that.io)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -6145,10 +8063,10 @@ public class Hbase { public static class scannerOpen_args implements TBase, java.io.Serializable { public byte[] tableName; public byte[] startRow; - public ArrayList columns; + public List columns; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean tableName = false; public boolean startRow = false; public boolean columns = false; @@ -6160,7 +8078,7 @@ public class Hbase { public scannerOpen_args( byte[] tableName, byte[] startRow, - ArrayList columns) + List columns) { this(); this.tableName = tableName; @@ -6171,6 +8089,52 @@ public class Hbase { this.__isset.columns = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof scannerOpen_args) + return this.equals((scannerOpen_args)that); + return false; + } + + public boolean equals(scannerOpen_args that) { + if (that == null) + return false; + + boolean this_present_tableName = true && (this.tableName != null); + boolean that_present_tableName = true && (that.tableName != null); + if (this_present_tableName || that_present_tableName) { + if (!(this_present_tableName && that_present_tableName)) + return false; + if (!java.util.Arrays.equals(this.tableName, that.tableName)) + return false; + } + + boolean this_present_startRow = true && (this.startRow != null); + boolean that_present_startRow = true && (that.startRow != null); + if (this_present_startRow || that_present_startRow) { + if (!(this_present_startRow && that_present_startRow)) + return false; + if (!java.util.Arrays.equals(this.startRow, that.startRow)) + return false; + } + + boolean this_present_columns = true && (this.columns != null); + boolean that_present_columns = true && (that.columns != null); + if (this_present_columns || that_present_columns) { + if (!(this_present_columns && that_present_columns)) + return false; + if (!this.columns.equals(that.columns)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -6201,13 +8165,13 @@ public class Hbase { case 3: if (field.type == TType.LIST) { { - TList _list60 = iprot.readListBegin(); - this.columns = new ArrayList(_list60.size); - for (int _i61 = 0; _i61 < _list60.size; ++_i61) + TList _list50 = iprot.readListBegin(); + this.columns = new ArrayList(_list50.size); + for (int _i51 = 0; _i51 < _list50.size; ++_i51) { - byte[] _elem62 = null; - _elem62 = iprot.readBinary(); - this.columns.add(_elem62); + byte[] _elem52 = null; + _elem52 = iprot.readBinary(); + this.columns.add(_elem52); } iprot.readListEnd(); } @@ -6252,8 +8216,8 @@ public class Hbase { oprot.writeFieldBegin(field); { oprot.writeListBegin(new TList(TType.STRING, this.columns.size())); - for (byte[] _iter63 : this.columns) { - oprot.writeBinary(_iter63); + for (byte[] _iter53 : this.columns) { + oprot.writeBinary(_iter53); } oprot.writeListEnd(); } @@ -6282,7 +8246,7 @@ public class Hbase { public IOError io; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean success = false; public boolean io = false; } @@ -6301,6 +8265,43 @@ public class Hbase { this.__isset.io = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof scannerOpen_result) + return this.equals((scannerOpen_result)that); + return false; + } + + public boolean equals(scannerOpen_result that) { + if (that == null) + return false; + + boolean this_present_success = true; + boolean that_present_success = true; + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (this.success != that.success) + return false; + } + + boolean this_present_io = true && (this.io != null); + boolean that_present_io = true && (that.io != null); + if (this_present_io || that_present_io) { + if (!(this_present_io && that_present_io)) + return false; + if (!this.io.equals(that.io)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -6380,10 +8381,10 @@ public class Hbase { public byte[] tableName; public byte[] startRow; public byte[] stopRow; - public ArrayList columns; + public List columns; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean tableName = false; public boolean startRow = false; public boolean stopRow = false; @@ -6397,7 +8398,7 @@ public class Hbase { byte[] tableName, byte[] startRow, byte[] stopRow, - ArrayList columns) + List columns) { this(); this.tableName = tableName; @@ -6410,6 +8411,61 @@ public class Hbase { this.__isset.columns = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof scannerOpenWithStop_args) + return this.equals((scannerOpenWithStop_args)that); + return false; + } + + public boolean equals(scannerOpenWithStop_args that) { + if (that == null) + return false; + + boolean this_present_tableName = true && (this.tableName != null); + boolean that_present_tableName = true && (that.tableName != null); + if (this_present_tableName || that_present_tableName) { + if (!(this_present_tableName && that_present_tableName)) + return false; + if (!java.util.Arrays.equals(this.tableName, that.tableName)) + return false; + } + + boolean this_present_startRow = true && (this.startRow != null); + boolean that_present_startRow = true && (that.startRow != null); + if (this_present_startRow || that_present_startRow) { + if (!(this_present_startRow && that_present_startRow)) + return false; + if (!java.util.Arrays.equals(this.startRow, that.startRow)) + return false; + } + + boolean this_present_stopRow = true && (this.stopRow != null); + boolean that_present_stopRow = true && (that.stopRow != null); + if (this_present_stopRow || that_present_stopRow) { + if (!(this_present_stopRow && that_present_stopRow)) + return false; + if (!java.util.Arrays.equals(this.stopRow, that.stopRow)) + return false; + } + + boolean this_present_columns = true && (this.columns != null); + boolean that_present_columns = true && (that.columns != null); + if (this_present_columns || that_present_columns) { + if (!(this_present_columns && that_present_columns)) + return false; + if (!this.columns.equals(that.columns)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -6448,13 +8504,13 @@ public class Hbase { case 4: if (field.type == TType.LIST) { { - TList _list64 = iprot.readListBegin(); - this.columns = new ArrayList(_list64.size); - for (int _i65 = 0; _i65 < _list64.size; ++_i65) + TList _list54 = iprot.readListBegin(); + this.columns = new ArrayList(_list54.size); + for (int _i55 = 0; _i55 < _list54.size; ++_i55) { - byte[] _elem66 = null; - _elem66 = iprot.readBinary(); - this.columns.add(_elem66); + byte[] _elem56 = null; + _elem56 = iprot.readBinary(); + this.columns.add(_elem56); } iprot.readListEnd(); } @@ -6507,8 +8563,8 @@ public class Hbase { oprot.writeFieldBegin(field); { oprot.writeListBegin(new TList(TType.STRING, this.columns.size())); - for (byte[] _iter67 : this.columns) { - oprot.writeBinary(_iter67); + for (byte[] _iter57 : this.columns) { + oprot.writeBinary(_iter57); } oprot.writeListEnd(); } @@ -6539,7 +8595,7 @@ public class Hbase { public IOError io; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean success = false; public boolean io = false; } @@ -6558,6 +8614,43 @@ public class Hbase { this.__isset.io = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof scannerOpenWithStop_result) + return this.equals((scannerOpenWithStop_result)that); + return false; + } + + public boolean equals(scannerOpenWithStop_result that) { + if (that == null) + return false; + + boolean this_present_success = true; + boolean that_present_success = true; + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (this.success != that.success) + return false; + } + + boolean this_present_io = true && (this.io != null); + boolean that_present_io = true && (that.io != null); + if (this_present_io || that_present_io) { + if (!(this_present_io && that_present_io)) + return false; + if (!this.io.equals(that.io)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -6636,11 +8729,11 @@ public class Hbase { public static class scannerOpenTs_args implements TBase, java.io.Serializable { public byte[] tableName; public byte[] startRow; - public ArrayList columns; + public List columns; public long timestamp; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean tableName = false; public boolean startRow = false; public boolean columns = false; @@ -6653,7 +8746,7 @@ public class Hbase { public scannerOpenTs_args( byte[] tableName, byte[] startRow, - ArrayList columns, + List columns, long timestamp) { this(); @@ -6667,6 +8760,61 @@ public class Hbase { this.__isset.timestamp = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof scannerOpenTs_args) + return this.equals((scannerOpenTs_args)that); + return false; + } + + public boolean equals(scannerOpenTs_args that) { + if (that == null) + return false; + + boolean this_present_tableName = true && (this.tableName != null); + boolean that_present_tableName = true && (that.tableName != null); + if (this_present_tableName || that_present_tableName) { + if (!(this_present_tableName && that_present_tableName)) + return false; + if (!java.util.Arrays.equals(this.tableName, that.tableName)) + return false; + } + + boolean this_present_startRow = true && (this.startRow != null); + boolean that_present_startRow = true && (that.startRow != null); + if (this_present_startRow || that_present_startRow) { + if (!(this_present_startRow && that_present_startRow)) + return false; + if (!java.util.Arrays.equals(this.startRow, that.startRow)) + return false; + } + + boolean this_present_columns = true && (this.columns != null); + boolean that_present_columns = true && (that.columns != null); + if (this_present_columns || that_present_columns) { + if (!(this_present_columns && that_present_columns)) + return false; + if (!this.columns.equals(that.columns)) + return false; + } + + boolean this_present_timestamp = true; + boolean that_present_timestamp = true; + if (this_present_timestamp || that_present_timestamp) { + if (!(this_present_timestamp && that_present_timestamp)) + return false; + if (this.timestamp != that.timestamp) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -6697,13 +8845,13 @@ public class Hbase { case 3: if (field.type == TType.LIST) { { - TList _list68 = iprot.readListBegin(); - this.columns = new ArrayList(_list68.size); - for (int _i69 = 0; _i69 < _list68.size; ++_i69) + TList _list58 = iprot.readListBegin(); + this.columns = new ArrayList(_list58.size); + for (int _i59 = 0; _i59 < _list58.size; ++_i59) { - byte[] _elem70 = null; - _elem70 = iprot.readBinary(); - this.columns.add(_elem70); + byte[] _elem60 = null; + _elem60 = iprot.readBinary(); + this.columns.add(_elem60); } iprot.readListEnd(); } @@ -6756,8 +8904,8 @@ public class Hbase { oprot.writeFieldBegin(field); { oprot.writeListBegin(new TList(TType.STRING, this.columns.size())); - for (byte[] _iter71 : this.columns) { - oprot.writeBinary(_iter71); + for (byte[] _iter61 : this.columns) { + oprot.writeBinary(_iter61); } oprot.writeListEnd(); } @@ -6794,7 +8942,7 @@ public class Hbase { public IOError io; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean success = false; public boolean io = false; } @@ -6813,6 +8961,43 @@ public class Hbase { this.__isset.io = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof scannerOpenTs_result) + return this.equals((scannerOpenTs_result)that); + return false; + } + + public boolean equals(scannerOpenTs_result that) { + if (that == null) + return false; + + boolean this_present_success = true; + boolean that_present_success = true; + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (this.success != that.success) + return false; + } + + boolean this_present_io = true && (this.io != null); + boolean that_present_io = true && (that.io != null); + if (this_present_io || that_present_io) { + if (!(this_present_io && that_present_io)) + return false; + if (!this.io.equals(that.io)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -6892,11 +9077,11 @@ public class Hbase { public byte[] tableName; public byte[] startRow; public byte[] stopRow; - public ArrayList columns; + public List columns; public long timestamp; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean tableName = false; public boolean startRow = false; public boolean stopRow = false; @@ -6911,7 +9096,7 @@ public class Hbase { byte[] tableName, byte[] startRow, byte[] stopRow, - ArrayList columns, + List columns, long timestamp) { this(); @@ -6927,6 +9112,70 @@ public class Hbase { this.__isset.timestamp = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof scannerOpenWithStopTs_args) + return this.equals((scannerOpenWithStopTs_args)that); + return false; + } + + public boolean equals(scannerOpenWithStopTs_args that) { + if (that == null) + return false; + + boolean this_present_tableName = true && (this.tableName != null); + boolean that_present_tableName = true && (that.tableName != null); + if (this_present_tableName || that_present_tableName) { + if (!(this_present_tableName && that_present_tableName)) + return false; + if (!java.util.Arrays.equals(this.tableName, that.tableName)) + return false; + } + + boolean this_present_startRow = true && (this.startRow != null); + boolean that_present_startRow = true && (that.startRow != null); + if (this_present_startRow || that_present_startRow) { + if (!(this_present_startRow && that_present_startRow)) + return false; + if (!java.util.Arrays.equals(this.startRow, that.startRow)) + return false; + } + + boolean this_present_stopRow = true && (this.stopRow != null); + boolean that_present_stopRow = true && (that.stopRow != null); + if (this_present_stopRow || that_present_stopRow) { + if (!(this_present_stopRow && that_present_stopRow)) + return false; + if (!java.util.Arrays.equals(this.stopRow, that.stopRow)) + return false; + } + + boolean this_present_columns = true && (this.columns != null); + boolean that_present_columns = true && (that.columns != null); + if (this_present_columns || that_present_columns) { + if (!(this_present_columns && that_present_columns)) + return false; + if (!this.columns.equals(that.columns)) + return false; + } + + boolean this_present_timestamp = true; + boolean that_present_timestamp = true; + if (this_present_timestamp || that_present_timestamp) { + if (!(this_present_timestamp && that_present_timestamp)) + return false; + if (this.timestamp != that.timestamp) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -6965,13 +9214,13 @@ public class Hbase { case 4: if (field.type == TType.LIST) { { - TList _list72 = iprot.readListBegin(); - this.columns = new ArrayList(_list72.size); - for (int _i73 = 0; _i73 < _list72.size; ++_i73) + TList _list62 = iprot.readListBegin(); + this.columns = new ArrayList(_list62.size); + for (int _i63 = 0; _i63 < _list62.size; ++_i63) { - byte[] _elem74 = null; - _elem74 = iprot.readBinary(); - this.columns.add(_elem74); + byte[] _elem64 = null; + _elem64 = iprot.readBinary(); + this.columns.add(_elem64); } iprot.readListEnd(); } @@ -7032,8 +9281,8 @@ public class Hbase { oprot.writeFieldBegin(field); { oprot.writeListBegin(new TList(TType.STRING, this.columns.size())); - for (byte[] _iter75 : this.columns) { - oprot.writeBinary(_iter75); + for (byte[] _iter65 : this.columns) { + oprot.writeBinary(_iter65); } oprot.writeListEnd(); } @@ -7072,7 +9321,7 @@ public class Hbase { public IOError io; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean success = false; public boolean io = false; } @@ -7091,6 +9340,43 @@ public class Hbase { this.__isset.io = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof scannerOpenWithStopTs_result) + return this.equals((scannerOpenWithStopTs_result)that); + return false; + } + + public boolean equals(scannerOpenWithStopTs_result that) { + if (that == null) + return false; + + boolean this_present_success = true; + boolean that_present_success = true; + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (this.success != that.success) + return false; + } + + boolean this_present_io = true && (this.io != null); + boolean that_present_io = true && (that.io != null); + if (this_present_io || that_present_io) { + if (!(this_present_io && that_present_io)) + return false; + if (!this.io.equals(that.io)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -7170,7 +9456,7 @@ public class Hbase { public int id; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean id = false; } @@ -7185,6 +9471,34 @@ public class Hbase { this.__isset.id = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof scannerGet_args) + return this.equals((scannerGet_args)that); + return false; + } + + public boolean equals(scannerGet_args that) { + if (that == null) + return false; + + boolean this_present_id = true; + boolean that_present_id = true; + if (this_present_id || that_present_id) { + if (!(this_present_id && that_present_id)) + return false; + if (this.id != that.id) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -7238,13 +9552,13 @@ public class Hbase { } public static class scannerGet_result implements TBase, java.io.Serializable { - public ScanEntry success; + public TRowResult success; public IOError io; public IllegalArgument ia; public NotFound nf; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean success = false; public boolean io = false; public boolean ia = false; @@ -7255,7 +9569,7 @@ public class Hbase { } public scannerGet_result( - ScanEntry success, + TRowResult success, IOError io, IllegalArgument ia, NotFound nf) @@ -7271,6 +9585,61 @@ public class Hbase { this.__isset.nf = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof scannerGet_result) + return this.equals((scannerGet_result)that); + return false; + } + + public boolean equals(scannerGet_result that) { + if (that == null) + return false; + + boolean this_present_success = true && (this.success != null); + boolean that_present_success = true && (that.success != null); + if (this_present_success || that_present_success) { + if (!(this_present_success && that_present_success)) + return false; + if (!this.success.equals(that.success)) + return false; + } + + boolean this_present_io = true && (this.io != null); + boolean that_present_io = true && (that.io != null); + if (this_present_io || that_present_io) { + if (!(this_present_io && that_present_io)) + return false; + if (!this.io.equals(that.io)) + return false; + } + + boolean this_present_ia = true && (this.ia != null); + boolean that_present_ia = true && (that.ia != null); + if (this_present_ia || that_present_ia) { + if (!(this_present_ia && that_present_ia)) + return false; + if (!this.ia.equals(that.ia)) + return false; + } + + boolean this_present_nf = true && (this.nf != null); + boolean that_present_nf = true && (that.nf != null); + if (this_present_nf || that_present_nf) { + if (!(this_present_nf && that_present_nf)) + return false; + if (!this.nf.equals(that.nf)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -7284,7 +9653,7 @@ public class Hbase { { case 0: if (field.type == TType.STRUCT) { - this.success = new ScanEntry(); + this.success = new TRowResult(); this.success.read(iprot); this.__isset.success = true; } else { @@ -7393,7 +9762,7 @@ public class Hbase { public int id; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean id = false; } @@ -7408,6 +9777,34 @@ public class Hbase { this.__isset.id = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof scannerClose_args) + return this.equals((scannerClose_args)that); + return false; + } + + public boolean equals(scannerClose_args that) { + if (that == null) + return false; + + boolean this_present_id = true; + boolean that_present_id = true; + if (this_present_id || that_present_id) { + if (!(this_present_id && that_present_id)) + return false; + if (this.id != that.id) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); @@ -7465,7 +9862,7 @@ public class Hbase { public IllegalArgument ia; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean io = false; public boolean ia = false; } @@ -7484,6 +9881,43 @@ public class Hbase { this.__isset.ia = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof scannerClose_result) + return this.equals((scannerClose_result)that); + return false; + } + + public boolean equals(scannerClose_result that) { + if (that == null) + return false; + + boolean this_present_io = true && (this.io != null); + boolean that_present_io = true && (that.io != null); + if (this_present_io || that_present_io) { + if (!(this_present_io && that_present_io)) + return false; + if (!this.io.equals(that.io)) + return false; + } + + boolean this_present_ia = true && (this.ia != null); + boolean that_present_ia = true && (that.ia != null); + if (this_present_ia || that_present_ia) { + if (!(this_present_ia && that_present_ia)) + return false; + if (!this.ia.equals(that.ia)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); diff --git a/src/java/org/apache/hadoop/hbase/thrift/generated/IOError.java b/src/java/org/apache/hadoop/hbase/thrift/generated/IOError.java index d1c97b5c100..e08bb3861b5 100644 --- a/src/java/org/apache/hadoop/hbase/thrift/generated/IOError.java +++ b/src/java/org/apache/hadoop/hbase/thrift/generated/IOError.java @@ -23,9 +23,11 @@ */ package org.apache.hadoop.hbase.thrift.generated; +import java.util.List; import java.util.ArrayList; -import java.util.AbstractMap; +import java.util.Map; import java.util.HashMap; +import java.util.Set; import java.util.HashSet; import com.facebook.thrift.*; @@ -41,7 +43,7 @@ public class IOError extends Exception implements TBase, java.io.Serializable { public String message; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean message = false; } @@ -56,6 +58,34 @@ public class IOError extends Exception implements TBase, java.io.Serializable { this.__isset.message = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof IOError) + return this.equals((IOError)that); + return false; + } + + public boolean equals(IOError that) { + if (that == null) + return false; + + boolean this_present_message = true && (this.message != null); + boolean that_present_message = true && (that.message != null); + if (this_present_message || that_present_message) { + if (!(this_present_message && that_present_message)) + return false; + if (!this.message.equals(that.message)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); diff --git a/src/java/org/apache/hadoop/hbase/thrift/generated/IllegalArgument.java b/src/java/org/apache/hadoop/hbase/thrift/generated/IllegalArgument.java index d3e23c8d97a..cce3ec9fec9 100644 --- a/src/java/org/apache/hadoop/hbase/thrift/generated/IllegalArgument.java +++ b/src/java/org/apache/hadoop/hbase/thrift/generated/IllegalArgument.java @@ -23,9 +23,11 @@ */ package org.apache.hadoop.hbase.thrift.generated; +import java.util.List; import java.util.ArrayList; -import java.util.AbstractMap; +import java.util.Map; import java.util.HashMap; +import java.util.Set; import java.util.HashSet; import com.facebook.thrift.*; @@ -40,7 +42,7 @@ public class IllegalArgument extends Exception implements TBase, java.io.Seriali public String message; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean message = false; } @@ -55,6 +57,34 @@ public class IllegalArgument extends Exception implements TBase, java.io.Seriali this.__isset.message = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof IllegalArgument) + return this.equals((IllegalArgument)that); + return false; + } + + public boolean equals(IllegalArgument that) { + if (that == null) + return false; + + boolean this_present_message = true && (this.message != null); + boolean that_present_message = true && (that.message != null); + if (this_present_message || that_present_message) { + if (!(this_present_message && that_present_message)) + return false; + if (!this.message.equals(that.message)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); diff --git a/src/java/org/apache/hadoop/hbase/thrift/generated/Mutation.java b/src/java/org/apache/hadoop/hbase/thrift/generated/Mutation.java index 2ac03b323dc..b02890486f8 100644 --- a/src/java/org/apache/hadoop/hbase/thrift/generated/Mutation.java +++ b/src/java/org/apache/hadoop/hbase/thrift/generated/Mutation.java @@ -23,9 +23,11 @@ */ package org.apache.hadoop.hbase.thrift.generated; +import java.util.List; import java.util.ArrayList; -import java.util.AbstractMap; +import java.util.Map; import java.util.HashMap; +import java.util.Set; import java.util.HashSet; import com.facebook.thrift.*; @@ -41,7 +43,7 @@ public class Mutation implements TBase, java.io.Serializable { public byte[] value; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean isDelete = false; public boolean column = false; public boolean value = false; @@ -66,6 +68,52 @@ public class Mutation implements TBase, java.io.Serializable { this.__isset.value = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof Mutation) + return this.equals((Mutation)that); + return false; + } + + public boolean equals(Mutation that) { + if (that == null) + return false; + + boolean this_present_isDelete = true; + boolean that_present_isDelete = true; + if (this_present_isDelete || that_present_isDelete) { + if (!(this_present_isDelete && that_present_isDelete)) + return false; + if (this.isDelete != that.isDelete) + return false; + } + + boolean this_present_column = true && (this.column != null); + boolean that_present_column = true && (that.column != null); + if (this_present_column || that_present_column) { + if (!(this_present_column && that_present_column)) + return false; + if (!java.util.Arrays.equals(this.column, that.column)) + return false; + } + + boolean this_present_value = true && (this.value != null); + boolean that_present_value = true && (that.value != null); + if (this_present_value || that_present_value) { + if (!(this_present_value && that_present_value)) + return false; + if (!java.util.Arrays.equals(this.value, that.value)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); diff --git a/src/java/org/apache/hadoop/hbase/thrift/generated/NotFound.java b/src/java/org/apache/hadoop/hbase/thrift/generated/NotFound.java index cc03bb5abf4..a8561a24126 100644 --- a/src/java/org/apache/hadoop/hbase/thrift/generated/NotFound.java +++ b/src/java/org/apache/hadoop/hbase/thrift/generated/NotFound.java @@ -23,9 +23,11 @@ */ package org.apache.hadoop.hbase.thrift.generated; +import java.util.List; import java.util.ArrayList; -import java.util.AbstractMap; +import java.util.Map; import java.util.HashMap; +import java.util.Set; import java.util.HashSet; import com.facebook.thrift.*; @@ -40,7 +42,7 @@ public class NotFound extends Exception implements TBase, java.io.Serializable { public String message; public final Isset __isset = new Isset(); - public static final class Isset { + public static final class Isset implements java.io.Serializable { public boolean message = false; } @@ -55,6 +57,34 @@ public class NotFound extends Exception implements TBase, java.io.Serializable { this.__isset.message = true; } + public boolean equals(Object that) { + if (that == null) + return false; + if (that instanceof NotFound) + return this.equals((NotFound)that); + return false; + } + + public boolean equals(NotFound that) { + if (that == null) + return false; + + boolean this_present_message = true && (this.message != null); + boolean that_present_message = true && (that.message != null); + if (this_present_message || that_present_message) { + if (!(this_present_message && that_present_message)) + return false; + if (!this.message.equals(that.message)) + return false; + } + + return true; + } + + public int hashCode() { + return 0; + } + public void read(TProtocol iprot) throws TException { TField field; iprot.readStructBegin(); diff --git a/src/java/org/apache/hadoop/hbase/thrift/generated/RegionDescriptor.java b/src/java/org/apache/hadoop/hbase/thrift/generated/RegionDescriptor.java index 1e5831dafd0..e69de29bb2d 100644 --- a/src/java/org/apache/hadoop/hbase/thrift/generated/RegionDescriptor.java +++ b/src/java/org/apache/hadoop/hbase/thrift/generated/RegionDescriptor.java @@ -1,111 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Autogenerated by Thrift - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - */ -package org.apache.hadoop.hbase.thrift.generated; - -import java.util.ArrayList; -import java.util.AbstractMap; -import java.util.HashMap; -import java.util.HashSet; -import com.facebook.thrift.*; - -import com.facebook.thrift.protocol.*; -import com.facebook.thrift.transport.*; - -/** - * A RegionDescriptor contains informationa about an HTable region. - * Currently, this is just the startKey of the region. - */ -public class RegionDescriptor implements TBase, java.io.Serializable { - public byte[] startKey; - - public final Isset __isset = new Isset(); - public static final class Isset { - public boolean startKey = false; - } - - public RegionDescriptor() { - } - - public RegionDescriptor( - byte[] startKey) - { - this(); - this.startKey = startKey; - this.__isset.startKey = true; - } - - public void read(TProtocol iprot) throws TException { - TField field; - iprot.readStructBegin(); - while (true) - { - field = iprot.readFieldBegin(); - if (field.type == TType.STOP) { - break; - } - switch (field.id) - { - case 1: - if (field.type == TType.STRING) { - this.startKey = iprot.readBinary(); - this.__isset.startKey = true; - } else { - TProtocolUtil.skip(iprot, field.type); - } - break; - default: - TProtocolUtil.skip(iprot, field.type); - break; - } - iprot.readFieldEnd(); - } - iprot.readStructEnd(); - } - - public void write(TProtocol oprot) throws TException { - TStruct struct = new TStruct("RegionDescriptor"); - oprot.writeStructBegin(struct); - TField field = new TField(); - if (this.startKey != null) { - field.name = "startKey"; - field.type = TType.STRING; - field.id = 1; - oprot.writeFieldBegin(field); - oprot.writeBinary(this.startKey); - oprot.writeFieldEnd(); - } - oprot.writeFieldStop(); - oprot.writeStructEnd(); - } - - public String toString() { - StringBuilder sb = new StringBuilder("RegionDescriptor("); - sb.append("startKey:"); - sb.append(this.startKey); - sb.append(")"); - return sb.toString(); - } - -} - diff --git a/src/java/org/apache/hadoop/hbase/thrift/generated/ScanEntry.java b/src/java/org/apache/hadoop/hbase/thrift/generated/ScanEntry.java index 78ed0a3e9ad..e69de29bb2d 100644 --- a/src/java/org/apache/hadoop/hbase/thrift/generated/ScanEntry.java +++ b/src/java/org/apache/hadoop/hbase/thrift/generated/ScanEntry.java @@ -1,153 +0,0 @@ -/** - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -/** - * Autogenerated by Thrift - * - * DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING - */ -package org.apache.hadoop.hbase.thrift.generated; - -import java.util.ArrayList; -import java.util.AbstractMap; -import java.util.HashMap; -import java.util.HashSet; -import com.facebook.thrift.*; - -import com.facebook.thrift.protocol.*; -import com.facebook.thrift.transport.*; - -/** - * A ScanEntry contains the row, column, and value information for a scanner's - * current location. - */ -public class ScanEntry implements TBase, java.io.Serializable { - public byte[] row; - public AbstractMap columns; - - public final Isset __isset = new Isset(); - public static final class Isset { - public boolean row = false; - public boolean columns = false; - } - - public ScanEntry() { - } - - public ScanEntry( - byte[] row, - AbstractMap columns) - { - this(); - this.row = row; - this.__isset.row = true; - this.columns = columns; - this.__isset.columns = true; - } - - public void read(TProtocol iprot) throws TException { - TField field; - iprot.readStructBegin(); - while (true) - { - field = iprot.readFieldBegin(); - if (field.type == TType.STOP) { - break; - } - switch (field.id) - { - case 1: - if (field.type == TType.STRING) { - this.row = iprot.readBinary(); - this.__isset.row = true; - } else { - TProtocolUtil.skip(iprot, field.type); - } - break; - case 2: - if (field.type == TType.MAP) { - { - TMap _map0 = iprot.readMapBegin(); - this.columns = new HashMap(2*_map0.size); - for (int _i1 = 0; _i1 < _map0.size; ++_i1) - { - byte[] _key2; - byte[] _val3; - _key2 = iprot.readBinary(); - _val3 = iprot.readBinary(); - this.columns.put(_key2, _val3); - } - iprot.readMapEnd(); - } - this.__isset.columns = true; - } else { - TProtocolUtil.skip(iprot, field.type); - } - break; - default: - TProtocolUtil.skip(iprot, field.type); - break; - } - iprot.readFieldEnd(); - } - iprot.readStructEnd(); - } - - public void write(TProtocol oprot) throws TException { - TStruct struct = new TStruct("ScanEntry"); - oprot.writeStructBegin(struct); - TField field = new TField(); - if (this.row != null) { - field.name = "row"; - field.type = TType.STRING; - field.id = 1; - oprot.writeFieldBegin(field); - oprot.writeBinary(this.row); - oprot.writeFieldEnd(); - } - if (this.columns != null) { - field.name = "columns"; - field.type = TType.MAP; - field.id = 2; - oprot.writeFieldBegin(field); - { - oprot.writeMapBegin(new TMap(TType.STRING, TType.STRING, this.columns.size())); - for (byte[] _iter4 : this.columns.keySet()) { - oprot.writeBinary(_iter4); - oprot.writeBinary(this.columns.get(_iter4)); - } - oprot.writeMapEnd(); - } - oprot.writeFieldEnd(); - } - oprot.writeFieldStop(); - oprot.writeStructEnd(); - } - - public String toString() { - StringBuilder sb = new StringBuilder("ScanEntry("); - sb.append("row:"); - sb.append(this.row); - sb.append(",columns:"); - sb.append(this.columns); - sb.append(")"); - return sb.toString(); - } - -} - diff --git a/src/java/org/apache/hadoop/hbase/thrift/package.html b/src/java/org/apache/hadoop/hbase/thrift/package.html index 60be6b5edd0..ddf173b1a30 100644 --- a/src/java/org/apache/hadoop/hbase/thrift/package.html +++ b/src/java/org/apache/hadoop/hbase/thrift/package.html @@ -49,7 +49,7 @@ org.apache.hadoop.hbase.thrift.generated} directory.

The files were generated by running the commands: 

-  thrift -strict -java Hbase.thrift
+  thrift -strict --gen java Hbase.thrift
   mv gen-java/org/apache/hadoop/hbase/thrift/generated .
   rm -rf gen-java
@@ -62,8 +62,8 @@ part of the Thrift package. A version of the Java runtime is checked into SVN under the hbase/lib directory.

-

The version of Thrift used to generate the Java files is revision 746 from -the SVN repository.

+

The version of Thrift used to generate the Java files is release 20080411p1 from +the thrift homepage.

The ThriftServer is run like: