HBASE-9882 - Support Append Operation with thrift (Ram)
git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1545719 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
ramkrishna
parent
38d454dc2b
commit
4e5847d331
|
|
@ -284,6 +284,18 @@ public class ThriftHBaseServiceHandler implements THBaseService.Iface {
|
|||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public TResult append(ByteBuffer table, TAppend append) throws TIOError, TException {
|
||||
HTableInterface htable = getTable(table);
|
||||
try {
|
||||
return resultFromHBase(htable.append(appendFromThrift(append)));
|
||||
} catch (IOException e) {
|
||||
throw getTIOError(e);
|
||||
} finally {
|
||||
closeTable(htable);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int openScanner(ByteBuffer table, TScan scan) throws TIOError, TException {
|
||||
HTableInterface htable = getTable(table);
|
||||
|
|
|
|||
|
|
@ -32,6 +32,7 @@ import org.apache.hadoop.hbase.CellUtil;
|
|||
import org.apache.hadoop.hbase.HConstants;
|
||||
import org.apache.hadoop.hbase.KeyValue;
|
||||
import org.apache.hadoop.hbase.KeyValueUtil;
|
||||
import org.apache.hadoop.hbase.client.Append;
|
||||
import org.apache.hadoop.hbase.client.Delete;
|
||||
import org.apache.hadoop.hbase.client.Durability;
|
||||
import org.apache.hadoop.hbase.client.Get;
|
||||
|
|
@ -42,6 +43,7 @@ import org.apache.hadoop.hbase.client.Result;
|
|||
import org.apache.hadoop.hbase.client.RowMutations;
|
||||
import org.apache.hadoop.hbase.client.Scan;
|
||||
import org.apache.hadoop.hbase.filter.ParseFilter;
|
||||
import org.apache.hadoop.hbase.thrift2.generated.TAppend;
|
||||
import org.apache.hadoop.hbase.thrift2.generated.TColumn;
|
||||
import org.apache.hadoop.hbase.thrift2.generated.TColumnIncrement;
|
||||
import org.apache.hadoop.hbase.thrift2.generated.TColumnValue;
|
||||
|
|
@ -422,6 +424,23 @@ public class ThriftUtilities {
|
|||
return out;
|
||||
}
|
||||
|
||||
public static Append appendFromThrift(TAppend append) throws IOException {
|
||||
Append out = new Append(append.getRow());
|
||||
for (TColumnValue column : append.getColumns()) {
|
||||
out.add(column.getFamily(), column.getQualifier(), column.getValue());
|
||||
}
|
||||
|
||||
if (append.isSetAttributes()) {
|
||||
addAttributes(out, append.getAttributes());
|
||||
}
|
||||
|
||||
if (append.isSetDurability()) {
|
||||
out.setDurability(durabilityFromThrift(append.getDurability()));
|
||||
}
|
||||
|
||||
return out;
|
||||
}
|
||||
|
||||
/**
|
||||
* Adds all the attributes into the Operation object
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -0,0 +1,829 @@
|
|||
/**
|
||||
* Autogenerated by Thrift Compiler (0.9.0)
|
||||
*
|
||||
* DO NOT EDIT UNLESS YOU ARE SURE THAT YOU KNOW WHAT YOU ARE DOING
|
||||
* @generated
|
||||
*/
|
||||
package org.apache.hadoop.hbase.thrift2.generated;
|
||||
|
||||
import org.apache.thrift.scheme.IScheme;
|
||||
import org.apache.thrift.scheme.SchemeFactory;
|
||||
import org.apache.thrift.scheme.StandardScheme;
|
||||
|
||||
import org.apache.thrift.scheme.TupleScheme;
|
||||
import org.apache.thrift.protocol.TTupleProtocol;
|
||||
import org.apache.thrift.protocol.TProtocolException;
|
||||
import org.apache.thrift.EncodingUtils;
|
||||
import org.apache.thrift.TException;
|
||||
import java.util.List;
|
||||
import java.util.ArrayList;
|
||||
import java.util.Map;
|
||||
import java.util.HashMap;
|
||||
import java.util.EnumMap;
|
||||
import java.util.Set;
|
||||
import java.util.HashSet;
|
||||
import java.util.EnumSet;
|
||||
import java.util.Collections;
|
||||
import java.util.BitSet;
|
||||
import java.nio.ByteBuffer;
|
||||
import java.util.Arrays;
|
||||
import org.slf4j.Logger;
|
||||
import org.slf4j.LoggerFactory;
|
||||
|
||||
public class TAppend implements org.apache.thrift.TBase<TAppend, TAppend._Fields>, java.io.Serializable, Cloneable {
|
||||
private static final org.apache.thrift.protocol.TStruct STRUCT_DESC = new org.apache.thrift.protocol.TStruct("TAppend");
|
||||
|
||||
private static final org.apache.thrift.protocol.TField ROW_FIELD_DESC = new org.apache.thrift.protocol.TField("row", org.apache.thrift.protocol.TType.STRING, (short)1);
|
||||
private static final org.apache.thrift.protocol.TField COLUMNS_FIELD_DESC = new org.apache.thrift.protocol.TField("columns", org.apache.thrift.protocol.TType.LIST, (short)2);
|
||||
private static final org.apache.thrift.protocol.TField ATTRIBUTES_FIELD_DESC = new org.apache.thrift.protocol.TField("attributes", org.apache.thrift.protocol.TType.MAP, (short)3);
|
||||
private static final org.apache.thrift.protocol.TField DURABILITY_FIELD_DESC = new org.apache.thrift.protocol.TField("durability", org.apache.thrift.protocol.TType.I32, (short)4);
|
||||
|
||||
private static final Map<Class<? extends IScheme>, SchemeFactory> schemes = new HashMap<Class<? extends IScheme>, SchemeFactory>();
|
||||
static {
|
||||
schemes.put(StandardScheme.class, new TAppendStandardSchemeFactory());
|
||||
schemes.put(TupleScheme.class, new TAppendTupleSchemeFactory());
|
||||
}
|
||||
|
||||
public ByteBuffer row; // required
|
||||
public List<TColumnValue> columns; // required
|
||||
public Map<ByteBuffer,ByteBuffer> attributes; // optional
|
||||
/**
|
||||
*
|
||||
* @see TDurability
|
||||
*/
|
||||
public TDurability durability; // optional
|
||||
|
||||
/** The set of fields this struct contains, along with convenience methods for finding and manipulating them. */
|
||||
public enum _Fields implements org.apache.thrift.TFieldIdEnum {
|
||||
ROW((short)1, "row"),
|
||||
COLUMNS((short)2, "columns"),
|
||||
ATTRIBUTES((short)3, "attributes"),
|
||||
/**
|
||||
*
|
||||
* @see TDurability
|
||||
*/
|
||||
DURABILITY((short)4, "durability");
|
||||
|
||||
private static final Map<String, _Fields> byName = new HashMap<String, _Fields>();
|
||||
|
||||
static {
|
||||
for (_Fields field : EnumSet.allOf(_Fields.class)) {
|
||||
byName.put(field.getFieldName(), field);
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Find the _Fields constant that matches fieldId, or null if its not found.
|
||||
*/
|
||||
public static _Fields findByThriftId(int fieldId) {
|
||||
switch(fieldId) {
|
||||
case 1: // ROW
|
||||
return ROW;
|
||||
case 2: // COLUMNS
|
||||
return COLUMNS;
|
||||
case 3: // ATTRIBUTES
|
||||
return ATTRIBUTES;
|
||||
case 4: // DURABILITY
|
||||
return DURABILITY;
|
||||
default:
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Find the _Fields constant that matches fieldId, throwing an exception
|
||||
* if it is not found.
|
||||
*/
|
||||
public static _Fields findByThriftIdOrThrow(int fieldId) {
|
||||
_Fields fields = findByThriftId(fieldId);
|
||||
if (fields == null) throw new IllegalArgumentException("Field " + fieldId + " doesn't exist!");
|
||||
return fields;
|
||||
}
|
||||
|
||||
/**
|
||||
* Find the _Fields constant that matches name, or null if its not found.
|
||||
*/
|
||||
public static _Fields findByName(String name) {
|
||||
return byName.get(name);
|
||||
}
|
||||
|
||||
private final short _thriftId;
|
||||
private final String _fieldName;
|
||||
|
||||
_Fields(short thriftId, String fieldName) {
|
||||
_thriftId = thriftId;
|
||||
_fieldName = fieldName;
|
||||
}
|
||||
|
||||
public short getThriftFieldId() {
|
||||
return _thriftId;
|
||||
}
|
||||
|
||||
public String getFieldName() {
|
||||
return _fieldName;
|
||||
}
|
||||
}
|
||||
|
||||
// isset id assignments
|
||||
private _Fields optionals[] = {_Fields.ATTRIBUTES,_Fields.DURABILITY};
|
||||
public static final Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> metaDataMap;
|
||||
static {
|
||||
Map<_Fields, org.apache.thrift.meta_data.FieldMetaData> tmpMap = new EnumMap<_Fields, org.apache.thrift.meta_data.FieldMetaData>(_Fields.class);
|
||||
tmpMap.put(_Fields.ROW, new org.apache.thrift.meta_data.FieldMetaData("row", org.apache.thrift.TFieldRequirementType.REQUIRED,
|
||||
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true)));
|
||||
tmpMap.put(_Fields.COLUMNS, new org.apache.thrift.meta_data.FieldMetaData("columns", org.apache.thrift.TFieldRequirementType.REQUIRED,
|
||||
new org.apache.thrift.meta_data.ListMetaData(org.apache.thrift.protocol.TType.LIST,
|
||||
new org.apache.thrift.meta_data.StructMetaData(org.apache.thrift.protocol.TType.STRUCT, TColumnValue.class))));
|
||||
tmpMap.put(_Fields.ATTRIBUTES, new org.apache.thrift.meta_data.FieldMetaData("attributes", org.apache.thrift.TFieldRequirementType.OPTIONAL,
|
||||
new org.apache.thrift.meta_data.MapMetaData(org.apache.thrift.protocol.TType.MAP,
|
||||
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true),
|
||||
new org.apache.thrift.meta_data.FieldValueMetaData(org.apache.thrift.protocol.TType.STRING , true))));
|
||||
tmpMap.put(_Fields.DURABILITY, new org.apache.thrift.meta_data.FieldMetaData("durability", org.apache.thrift.TFieldRequirementType.OPTIONAL,
|
||||
new org.apache.thrift.meta_data.EnumMetaData(org.apache.thrift.protocol.TType.ENUM, TDurability.class)));
|
||||
metaDataMap = Collections.unmodifiableMap(tmpMap);
|
||||
org.apache.thrift.meta_data.FieldMetaData.addStructMetaDataMap(TAppend.class, metaDataMap);
|
||||
}
|
||||
|
||||
public TAppend() {
|
||||
}
|
||||
|
||||
public TAppend(
|
||||
ByteBuffer row,
|
||||
List<TColumnValue> columns)
|
||||
{
|
||||
this();
|
||||
this.row = row;
|
||||
this.columns = columns;
|
||||
}
|
||||
|
||||
/**
|
||||
* Performs a deep copy on <i>other</i>.
|
||||
*/
|
||||
public TAppend(TAppend other) {
|
||||
if (other.isSetRow()) {
|
||||
this.row = org.apache.thrift.TBaseHelper.copyBinary(other.row);
|
||||
;
|
||||
}
|
||||
if (other.isSetColumns()) {
|
||||
List<TColumnValue> __this__columns = new ArrayList<TColumnValue>();
|
||||
for (TColumnValue other_element : other.columns) {
|
||||
__this__columns.add(new TColumnValue(other_element));
|
||||
}
|
||||
this.columns = __this__columns;
|
||||
}
|
||||
if (other.isSetAttributes()) {
|
||||
Map<ByteBuffer,ByteBuffer> __this__attributes = new HashMap<ByteBuffer,ByteBuffer>();
|
||||
for (Map.Entry<ByteBuffer, ByteBuffer> other_element : other.attributes.entrySet()) {
|
||||
|
||||
ByteBuffer other_element_key = other_element.getKey();
|
||||
ByteBuffer other_element_value = other_element.getValue();
|
||||
|
||||
ByteBuffer __this__attributes_copy_key = org.apache.thrift.TBaseHelper.copyBinary(other_element_key);
|
||||
;
|
||||
|
||||
ByteBuffer __this__attributes_copy_value = org.apache.thrift.TBaseHelper.copyBinary(other_element_value);
|
||||
;
|
||||
|
||||
__this__attributes.put(__this__attributes_copy_key, __this__attributes_copy_value);
|
||||
}
|
||||
this.attributes = __this__attributes;
|
||||
}
|
||||
if (other.isSetDurability()) {
|
||||
this.durability = other.durability;
|
||||
}
|
||||
}
|
||||
|
||||
public TAppend deepCopy() {
|
||||
return new TAppend(this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void clear() {
|
||||
this.row = null;
|
||||
this.columns = null;
|
||||
this.attributes = null;
|
||||
this.durability = null;
|
||||
}
|
||||
|
||||
public byte[] getRow() {
|
||||
setRow(org.apache.thrift.TBaseHelper.rightSize(row));
|
||||
return row == null ? null : row.array();
|
||||
}
|
||||
|
||||
public ByteBuffer bufferForRow() {
|
||||
return row;
|
||||
}
|
||||
|
||||
public TAppend setRow(byte[] row) {
|
||||
setRow(row == null ? (ByteBuffer)null : ByteBuffer.wrap(row));
|
||||
return this;
|
||||
}
|
||||
|
||||
public TAppend setRow(ByteBuffer row) {
|
||||
this.row = row;
|
||||
return this;
|
||||
}
|
||||
|
||||
public void unsetRow() {
|
||||
this.row = null;
|
||||
}
|
||||
|
||||
/** Returns true if field row is set (has been assigned a value) and false otherwise */
|
||||
public boolean isSetRow() {
|
||||
return this.row != null;
|
||||
}
|
||||
|
||||
public void setRowIsSet(boolean value) {
|
||||
if (!value) {
|
||||
this.row = null;
|
||||
}
|
||||
}
|
||||
|
||||
public int getColumnsSize() {
|
||||
return (this.columns == null) ? 0 : this.columns.size();
|
||||
}
|
||||
|
||||
public java.util.Iterator<TColumnValue> getColumnsIterator() {
|
||||
return (this.columns == null) ? null : this.columns.iterator();
|
||||
}
|
||||
|
||||
public void addToColumns(TColumnValue elem) {
|
||||
if (this.columns == null) {
|
||||
this.columns = new ArrayList<TColumnValue>();
|
||||
}
|
||||
this.columns.add(elem);
|
||||
}
|
||||
|
||||
public List<TColumnValue> getColumns() {
|
||||
return this.columns;
|
||||
}
|
||||
|
||||
public TAppend setColumns(List<TColumnValue> columns) {
|
||||
this.columns = columns;
|
||||
return this;
|
||||
}
|
||||
|
||||
public void unsetColumns() {
|
||||
this.columns = null;
|
||||
}
|
||||
|
||||
/** Returns true if field columns is set (has been assigned a value) and false otherwise */
|
||||
public boolean isSetColumns() {
|
||||
return this.columns != null;
|
||||
}
|
||||
|
||||
public void setColumnsIsSet(boolean value) {
|
||||
if (!value) {
|
||||
this.columns = null;
|
||||
}
|
||||
}
|
||||
|
||||
public int getAttributesSize() {
|
||||
return (this.attributes == null) ? 0 : this.attributes.size();
|
||||
}
|
||||
|
||||
public void putToAttributes(ByteBuffer key, ByteBuffer val) {
|
||||
if (this.attributes == null) {
|
||||
this.attributes = new HashMap<ByteBuffer,ByteBuffer>();
|
||||
}
|
||||
this.attributes.put(key, val);
|
||||
}
|
||||
|
||||
public Map<ByteBuffer,ByteBuffer> getAttributes() {
|
||||
return this.attributes;
|
||||
}
|
||||
|
||||
public TAppend setAttributes(Map<ByteBuffer,ByteBuffer> attributes) {
|
||||
this.attributes = attributes;
|
||||
return this;
|
||||
}
|
||||
|
||||
public void unsetAttributes() {
|
||||
this.attributes = null;
|
||||
}
|
||||
|
||||
/** Returns true if field attributes is set (has been assigned a value) and false otherwise */
|
||||
public boolean isSetAttributes() {
|
||||
return this.attributes != null;
|
||||
}
|
||||
|
||||
public void setAttributesIsSet(boolean value) {
|
||||
if (!value) {
|
||||
this.attributes = null;
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @see TDurability
|
||||
*/
|
||||
public TDurability getDurability() {
|
||||
return this.durability;
|
||||
}
|
||||
|
||||
/**
|
||||
*
|
||||
* @see TDurability
|
||||
*/
|
||||
public TAppend setDurability(TDurability durability) {
|
||||
this.durability = durability;
|
||||
return this;
|
||||
}
|
||||
|
||||
public void unsetDurability() {
|
||||
this.durability = null;
|
||||
}
|
||||
|
||||
/** Returns true if field durability is set (has been assigned a value) and false otherwise */
|
||||
public boolean isSetDurability() {
|
||||
return this.durability != null;
|
||||
}
|
||||
|
||||
public void setDurabilityIsSet(boolean value) {
|
||||
if (!value) {
|
||||
this.durability = null;
|
||||
}
|
||||
}
|
||||
|
||||
public void setFieldValue(_Fields field, Object value) {
|
||||
switch (field) {
|
||||
case ROW:
|
||||
if (value == null) {
|
||||
unsetRow();
|
||||
} else {
|
||||
setRow((ByteBuffer)value);
|
||||
}
|
||||
break;
|
||||
|
||||
case COLUMNS:
|
||||
if (value == null) {
|
||||
unsetColumns();
|
||||
} else {
|
||||
setColumns((List<TColumnValue>)value);
|
||||
}
|
||||
break;
|
||||
|
||||
case ATTRIBUTES:
|
||||
if (value == null) {
|
||||
unsetAttributes();
|
||||
} else {
|
||||
setAttributes((Map<ByteBuffer,ByteBuffer>)value);
|
||||
}
|
||||
break;
|
||||
|
||||
case DURABILITY:
|
||||
if (value == null) {
|
||||
unsetDurability();
|
||||
} else {
|
||||
setDurability((TDurability)value);
|
||||
}
|
||||
break;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
public Object getFieldValue(_Fields field) {
|
||||
switch (field) {
|
||||
case ROW:
|
||||
return getRow();
|
||||
|
||||
case COLUMNS:
|
||||
return getColumns();
|
||||
|
||||
case ATTRIBUTES:
|
||||
return getAttributes();
|
||||
|
||||
case DURABILITY:
|
||||
return getDurability();
|
||||
|
||||
}
|
||||
throw new IllegalStateException();
|
||||
}
|
||||
|
||||
/** Returns true if field corresponding to fieldID is set (has been assigned a value) and false otherwise */
|
||||
public boolean isSet(_Fields field) {
|
||||
if (field == null) {
|
||||
throw new IllegalArgumentException();
|
||||
}
|
||||
|
||||
switch (field) {
|
||||
case ROW:
|
||||
return isSetRow();
|
||||
case COLUMNS:
|
||||
return isSetColumns();
|
||||
case ATTRIBUTES:
|
||||
return isSetAttributes();
|
||||
case DURABILITY:
|
||||
return isSetDurability();
|
||||
}
|
||||
throw new IllegalStateException();
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean equals(Object that) {
|
||||
if (that == null)
|
||||
return false;
|
||||
if (that instanceof TAppend)
|
||||
return this.equals((TAppend)that);
|
||||
return false;
|
||||
}
|
||||
|
||||
public boolean equals(TAppend that) {
|
||||
if (that == null)
|
||||
return false;
|
||||
|
||||
boolean this_present_row = true && this.isSetRow();
|
||||
boolean that_present_row = true && that.isSetRow();
|
||||
if (this_present_row || that_present_row) {
|
||||
if (!(this_present_row && that_present_row))
|
||||
return false;
|
||||
if (!this.row.equals(that.row))
|
||||
return false;
|
||||
}
|
||||
|
||||
boolean this_present_columns = true && this.isSetColumns();
|
||||
boolean that_present_columns = true && that.isSetColumns();
|
||||
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_attributes = true && this.isSetAttributes();
|
||||
boolean that_present_attributes = true && that.isSetAttributes();
|
||||
if (this_present_attributes || that_present_attributes) {
|
||||
if (!(this_present_attributes && that_present_attributes))
|
||||
return false;
|
||||
if (!this.attributes.equals(that.attributes))
|
||||
return false;
|
||||
}
|
||||
|
||||
boolean this_present_durability = true && this.isSetDurability();
|
||||
boolean that_present_durability = true && that.isSetDurability();
|
||||
if (this_present_durability || that_present_durability) {
|
||||
if (!(this_present_durability && that_present_durability))
|
||||
return false;
|
||||
if (!this.durability.equals(that.durability))
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public int hashCode() {
|
||||
return 0;
|
||||
}
|
||||
|
||||
public int compareTo(TAppend other) {
|
||||
if (!getClass().equals(other.getClass())) {
|
||||
return getClass().getName().compareTo(other.getClass().getName());
|
||||
}
|
||||
|
||||
int lastComparison = 0;
|
||||
TAppend typedOther = (TAppend)other;
|
||||
|
||||
lastComparison = Boolean.valueOf(isSetRow()).compareTo(typedOther.isSetRow());
|
||||
if (lastComparison != 0) {
|
||||
return lastComparison;
|
||||
}
|
||||
if (isSetRow()) {
|
||||
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.row, typedOther.row);
|
||||
if (lastComparison != 0) {
|
||||
return lastComparison;
|
||||
}
|
||||
}
|
||||
lastComparison = Boolean.valueOf(isSetColumns()).compareTo(typedOther.isSetColumns());
|
||||
if (lastComparison != 0) {
|
||||
return lastComparison;
|
||||
}
|
||||
if (isSetColumns()) {
|
||||
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.columns, typedOther.columns);
|
||||
if (lastComparison != 0) {
|
||||
return lastComparison;
|
||||
}
|
||||
}
|
||||
lastComparison = Boolean.valueOf(isSetAttributes()).compareTo(typedOther.isSetAttributes());
|
||||
if (lastComparison != 0) {
|
||||
return lastComparison;
|
||||
}
|
||||
if (isSetAttributes()) {
|
||||
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.attributes, typedOther.attributes);
|
||||
if (lastComparison != 0) {
|
||||
return lastComparison;
|
||||
}
|
||||
}
|
||||
lastComparison = Boolean.valueOf(isSetDurability()).compareTo(typedOther.isSetDurability());
|
||||
if (lastComparison != 0) {
|
||||
return lastComparison;
|
||||
}
|
||||
if (isSetDurability()) {
|
||||
lastComparison = org.apache.thrift.TBaseHelper.compareTo(this.durability, typedOther.durability);
|
||||
if (lastComparison != 0) {
|
||||
return lastComparison;
|
||||
}
|
||||
}
|
||||
return 0;
|
||||
}
|
||||
|
||||
public _Fields fieldForId(int fieldId) {
|
||||
return _Fields.findByThriftId(fieldId);
|
||||
}
|
||||
|
||||
public void read(org.apache.thrift.protocol.TProtocol iprot) throws org.apache.thrift.TException {
|
||||
schemes.get(iprot.getScheme()).getScheme().read(iprot, this);
|
||||
}
|
||||
|
||||
public void write(org.apache.thrift.protocol.TProtocol oprot) throws org.apache.thrift.TException {
|
||||
schemes.get(oprot.getScheme()).getScheme().write(oprot, this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
StringBuilder sb = new StringBuilder("TAppend(");
|
||||
boolean first = true;
|
||||
|
||||
sb.append("row:");
|
||||
if (this.row == null) {
|
||||
sb.append("null");
|
||||
} else {
|
||||
org.apache.thrift.TBaseHelper.toString(this.row, sb);
|
||||
}
|
||||
first = false;
|
||||
if (!first) sb.append(", ");
|
||||
sb.append("columns:");
|
||||
if (this.columns == null) {
|
||||
sb.append("null");
|
||||
} else {
|
||||
sb.append(this.columns);
|
||||
}
|
||||
first = false;
|
||||
if (isSetAttributes()) {
|
||||
if (!first) sb.append(", ");
|
||||
sb.append("attributes:");
|
||||
if (this.attributes == null) {
|
||||
sb.append("null");
|
||||
} else {
|
||||
sb.append(this.attributes);
|
||||
}
|
||||
first = false;
|
||||
}
|
||||
if (isSetDurability()) {
|
||||
if (!first) sb.append(", ");
|
||||
sb.append("durability:");
|
||||
if (this.durability == null) {
|
||||
sb.append("null");
|
||||
} else {
|
||||
sb.append(this.durability);
|
||||
}
|
||||
first = false;
|
||||
}
|
||||
sb.append(")");
|
||||
return sb.toString();
|
||||
}
|
||||
|
||||
public void validate() throws org.apache.thrift.TException {
|
||||
// check for required fields
|
||||
if (row == null) {
|
||||
throw new org.apache.thrift.protocol.TProtocolException("Required field 'row' was not present! Struct: " + toString());
|
||||
}
|
||||
if (columns == null) {
|
||||
throw new org.apache.thrift.protocol.TProtocolException("Required field 'columns' was not present! Struct: " + toString());
|
||||
}
|
||||
// check for sub-struct validity
|
||||
}
|
||||
|
||||
private void writeObject(java.io.ObjectOutputStream out) throws java.io.IOException {
|
||||
try {
|
||||
write(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(out)));
|
||||
} catch (org.apache.thrift.TException te) {
|
||||
throw new java.io.IOException(te);
|
||||
}
|
||||
}
|
||||
|
||||
private void readObject(java.io.ObjectInputStream in) throws java.io.IOException, ClassNotFoundException {
|
||||
try {
|
||||
read(new org.apache.thrift.protocol.TCompactProtocol(new org.apache.thrift.transport.TIOStreamTransport(in)));
|
||||
} catch (org.apache.thrift.TException te) {
|
||||
throw new java.io.IOException(te);
|
||||
}
|
||||
}
|
||||
|
||||
private static class TAppendStandardSchemeFactory implements SchemeFactory {
|
||||
public TAppendStandardScheme getScheme() {
|
||||
return new TAppendStandardScheme();
|
||||
}
|
||||
}
|
||||
|
||||
private static class TAppendStandardScheme extends StandardScheme<TAppend> {
|
||||
|
||||
public void read(org.apache.thrift.protocol.TProtocol iprot, TAppend struct) throws org.apache.thrift.TException {
|
||||
org.apache.thrift.protocol.TField schemeField;
|
||||
iprot.readStructBegin();
|
||||
while (true)
|
||||
{
|
||||
schemeField = iprot.readFieldBegin();
|
||||
if (schemeField.type == org.apache.thrift.protocol.TType.STOP) {
|
||||
break;
|
||||
}
|
||||
switch (schemeField.id) {
|
||||
case 1: // ROW
|
||||
if (schemeField.type == org.apache.thrift.protocol.TType.STRING) {
|
||||
struct.row = iprot.readBinary();
|
||||
struct.setRowIsSet(true);
|
||||
} else {
|
||||
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
|
||||
}
|
||||
break;
|
||||
case 2: // COLUMNS
|
||||
if (schemeField.type == org.apache.thrift.protocol.TType.LIST) {
|
||||
{
|
||||
org.apache.thrift.protocol.TList _list80 = iprot.readListBegin();
|
||||
struct.columns = new ArrayList<TColumnValue>(_list80.size);
|
||||
for (int _i81 = 0; _i81 < _list80.size; ++_i81)
|
||||
{
|
||||
TColumnValue _elem82; // required
|
||||
_elem82 = new TColumnValue();
|
||||
_elem82.read(iprot);
|
||||
struct.columns.add(_elem82);
|
||||
}
|
||||
iprot.readListEnd();
|
||||
}
|
||||
struct.setColumnsIsSet(true);
|
||||
} else {
|
||||
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
|
||||
}
|
||||
break;
|
||||
case 3: // ATTRIBUTES
|
||||
if (schemeField.type == org.apache.thrift.protocol.TType.MAP) {
|
||||
{
|
||||
org.apache.thrift.protocol.TMap _map83 = iprot.readMapBegin();
|
||||
struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map83.size);
|
||||
for (int _i84 = 0; _i84 < _map83.size; ++_i84)
|
||||
{
|
||||
ByteBuffer _key85; // required
|
||||
ByteBuffer _val86; // required
|
||||
_key85 = iprot.readBinary();
|
||||
_val86 = iprot.readBinary();
|
||||
struct.attributes.put(_key85, _val86);
|
||||
}
|
||||
iprot.readMapEnd();
|
||||
}
|
||||
struct.setAttributesIsSet(true);
|
||||
} else {
|
||||
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
|
||||
}
|
||||
break;
|
||||
case 4: // DURABILITY
|
||||
if (schemeField.type == org.apache.thrift.protocol.TType.I32) {
|
||||
struct.durability = TDurability.findByValue(iprot.readI32());
|
||||
struct.setDurabilityIsSet(true);
|
||||
} else {
|
||||
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
org.apache.thrift.protocol.TProtocolUtil.skip(iprot, schemeField.type);
|
||||
}
|
||||
iprot.readFieldEnd();
|
||||
}
|
||||
iprot.readStructEnd();
|
||||
|
||||
// check for required fields of primitive type, which can't be checked in the validate method
|
||||
struct.validate();
|
||||
}
|
||||
|
||||
public void write(org.apache.thrift.protocol.TProtocol oprot, TAppend struct) throws org.apache.thrift.TException {
|
||||
struct.validate();
|
||||
|
||||
oprot.writeStructBegin(STRUCT_DESC);
|
||||
if (struct.row != null) {
|
||||
oprot.writeFieldBegin(ROW_FIELD_DESC);
|
||||
oprot.writeBinary(struct.row);
|
||||
oprot.writeFieldEnd();
|
||||
}
|
||||
if (struct.columns != null) {
|
||||
oprot.writeFieldBegin(COLUMNS_FIELD_DESC);
|
||||
{
|
||||
oprot.writeListBegin(new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, struct.columns.size()));
|
||||
for (TColumnValue _iter87 : struct.columns)
|
||||
{
|
||||
_iter87.write(oprot);
|
||||
}
|
||||
oprot.writeListEnd();
|
||||
}
|
||||
oprot.writeFieldEnd();
|
||||
}
|
||||
if (struct.attributes != null) {
|
||||
if (struct.isSetAttributes()) {
|
||||
oprot.writeFieldBegin(ATTRIBUTES_FIELD_DESC);
|
||||
{
|
||||
oprot.writeMapBegin(new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, struct.attributes.size()));
|
||||
for (Map.Entry<ByteBuffer, ByteBuffer> _iter88 : struct.attributes.entrySet())
|
||||
{
|
||||
oprot.writeBinary(_iter88.getKey());
|
||||
oprot.writeBinary(_iter88.getValue());
|
||||
}
|
||||
oprot.writeMapEnd();
|
||||
}
|
||||
oprot.writeFieldEnd();
|
||||
}
|
||||
}
|
||||
if (struct.durability != null) {
|
||||
if (struct.isSetDurability()) {
|
||||
oprot.writeFieldBegin(DURABILITY_FIELD_DESC);
|
||||
oprot.writeI32(struct.durability.getValue());
|
||||
oprot.writeFieldEnd();
|
||||
}
|
||||
}
|
||||
oprot.writeFieldStop();
|
||||
oprot.writeStructEnd();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
private static class TAppendTupleSchemeFactory implements SchemeFactory {
|
||||
public TAppendTupleScheme getScheme() {
|
||||
return new TAppendTupleScheme();
|
||||
}
|
||||
}
|
||||
|
||||
private static class TAppendTupleScheme extends TupleScheme<TAppend> {
|
||||
|
||||
@Override
|
||||
public void write(org.apache.thrift.protocol.TProtocol prot, TAppend struct) throws org.apache.thrift.TException {
|
||||
TTupleProtocol oprot = (TTupleProtocol) prot;
|
||||
oprot.writeBinary(struct.row);
|
||||
{
|
||||
oprot.writeI32(struct.columns.size());
|
||||
for (TColumnValue _iter89 : struct.columns)
|
||||
{
|
||||
_iter89.write(oprot);
|
||||
}
|
||||
}
|
||||
BitSet optionals = new BitSet();
|
||||
if (struct.isSetAttributes()) {
|
||||
optionals.set(0);
|
||||
}
|
||||
if (struct.isSetDurability()) {
|
||||
optionals.set(1);
|
||||
}
|
||||
oprot.writeBitSet(optionals, 2);
|
||||
if (struct.isSetAttributes()) {
|
||||
{
|
||||
oprot.writeI32(struct.attributes.size());
|
||||
for (Map.Entry<ByteBuffer, ByteBuffer> _iter90 : struct.attributes.entrySet())
|
||||
{
|
||||
oprot.writeBinary(_iter90.getKey());
|
||||
oprot.writeBinary(_iter90.getValue());
|
||||
}
|
||||
}
|
||||
}
|
||||
if (struct.isSetDurability()) {
|
||||
oprot.writeI32(struct.durability.getValue());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void read(org.apache.thrift.protocol.TProtocol prot, TAppend struct) throws org.apache.thrift.TException {
|
||||
TTupleProtocol iprot = (TTupleProtocol) prot;
|
||||
struct.row = iprot.readBinary();
|
||||
struct.setRowIsSet(true);
|
||||
{
|
||||
org.apache.thrift.protocol.TList _list91 = new org.apache.thrift.protocol.TList(org.apache.thrift.protocol.TType.STRUCT, iprot.readI32());
|
||||
struct.columns = new ArrayList<TColumnValue>(_list91.size);
|
||||
for (int _i92 = 0; _i92 < _list91.size; ++_i92)
|
||||
{
|
||||
TColumnValue _elem93; // required
|
||||
_elem93 = new TColumnValue();
|
||||
_elem93.read(iprot);
|
||||
struct.columns.add(_elem93);
|
||||
}
|
||||
}
|
||||
struct.setColumnsIsSet(true);
|
||||
BitSet incoming = iprot.readBitSet(2);
|
||||
if (incoming.get(0)) {
|
||||
{
|
||||
org.apache.thrift.protocol.TMap _map94 = new org.apache.thrift.protocol.TMap(org.apache.thrift.protocol.TType.STRING, org.apache.thrift.protocol.TType.STRING, iprot.readI32());
|
||||
struct.attributes = new HashMap<ByteBuffer,ByteBuffer>(2*_map94.size);
|
||||
for (int _i95 = 0; _i95 < _map94.size; ++_i95)
|
||||
{
|
||||
ByteBuffer _key96; // required
|
||||
ByteBuffer _val97; // required
|
||||
_key96 = iprot.readBinary();
|
||||
_val97 = iprot.readBinary();
|
||||
struct.attributes.put(_key96, _val97);
|
||||
}
|
||||
}
|
||||
struct.setAttributesIsSet(true);
|
||||
}
|
||||
if (incoming.get(1)) {
|
||||
struct.durability = TDurability.findByValue(iprot.readI32());
|
||||
struct.setDurabilityIsSet(true);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
|
|
@ -187,6 +187,16 @@ struct TIncrement {
|
|||
5: optional TDurability durability
|
||||
}
|
||||
|
||||
/*
|
||||
* Used to perform append operation
|
||||
*/
|
||||
struct TAppend {
|
||||
1: required binary row,
|
||||
2: required list<TColumnValue> columns,
|
||||
3: optional map<binary, binary> attributes,
|
||||
4: optional TDurability durability
|
||||
}
|
||||
|
||||
/**
|
||||
* Any timestamps in the columns are ignored, use timeRange to select by timestamp.
|
||||
* Max versions defaults to 1.
|
||||
|
|
@ -405,6 +415,14 @@ service THBaseService {
|
|||
2: required TIncrement increment
|
||||
) throws (1: TIOError io)
|
||||
|
||||
TResult append(
|
||||
/** the table to append the value on */
|
||||
1: required binary table,
|
||||
|
||||
/** the TAppend to append */
|
||||
2: required TAppend append
|
||||
) throws (1: TIOError io)
|
||||
|
||||
/**
|
||||
* Get a Scanner for the provided TScan object.
|
||||
*
|
||||
|
|
|
|||
|
|
@ -37,6 +37,7 @@ import org.apache.hadoop.hbase.client.Durability;
|
|||
import org.apache.hadoop.hbase.filter.ParseFilter;
|
||||
import org.apache.hadoop.hbase.test.MetricsAssertHelper;
|
||||
import org.apache.hadoop.hbase.thrift.ThriftMetrics;
|
||||
import org.apache.hadoop.hbase.thrift2.generated.TAppend;
|
||||
import org.apache.hadoop.hbase.thrift2.generated.TColumn;
|
||||
import org.apache.hadoop.hbase.thrift2.generated.TColumnIncrement;
|
||||
import org.apache.hadoop.hbase.thrift2.generated.TColumnValue;
|
||||
|
|
@ -402,6 +403,33 @@ public class TestThriftHBaseServiceHandler {
|
|||
assertArrayEquals(Bytes.toBytes(2L), columnValue.getValue());
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testAppend() throws Exception {
|
||||
ThriftHBaseServiceHandler handler = createHandler();
|
||||
byte[] rowName = "testAppend".getBytes();
|
||||
ByteBuffer table = wrap(tableAname);
|
||||
byte[] v1 = Bytes.toBytes("42");
|
||||
byte[] v2 = Bytes.toBytes("23");
|
||||
List<TColumnValue> columnValues = new ArrayList<TColumnValue>();
|
||||
columnValues.add(new TColumnValue(wrap(familyAname), wrap(qualifierAname), wrap(v1)));
|
||||
TPut put = new TPut(wrap(rowName), columnValues);
|
||||
put.setColumnValues(columnValues);
|
||||
handler.put(table, put);
|
||||
|
||||
List<TColumnValue> appendColumns = new ArrayList<TColumnValue>();
|
||||
appendColumns.add(new TColumnValue(wrap(familyAname), wrap(qualifierAname), wrap(v2)));
|
||||
TAppend append = new TAppend(wrap(rowName), appendColumns);
|
||||
handler.append(table, append);
|
||||
|
||||
TGet get = new TGet(wrap(rowName));
|
||||
TResult result = handler.get(table, get);
|
||||
|
||||
assertArrayEquals(rowName, result.getRow());
|
||||
assertEquals(1, result.getColumnValuesSize());
|
||||
TColumnValue columnValue = result.getColumnValues().get(0);
|
||||
assertArrayEquals(Bytes.add(v1, v2), columnValue.getValue());
|
||||
}
|
||||
|
||||
/**
|
||||
* check that checkAndPut fails if the cell does not exist, then put in the cell, then check
|
||||
* that the checkAndPut succeeds.
|
||||
|
|
|
|||
Loading…
Reference in New Issue