Apache
/
hbase
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HBASE-6786 addendum - fix mutation spelling in .proto and generated classes 

git-svn-id: https://svn.apache.org/repos/asf/hbase/trunk@1399755 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Gary Helmling 2012-10-18 18:01:05 +00:00
parent 427684e09a
commit 952ec5521d
4 changed files with 153 additions and 153 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hbase-server/src/main/java/org/apache/hadoop/hbase/coprocessor/MultiRowMutationEndpoint.java
View File

@ -67,8 +67,8 @@ import com.google.protobuf.Service;
* Mutate m1 = ProtobufUtil.toMutate(MutateType.PUT, p1); * Mutate m1 = ProtobufUtil.toMutate(MutateType.PUT, p1);
* Mutate m2 = ProtobufUtil.toMutate(MutateType.PUT, p2); * Mutate m2 = ProtobufUtil.toMutate(MutateType.PUT, p2);
* MultiMutateRequest.Builder mrmBuilder = MultiMutateRequest.newBuilder(); * MultiMutateRequest.Builder mrmBuilder = MultiMutateRequest.newBuilder();
* mrmBuilder.addMutatationRequest(m1); * mrmBuilder.addMutationRequest(m1);
* mrmBuilder.addMutatationRequest(m2); * mrmBuilder.addMutationRequest(m2);
* CoprocessorRpcChannel channel = t.coprocessorService(ROW); * CoprocessorRpcChannel channel = t.coprocessorService(ROW);
* MultiRowMutationService.BlockingInterface service = * MultiRowMutationService.BlockingInterface service =
* MultiRowMutationService.newBlockingStub(channel); * MultiRowMutationService.newBlockingStub(channel);
@ -88,7 +88,7 @@ CoprocessorService, Coprocessor {
try { try {
// set of rows to lock, sorted to avoid deadlocks // set of rows to lock, sorted to avoid deadlocks
SortedSet<byte[]> rowsToLock = new TreeSet<byte[]>(Bytes.BYTES_COMPARATOR); SortedSet<byte[]> rowsToLock = new TreeSet<byte[]>(Bytes.BYTES_COMPARATOR);
List<Mutate> mutateRequestList = request.getMutatationRequestList(); List<Mutate> mutateRequestList = request.getMutationRequestList();
List<Mutation> mutations = new ArrayList<Mutation>(mutateRequestList.size()); List<Mutation> mutations = new ArrayList<Mutation>(mutateRequestList.size());
for (Mutate m : mutateRequestList) { for (Mutate m : mutateRequestList) {
mutations.add(ProtobufUtil.toMutation(m)); mutations.add(ProtobufUtil.toMutation(m));

294
hbase-server/src/main/java/org/apache/hadoop/hbase/protobuf/generated/MultiRowMutation.java
View File

@ -11,14 +11,14 @@ public final class MultiRowMutation {
public interface MultiMutateRequestOrBuilder public interface MultiMutateRequestOrBuilder
extends com.google.protobuf.MessageOrBuilder { extends com.google.protobuf.MessageOrBuilder {
// repeated .Mutate mutatationRequest = 1; // repeated .Mutate mutationRequest = 1;
java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate> java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate>
getMutatationRequestList(); getMutationRequestList();
org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate getMutatationRequest(int index); org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate getMutationRequest(int index);
int getMutatationRequestCount(); int getMutationRequestCount();
java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateOrBuilder> java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateOrBuilder>
getMutatationRequestOrBuilderList(); getMutationRequestOrBuilderList();
org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateOrBuilder getMutatationRequestOrBuilder( org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateOrBuilder getMutationRequestOrBuilder(
int index); int index);
} }
public static final class MultiMutateRequest extends public static final class MultiMutateRequest extends
@ -49,37 +49,37 @@ public final class MultiRowMutation {
return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutation.internal_static_MultiMutateRequest_fieldAccessorTable; return org.apache.hadoop.hbase.protobuf.generated.MultiRowMutation.internal_static_MultiMutateRequest_fieldAccessorTable;
} }
// repeated .Mutate mutatationRequest = 1; // repeated .Mutate mutationRequest = 1;
public static final int MUTATATIONREQUEST_FIELD_NUMBER = 1; public static final int MUTATIONREQUEST_FIELD_NUMBER = 1;
private java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate> mutatationRequest_; private java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate> mutationRequest_;
public java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate> getMutatationRequestList() { public java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate> getMutationRequestList() {
return mutatationRequest_; return mutationRequest_;
} }
public java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateOrBuilder> public java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateOrBuilder>
getMutatationRequestOrBuilderList() { getMutationRequestOrBuilderList() {
return mutatationRequest_; return mutationRequest_;
} }
public int getMutatationRequestCount() { public int getMutationRequestCount() {
return mutatationRequest_.size(); return mutationRequest_.size();
} }
public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate getMutatationRequest(int index) { public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate getMutationRequest(int index) {
return mutatationRequest_.get(index); return mutationRequest_.get(index);
} }
public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateOrBuilder getMutatationRequestOrBuilder( public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateOrBuilder getMutationRequestOrBuilder(
int index) { int index) {
return mutatationRequest_.get(index); return mutationRequest_.get(index);
} }
private void initFields() { private void initFields() {
mutatationRequest_ = java.util.Collections.emptyList(); mutationRequest_ = java.util.Collections.emptyList();
} }
private byte memoizedIsInitialized = -1; private byte memoizedIsInitialized = -1;
public final boolean isInitialized() { public final boolean isInitialized() {
byte isInitialized = memoizedIsInitialized; byte isInitialized = memoizedIsInitialized;
if (isInitialized != -1) return isInitialized == 1; if (isInitialized != -1) return isInitialized == 1;
for (int i = 0; i < getMutatationRequestCount(); i++) { for (int i = 0; i < getMutationRequestCount(); i++) {
if (!getMutatationRequest(i).isInitialized()) { if (!getMutationRequest(i).isInitialized()) {
memoizedIsInitialized = 0; memoizedIsInitialized = 0;
return false; return false;
} }
@ -91,8 +91,8 @@ public final class MultiRowMutation {
public void writeTo(com.google.protobuf.CodedOutputStream output) public void writeTo(com.google.protobuf.CodedOutputStream output)
throws java.io.IOException { throws java.io.IOException {
getSerializedSize(); getSerializedSize();
for (int i = 0; i < mutatationRequest_.size(); i++) { for (int i = 0; i < mutationRequest_.size(); i++) {
output.writeMessage(1, mutatationRequest_.get(i)); output.writeMessage(1, mutationRequest_.get(i));
} }
getUnknownFields().writeTo(output); getUnknownFields().writeTo(output);
} }
@ -103,9 +103,9 @@ public final class MultiRowMutation {
if (size != -1) return size; if (size != -1) return size;
size = 0; size = 0;
for (int i = 0; i < mutatationRequest_.size(); i++) { for (int i = 0; i < mutationRequest_.size(); i++) {
size += com.google.protobuf.CodedOutputStream size += com.google.protobuf.CodedOutputStream
.computeMessageSize(1, mutatationRequest_.get(i)); .computeMessageSize(1, mutationRequest_.get(i));
} }
size += getUnknownFields().getSerializedSize(); size += getUnknownFields().getSerializedSize();
memoizedSerializedSize = size; memoizedSerializedSize = size;
@ -130,8 +130,8 @@ public final class MultiRowMutation {
org.apache.hadoop.hbase.protobuf.generated.MultiRowMutation.MultiMutateRequest other = (org.apache.hadoop.hbase.protobuf.generated.MultiRowMutation.MultiMutateRequest) obj; org.apache.hadoop.hbase.protobuf.generated.MultiRowMutation.MultiMutateRequest other = (org.apache.hadoop.hbase.protobuf.generated.MultiRowMutation.MultiMutateRequest) obj;
boolean result = true; boolean result = true;
result = result && getMutatationRequestList() result = result && getMutationRequestList()
.equals(other.getMutatationRequestList()); .equals(other.getMutationRequestList());
result = result && result = result &&
getUnknownFields().equals(other.getUnknownFields()); getUnknownFields().equals(other.getUnknownFields());
return result; return result;
@ -141,9 +141,9 @@ public final class MultiRowMutation {
public int hashCode() { public int hashCode() {
int hash = 41; int hash = 41;
hash = (19 * hash) + getDescriptorForType().hashCode(); hash = (19 * hash) + getDescriptorForType().hashCode();
if (getMutatationRequestCount() > 0) { if (getMutationRequestCount() > 0) {
hash = (37 * hash) + MUTATATIONREQUEST_FIELD_NUMBER; hash = (37 * hash) + MUTATIONREQUEST_FIELD_NUMBER;
hash = (53 * hash) + getMutatationRequestList().hashCode(); hash = (53 * hash) + getMutationRequestList().hashCode();
} }
hash = (29 * hash) + getUnknownFields().hashCode(); hash = (29 * hash) + getUnknownFields().hashCode();
return hash; return hash;
@ -253,7 +253,7 @@ public final class MultiRowMutation {
} }
private void maybeForceBuilderInitialization() { private void maybeForceBuilderInitialization() {
if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) { if (com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders) {
getMutatationRequestFieldBuilder(); getMutationRequestFieldBuilder();
} }
} }
private static Builder create() { private static Builder create() {
@ -262,11 +262,11 @@ public final class MultiRowMutation {
public Builder clear() { public Builder clear() {
super.clear(); super.clear();
if (mutatationRequestBuilder_ == null) { if (mutationRequestBuilder_ == null) {
mutatationRequest_ = java.util.Collections.emptyList(); mutationRequest_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
} else { } else {
mutatationRequestBuilder_.clear(); mutationRequestBuilder_.clear();
} }
return this; return this;
} }
@ -305,14 +305,14 @@ public final class MultiRowMutation {
public org.apache.hadoop.hbase.protobuf.generated.MultiRowMutation.MultiMutateRequest buildPartial() { public org.apache.hadoop.hbase.protobuf.generated.MultiRowMutation.MultiMutateRequest buildPartial() {
org.apache.hadoop.hbase.protobuf.generated.MultiRowMutation.MultiMutateRequest result = new org.apache.hadoop.hbase.protobuf.generated.MultiRowMutation.MultiMutateRequest(this); org.apache.hadoop.hbase.protobuf.generated.MultiRowMutation.MultiMutateRequest result = new org.apache.hadoop.hbase.protobuf.generated.MultiRowMutation.MultiMutateRequest(this);
int from_bitField0_ = bitField0_; int from_bitField0_ = bitField0_;
if (mutatationRequestBuilder_ == null) { if (mutationRequestBuilder_ == null) {
if (((bitField0_ & 0x00000001) == 0x00000001)) { if (((bitField0_ & 0x00000001) == 0x00000001)) {
mutatationRequest_ = java.util.Collections.unmodifiableList(mutatationRequest_); mutationRequest_ = java.util.Collections.unmodifiableList(mutationRequest_);
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
} }
result.mutatationRequest_ = mutatationRequest_; result.mutationRequest_ = mutationRequest_;
} else { } else {
result.mutatationRequest_ = mutatationRequestBuilder_.build(); result.mutationRequest_ = mutationRequestBuilder_.build();
} }
onBuilt(); onBuilt();
return result; return result;
@ -329,29 +329,29 @@ public final class MultiRowMutation {
public Builder mergeFrom(org.apache.hadoop.hbase.protobuf.generated.MultiRowMutation.MultiMutateRequest other) { public Builder mergeFrom(org.apache.hadoop.hbase.protobuf.generated.MultiRowMutation.MultiMutateRequest other) {
if (other == org.apache.hadoop.hbase.protobuf.generated.MultiRowMutation.MultiMutateRequest.getDefaultInstance()) return this; if (other == org.apache.hadoop.hbase.protobuf.generated.MultiRowMutation.MultiMutateRequest.getDefaultInstance()) return this;
if (mutatationRequestBuilder_ == null) { if (mutationRequestBuilder_ == null) {
if (!other.mutatationRequest_.isEmpty()) { if (!other.mutationRequest_.isEmpty()) {
if (mutatationRequest_.isEmpty()) { if (mutationRequest_.isEmpty()) {
mutatationRequest_ = other.mutatationRequest_; mutationRequest_ = other.mutationRequest_;
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
} else { } else {
ensureMutatationRequestIsMutable(); ensureMutationRequestIsMutable();
mutatationRequest_.addAll(other.mutatationRequest_); mutationRequest_.addAll(other.mutationRequest_);
} }
onChanged(); onChanged();
} }
} else { } else {
if (!other.mutatationRequest_.isEmpty()) { if (!other.mutationRequest_.isEmpty()) {
if (mutatationRequestBuilder_.isEmpty()) { if (mutationRequestBuilder_.isEmpty()) {
mutatationRequestBuilder_.dispose(); mutationRequestBuilder_.dispose();
mutatationRequestBuilder_ = null; mutationRequestBuilder_ = null;
mutatationRequest_ = other.mutatationRequest_; mutationRequest_ = other.mutationRequest_;
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
mutatationRequestBuilder_ = mutationRequestBuilder_ =
com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ? com.google.protobuf.GeneratedMessage.alwaysUseFieldBuilders ?
getMutatationRequestFieldBuilder() : null; getMutationRequestFieldBuilder() : null;
} else { } else {
mutatationRequestBuilder_.addAllMessages(other.mutatationRequest_); mutationRequestBuilder_.addAllMessages(other.mutationRequest_);
} }
} }
} }
@ -360,8 +360,8 @@ public final class MultiRowMutation {
} }
public final boolean isInitialized() { public final boolean isInitialized() {
for (int i = 0; i < getMutatationRequestCount(); i++) { for (int i = 0; i < getMutationRequestCount(); i++) {
if (!getMutatationRequest(i).isInitialized()) { if (!getMutationRequest(i).isInitialized()) {
return false; return false;
} }
@ -395,7 +395,7 @@ public final class MultiRowMutation {
case 10: { case 10: {
org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.Builder subBuilder = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.newBuilder(); org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.Builder subBuilder = org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.newBuilder();
input.readMessage(subBuilder, extensionRegistry); input.readMessage(subBuilder, extensionRegistry);
addMutatationRequest(subBuilder.buildPartial()); addMutationRequest(subBuilder.buildPartial());
break; break;
} }
} }
@ -404,190 +404,190 @@ public final class MultiRowMutation {
private int bitField0_; private int bitField0_;
// repeated .Mutate mutatationRequest = 1; // repeated .Mutate mutationRequest = 1;
private java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate> mutatationRequest_ = private java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate> mutationRequest_ =
java.util.Collections.emptyList(); java.util.Collections.emptyList();
private void ensureMutatationRequestIsMutable() { private void ensureMutationRequestIsMutable() {
if (!((bitField0_ & 0x00000001) == 0x00000001)) { if (!((bitField0_ & 0x00000001) == 0x00000001)) {
mutatationRequest_ = new java.util.ArrayList<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate>(mutatationRequest_); mutationRequest_ = new java.util.ArrayList<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate>(mutationRequest_);
bitField0_ |= 0x00000001; bitField0_ |= 0x00000001;
} }
} }
private com.google.protobuf.RepeatedFieldBuilder< private com.google.protobuf.RepeatedFieldBuilder<
org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateOrBuilder> mutatationRequestBuilder_; org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateOrBuilder> mutationRequestBuilder_;
public java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate> getMutatationRequestList() { public java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate> getMutationRequestList() {
if (mutatationRequestBuilder_ == null) { if (mutationRequestBuilder_ == null) {
return java.util.Collections.unmodifiableList(mutatationRequest_); return java.util.Collections.unmodifiableList(mutationRequest_);
} else { } else {
return mutatationRequestBuilder_.getMessageList(); return mutationRequestBuilder_.getMessageList();
} }
} }
public int getMutatationRequestCount() { public int getMutationRequestCount() {
if (mutatationRequestBuilder_ == null) { if (mutationRequestBuilder_ == null) {
return mutatationRequest_.size(); return mutationRequest_.size();
} else { } else {
return mutatationRequestBuilder_.getCount(); return mutationRequestBuilder_.getCount();
} }
} }
public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate getMutatationRequest(int index) { public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate getMutationRequest(int index) {
if (mutatationRequestBuilder_ == null) { if (mutationRequestBuilder_ == null) {
return mutatationRequest_.get(index); return mutationRequest_.get(index);
} else { } else {
return mutatationRequestBuilder_.getMessage(index); return mutationRequestBuilder_.getMessage(index);
} }
} }
public Builder setMutatationRequest( public Builder setMutationRequest(
int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate value) { int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate value) {
if (mutatationRequestBuilder_ == null) { if (mutationRequestBuilder_ == null) {
if (value == null) { if (value == null) {
throw new NullPointerException(); throw new NullPointerException();
} }
ensureMutatationRequestIsMutable(); ensureMutationRequestIsMutable();
mutatationRequest_.set(index, value); mutationRequest_.set(index, value);
onChanged(); onChanged();
} else { } else {
mutatationRequestBuilder_.setMessage(index, value); mutationRequestBuilder_.setMessage(index, value);
} }
return this; return this;
} }
public Builder setMutatationRequest( public Builder setMutationRequest(
int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.Builder builderForValue) { int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.Builder builderForValue) {
if (mutatationRequestBuilder_ == null) { if (mutationRequestBuilder_ == null) {
ensureMutatationRequestIsMutable(); ensureMutationRequestIsMutable();
mutatationRequest_.set(index, builderForValue.build()); mutationRequest_.set(index, builderForValue.build());
onChanged(); onChanged();
} else { } else {
mutatationRequestBuilder_.setMessage(index, builderForValue.build()); mutationRequestBuilder_.setMessage(index, builderForValue.build());
} }
return this; return this;
} }
public Builder addMutatationRequest(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate value) { public Builder addMutationRequest(org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate value) {
if (mutatationRequestBuilder_ == null) { if (mutationRequestBuilder_ == null) {
if (value == null) { if (value == null) {
throw new NullPointerException(); throw new NullPointerException();
} }
ensureMutatationRequestIsMutable(); ensureMutationRequestIsMutable();
mutatationRequest_.add(value); mutationRequest_.add(value);
onChanged(); onChanged();
} else { } else {
mutatationRequestBuilder_.addMessage(value); mutationRequestBuilder_.addMessage(value);
} }
return this; return this;
} }
public Builder addMutatationRequest( public Builder addMutationRequest(
int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate value) { int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate value) {
if (mutatationRequestBuilder_ == null) { if (mutationRequestBuilder_ == null) {
if (value == null) { if (value == null) {
throw new NullPointerException(); throw new NullPointerException();
} }
ensureMutatationRequestIsMutable(); ensureMutationRequestIsMutable();
mutatationRequest_.add(index, value); mutationRequest_.add(index, value);
onChanged(); onChanged();
} else { } else {
mutatationRequestBuilder_.addMessage(index, value); mutationRequestBuilder_.addMessage(index, value);
} }
return this; return this;
} }
public Builder addMutatationRequest( public Builder addMutationRequest(
org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.Builder builderForValue) { org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.Builder builderForValue) {
if (mutatationRequestBuilder_ == null) { if (mutationRequestBuilder_ == null) {
ensureMutatationRequestIsMutable(); ensureMutationRequestIsMutable();
mutatationRequest_.add(builderForValue.build()); mutationRequest_.add(builderForValue.build());
onChanged(); onChanged();
} else { } else {
mutatationRequestBuilder_.addMessage(builderForValue.build()); mutationRequestBuilder_.addMessage(builderForValue.build());
} }
return this; return this;
} }
public Builder addMutatationRequest( public Builder addMutationRequest(
int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.Builder builderForValue) { int index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.Builder builderForValue) {
if (mutatationRequestBuilder_ == null) { if (mutationRequestBuilder_ == null) {
ensureMutatationRequestIsMutable(); ensureMutationRequestIsMutable();
mutatationRequest_.add(index, builderForValue.build()); mutationRequest_.add(index, builderForValue.build());
onChanged(); onChanged();
} else { } else {
mutatationRequestBuilder_.addMessage(index, builderForValue.build()); mutationRequestBuilder_.addMessage(index, builderForValue.build());
} }
return this; return this;
} }
public Builder addAllMutatationRequest( public Builder addAllMutationRequest(
java.lang.Iterable<? extends org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate> values) { java.lang.Iterable<? extends org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate> values) {
if (mutatationRequestBuilder_ == null) { if (mutationRequestBuilder_ == null) {
ensureMutatationRequestIsMutable(); ensureMutationRequestIsMutable();
super.addAll(values, mutatationRequest_); super.addAll(values, mutationRequest_);
onChanged(); onChanged();
} else { } else {
mutatationRequestBuilder_.addAllMessages(values); mutationRequestBuilder_.addAllMessages(values);
} }
return this; return this;
} }
public Builder clearMutatationRequest() { public Builder clearMutationRequest() {
if (mutatationRequestBuilder_ == null) { if (mutationRequestBuilder_ == null) {
mutatationRequest_ = java.util.Collections.emptyList(); mutationRequest_ = java.util.Collections.emptyList();
bitField0_ = (bitField0_ & ~0x00000001); bitField0_ = (bitField0_ & ~0x00000001);
onChanged(); onChanged();
} else { } else {
mutatationRequestBuilder_.clear(); mutationRequestBuilder_.clear();
} }
return this; return this;
} }
public Builder removeMutatationRequest(int index) { public Builder removeMutationRequest(int index) {
if (mutatationRequestBuilder_ == null) { if (mutationRequestBuilder_ == null) {
ensureMutatationRequestIsMutable(); ensureMutationRequestIsMutable();
mutatationRequest_.remove(index); mutationRequest_.remove(index);
onChanged(); onChanged();
} else { } else {
mutatationRequestBuilder_.remove(index); mutationRequestBuilder_.remove(index);
} }
return this; return this;
} }
public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.Builder getMutatationRequestBuilder( public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.Builder getMutationRequestBuilder(
int index) { int index) {
return getMutatationRequestFieldBuilder().getBuilder(index); return getMutationRequestFieldBuilder().getBuilder(index);
} }
public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateOrBuilder getMutatationRequestOrBuilder( public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateOrBuilder getMutationRequestOrBuilder(
int index) { int index) {
if (mutatationRequestBuilder_ == null) { if (mutationRequestBuilder_ == null) {
return mutatationRequest_.get(index); } else { return mutationRequest_.get(index); } else {
return mutatationRequestBuilder_.getMessageOrBuilder(index); return mutationRequestBuilder_.getMessageOrBuilder(index);
} }
} }
public java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateOrBuilder> public java.util.List<? extends org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateOrBuilder>
getMutatationRequestOrBuilderList() { getMutationRequestOrBuilderList() {
if (mutatationRequestBuilder_ != null) { if (mutationRequestBuilder_ != null) {
return mutatationRequestBuilder_.getMessageOrBuilderList(); return mutationRequestBuilder_.getMessageOrBuilderList();
} else { } else {
return java.util.Collections.unmodifiableList(mutatationRequest_); return java.util.Collections.unmodifiableList(mutationRequest_);
} }
} }
public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.Builder addMutatationRequestBuilder() { public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.Builder addMutationRequestBuilder() {
return getMutatationRequestFieldBuilder().addBuilder( return getMutationRequestFieldBuilder().addBuilder(
org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.getDefaultInstance()); org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.getDefaultInstance());
} }
public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.Builder addMutatationRequestBuilder( public org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.Builder addMutationRequestBuilder(
int index) { int index) {
return getMutatationRequestFieldBuilder().addBuilder( return getMutationRequestFieldBuilder().addBuilder(
index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.getDefaultInstance()); index, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.getDefaultInstance());
} }
public java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.Builder> public java.util.List<org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.Builder>
getMutatationRequestBuilderList() { getMutationRequestBuilderList() {
return getMutatationRequestFieldBuilder().getBuilderList(); return getMutationRequestFieldBuilder().getBuilderList();
} }
private com.google.protobuf.RepeatedFieldBuilder< private com.google.protobuf.RepeatedFieldBuilder<
org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateOrBuilder> org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateOrBuilder>
getMutatationRequestFieldBuilder() { getMutationRequestFieldBuilder() {
if (mutatationRequestBuilder_ == null) { if (mutationRequestBuilder_ == null) {
mutatationRequestBuilder_ = new com.google.protobuf.RepeatedFieldBuilder< mutationRequestBuilder_ = new com.google.protobuf.RepeatedFieldBuilder<
org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateOrBuilder>( org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.Mutate.Builder, org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateOrBuilder>(
mutatationRequest_, mutationRequest_,
((bitField0_ & 0x00000001) == 0x00000001), ((bitField0_ & 0x00000001) == 0x00000001),
getParentForChildren(), getParentForChildren(),
isClean()); isClean());
mutatationRequest_ = null; mutationRequest_ = null;
} }
return mutatationRequestBuilder_; return mutationRequestBuilder_;
} }
// @@protoc_insertion_point(builder_scope:MultiMutateRequest) // @@protoc_insertion_point(builder_scope:MultiMutateRequest)
@ -1141,13 +1141,13 @@ public final class MultiRowMutation {
descriptor; descriptor;
static { static {
java.lang.String[] descriptorData = { java.lang.String[] descriptorData = {
"\n\026MultiRowMutation.proto\032\014Client.proto\"8" + "\n\026MultiRowMutation.proto\032\014Client.proto\"6" +
"\n\022MultiMutateRequest\022\"\n\021mutatationReques" + "\n\022MultiMutateRequest\022 \n\017mutationRequest\030" +
"t\030\001 \003(\0132\007.Mutate\"\025\n\023MultiMutateResponse2" + "\001 \003(\0132\007.Mutate\"\025\n\023MultiMutateResponse2R\n" +
"R\n\027MultiRowMutationService\0227\n\nmutateRows" + "\027MultiRowMutationService\0227\n\nmutateRows\022\023" +
"\022\023.MultiMutateRequest\032\024.MultiMutateRespo" + ".MultiMutateRequest\032\024.MultiMutateRespons" +
"nseBF\n*org.apache.hadoop.hbase.protobuf." + "eBF\n*org.apache.hadoop.hbase.protobuf.ge" +
"generatedB\020MultiRowMutationH\001\210\001\001\240\001\001" "neratedB\020MultiRowMutationH\001\210\001\001\240\001\001"
}; };
com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner = com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() { new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@ -1159,7 +1159,7 @@ public final class MultiRowMutation {
internal_static_MultiMutateRequest_fieldAccessorTable = new internal_static_MultiMutateRequest_fieldAccessorTable = new
com.google.protobuf.GeneratedMessage.FieldAccessorTable( com.google.protobuf.GeneratedMessage.FieldAccessorTable(
internal_static_MultiMutateRequest_descriptor, internal_static_MultiMutateRequest_descriptor,
new java.lang.String[] { "MutatationRequest", }, new java.lang.String[] { "MutationRequest", },
org.apache.hadoop.hbase.protobuf.generated.MultiRowMutation.MultiMutateRequest.class, org.apache.hadoop.hbase.protobuf.generated.MultiRowMutation.MultiMutateRequest.class,
org.apache.hadoop.hbase.protobuf.generated.MultiRowMutation.MultiMutateRequest.Builder.class); org.apache.hadoop.hbase.protobuf.generated.MultiRowMutation.MultiMutateRequest.Builder.class);
internal_static_MultiMutateResponse_descriptor = internal_static_MultiMutateResponse_descriptor =

2
hbase-server/src/main/protobuf/MultiRowMutation.proto
View File

@ -23,7 +23,7 @@ option java_generic_services = true;
option optimize_for = SPEED; option optimize_for = SPEED;
message MultiMutateRequest { message MultiMutateRequest {
repeated Mutate mutatationRequest = 1; repeated Mutate mutationRequest = 1;
} }
message MultiMutateResponse { message MultiMutateResponse {

4
hbase-server/src/test/java/org/apache/hadoop/hbase/client/TestFromClientSide.java
View File

@ -4190,8 +4190,8 @@ public class TestFromClientSide {
Mutate m2 = ProtobufUtil.toMutate(MutateType.PUT, p); Mutate m2 = ProtobufUtil.toMutate(MutateType.PUT, p);
MultiMutateRequest.Builder mrmBuilder = MultiMutateRequest.newBuilder(); MultiMutateRequest.Builder mrmBuilder = MultiMutateRequest.newBuilder();
mrmBuilder.addMutatationRequest(m1); mrmBuilder.addMutationRequest(m1);
mrmBuilder.addMutatationRequest(m2); mrmBuilder.addMutationRequest(m2);
MultiMutateRequest mrm = mrmBuilder.build(); MultiMutateRequest mrm = mrmBuilder.build();
CoprocessorRpcChannel channel = t.coprocessorService(ROW); CoprocessorRpcChannel channel = t.coprocessorService(ROW);
MultiRowMutationService.BlockingInterface service = MultiRowMutationService.BlockingInterface service =