Return-Path: 
 <commits-return-15466-apmail-hbase-commits-archive=hbase.apache.org@hbase.apache.org>
X-Original-To: apmail-hbase-commits-archive@www.apache.org
Delivered-To: apmail-hbase-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 11817106A5
	for <apmail-hbase-commits-archive@www.apache.org>;
 Mon, 30 Sep 2013 21:28:15 +0000 (UTC)
Received: (qmail 68640 invoked by uid 500); 30 Sep 2013 21:28:12 -0000
Delivered-To: apmail-hbase-commits-archive@hbase.apache.org
Received: (qmail 68511 invoked by uid 500); 30 Sep 2013 21:28:06 -0000
Mailing-List: contact commits-help@hbase.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@hbase.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@hbase.apache.org>
List-Post: <mailto:commits@hbase.apache.org>
List-Id: <commits.hbase.apache.org>
Reply-To: dev@hbase.apache.org
Delivered-To: mailing list commits@hbase.apache.org
Received: (qmail 68498 invoked by uid 99); 30 Sep 2013 21:28:06 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Sep 2013 21:28:06 +0000
X-ASF-Spam-Status: No, hits=-2000.0 required=5.0
	tests=ALL_TRUSTED
X-Spam-Check-By: apache.org
Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4)
    by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 30 Sep 2013 21:27:57 +0000
Received: from eris.apache.org (localhost [127.0.0.1])
	by eris.apache.org (Postfix) with ESMTP id 7AD912388A56;
	Mon, 30 Sep 2013 21:27:35 +0000 (UTC)
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r1527789 [3/3] - in /hbase/trunk:
 hbase-client/src/main/java/org/apache/hadoop/hbase/client/
 hbase-client/src/main/java/org/apache/hadoop/hbase/ipc/
 hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/
 hbase-protocol/ hbase-protocol...
Date: Mon, 30 Sep 2013 21:27:34 -0000
To: commits@hbase.apache.org
From: stack@apache.org
X-Mailer: svnmailer-1.0.9
Message-Id: <20130930212735.7AD912388A56@eris.apache.org>
X-Virus-Checked: Checked by ClamAV on apache.org

Modified: hbase/trunk/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RPCProtos.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RPCProtos.java?rev=1527789&r1=1527788&r2=1527789&view=diff
==============================================================================
--- hbase/trunk/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RPCProtos.java (original)
+++ hbase/trunk/hbase-protocol/src/main/java/org/apache/hadoop/hbase/protobuf/generated/RPCProtos.java Mon Sep 30 21:27:33 2013
@@ -3662,26 +3662,6 @@ public final class RPCProtos {
      * </pre>
      */
     org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMetaOrBuilder getCellBlockMetaOrBuilder();
-
-    // optional uint32 priority = 6;
-    /**
-     * <code>optional uint32 priority = 6;</code>
-     *
-     * <pre>
-     * 0 is NORMAL priority.  100 is HIGH.  If no priority, treat it as NORMAL.
-     * See HConstants.
-     * </pre>
-     */
-    boolean hasPriority();
-    /**
-     * <code>optional uint32 priority = 6;</code>
-     *
-     * <pre>
-     * 0 is NORMAL priority.  100 is HIGH.  If no priority, treat it as NORMAL.
-     * See HConstants.
-     * </pre>
-     */
-    int getPriority();
   }
   /**
    * Protobuf type {@code RequestHeader}
@@ -3779,11 +3759,6 @@ public final class RPCProtos {
               bitField0_ |= 0x00000010;
               break;
             }
-            case 48: {
-              bitField0_ |= 0x00000020;
-              priority_ = input.readUInt32();
-              break;
-            }
           }
         }
       } catch (com.google.protobuf.InvalidProtocolBufferException e) {
@@ -3971,39 +3946,12 @@ public final class RPCProtos {
       return cellBlockMeta_;
     }
 
-    // optional uint32 priority = 6;
-    public static final int PRIORITY_FIELD_NUMBER = 6;
-    private int priority_;
-    /**
-     * <code>optional uint32 priority = 6;</code>
-     *
-     * <pre>
-     * 0 is NORMAL priority.  100 is HIGH.  If no priority, treat it as NORMAL.
-     * See HConstants.
-     * </pre>
-     */
-    public boolean hasPriority() {
-      return ((bitField0_ & 0x00000020) == 0x00000020);
-    }
-    /**
-     * <code>optional uint32 priority = 6;</code>
-     *
-     * <pre>
-     * 0 is NORMAL priority.  100 is HIGH.  If no priority, treat it as NORMAL.
-     * See HConstants.
-     * </pre>
-     */
-    public int getPriority() {
-      return priority_;
-    }
-
     private void initFields() {
       callId_ = 0;
       traceInfo_ = org.apache.hadoop.hbase.protobuf.generated.TracingProtos.RPCTInfo.getDefaultInstance();
       methodName_ = "";
       requestParam_ = false;
       cellBlockMeta_ = org.apache.hadoop.hbase.protobuf.generated.RPCProtos.CellBlockMeta.getDefaultInstance();
-      priority_ = 0;
     }
     private byte memoizedIsInitialized = -1;
     public final boolean isInitialized() {
@@ -4032,9 +3980,6 @@ public final class RPCProtos {
       if (((bitField0_ & 0x00000010) == 0x00000010)) {
         output.writeMessage(5, cellBlockMeta_);
       }
-      if (((bitField0_ & 0x00000020) == 0x00000020)) {
-        output.writeUInt32(6, priority_);
-      }
       getUnknownFields().writeTo(output);
     }
 
@@ -4064,10 +4009,6 @@ public final class RPCProtos {
         size += com.google.protobuf.CodedOutputStream
           .computeMessageSize(5, cellBlockMeta_);
       }
-      if (((bitField0_ & 0x00000020) == 0x00000020)) {
-        size += com.google.protobuf.CodedOutputStream
-          .computeUInt32Size(6, priority_);
-      }
       size += getUnknownFields().getSerializedSize();
       memoizedSerializedSize = size;
       return size;
@@ -4116,11 +4057,6 @@ public final class RPCProtos {
         result = result && getCellBlockMeta()
             .equals(other.getCellBlockMeta());
       }
-      result = result && (hasPriority() == other.hasPriority());
-      if (hasPriority()) {
-        result = result && (getPriority()
-            == other.getPriority());
-      }
       result = result &&
           getUnknownFields().equals(other.getUnknownFields());
       return result;
@@ -4154,10 +4090,6 @@ public final class RPCProtos {
         hash = (37 * hash) + CELL_BLOCK_META_FIELD_NUMBER;
         hash = (53 * hash) + getCellBlockMeta().hashCode();
       }
-      if (hasPriority()) {
-        hash = (37 * hash) + PRIORITY_FIELD_NUMBER;
-        hash = (53 * hash) + getPriority();
-      }
       hash = (29 * hash) + getUnknownFields().hashCode();
       memoizedHashCode = hash;
       return hash;
@@ -4291,8 +4223,6 @@ public final class RPCProtos {
           cellBlockMetaBuilder_.clear();
         }
         bitField0_ = (bitField0_ & ~0x00000010);
-        priority_ = 0;
-        bitField0_ = (bitField0_ & ~0x00000020);
         return this;
       }
 
@@ -4349,10 +4279,6 @@ public final class RPCProtos {
         } else {
           result.cellBlockMeta_ = cellBlockMetaBuilder_.build();
         }
-        if (((from_bitField0_ & 0x00000020) == 0x00000020)) {
-          to_bitField0_ |= 0x00000020;
-        }
-        result.priority_ = priority_;
         result.bitField0_ = to_bitField0_;
         onBuilt();
         return result;
@@ -4386,9 +4312,6 @@ public final class RPCProtos {
         if (other.hasCellBlockMeta()) {
           mergeCellBlockMeta(other.getCellBlockMeta());
         }
-        if (other.hasPriority()) {
-          setPriority(other.getPriority());
-        }
         this.mergeUnknownFields(other.getUnknownFields());
         return this;
       }
@@ -4858,59 +4781,6 @@ public final class RPCProtos {
         return cellBlockMetaBuilder_;
       }
 
-      // optional uint32 priority = 6;
-      private int priority_ ;
-      /**
-       * <code>optional uint32 priority = 6;</code>
-       *
-       * <pre>
-       * 0 is NORMAL priority.  100 is HIGH.  If no priority, treat it as NORMAL.
-       * See HConstants.
-       * </pre>
-       */
-      public boolean hasPriority() {
-        return ((bitField0_ & 0x00000020) == 0x00000020);
-      }
-      /**
-       * <code>optional uint32 priority = 6;</code>
-       *
-       * <pre>
-       * 0 is NORMAL priority.  100 is HIGH.  If no priority, treat it as NORMAL.
-       * See HConstants.
-       * </pre>
-       */
-      public int getPriority() {
-        return priority_;
-      }
-      /**
-       * <code>optional uint32 priority = 6;</code>
-       *
-       * <pre>
-       * 0 is NORMAL priority.  100 is HIGH.  If no priority, treat it as NORMAL.
-       * See HConstants.
-       * </pre>
-       */
-      public Builder setPriority(int value) {
-        bitField0_ |= 0x00000020;
-        priority_ = value;
-        onChanged();
-        return this;
-      }
-      /**
-       * <code>optional uint32 priority = 6;</code>
-       *
-       * <pre>
-       * 0 is NORMAL priority.  100 is HIGH.  If no priority, treat it as NORMAL.
-       * See HConstants.
-       * </pre>
-       */
-      public Builder clearPriority() {
-        bitField0_ = (bitField0_ & ~0x00000020);
-        priority_ = 0;
-        onChanged();
-        return this;
-      }
-
       // @@protoc_insertion_point(builder_scope:RequestHeader)
     }
 
@@ -5927,15 +5797,15 @@ public final class RPCProtos {
       "\001(\r\"|\n\021ExceptionResponse\022\034\n\024exception_cl" +
       "ass_name\030\001 \001(\t\022\023\n\013stack_trace\030\002 \001(\t\022\020\n\010h" +
       "ostname\030\003 \001(\t\022\014\n\004port\030\004 \001(\005\022\024\n\014do_not_re",
-      "try\030\005 \001(\010\"\246\001\n\rRequestHeader\022\017\n\007call_id\030\001" +
+      "try\030\005 \001(\010\"\224\001\n\rRequestHeader\022\017\n\007call_id\030\001" +
       " \001(\r\022\035\n\ntrace_info\030\002 \001(\0132\t.RPCTInfo\022\023\n\013m" +
       "ethod_name\030\003 \001(\t\022\025\n\rrequest_param\030\004 \001(\010\022" +
       "\'\n\017cell_block_meta\030\005 \001(\0132\016.CellBlockMeta" +
-      "\022\020\n\010priority\030\006 \001(\r\"q\n\016ResponseHeader\022\017\n\007" +
-      "call_id\030\001 \001(\r\022%\n\texception\030\002 \001(\0132\022.Excep" +
-      "tionResponse\022\'\n\017cell_block_meta\030\003 \001(\0132\016." +
-      "CellBlockMetaB<\n*org.apache.hadoop.hbase" +
-      ".protobuf.generatedB\tRPCProtosH\001\240\001\001"
+      "\"q\n\016ResponseHeader\022\017\n\007call_id\030\001 \001(\r\022%\n\te" +
+      "xception\030\002 \001(\0132\022.ExceptionResponse\022\'\n\017ce" +
+      "ll_block_meta\030\003 \001(\0132\016.CellBlockMetaB<\n*o" +
+      "rg.apache.hadoop.hbase.protobuf.generate" +
+      "dB\tRPCProtosH\001\240\001\001"
     };
     com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner assigner =
       new com.google.protobuf.Descriptors.FileDescriptor.InternalDescriptorAssigner() {
@@ -5971,7 +5841,7 @@ public final class RPCProtos {
           internal_static_RequestHeader_fieldAccessorTable = new
             com.google.protobuf.GeneratedMessage.FieldAccessorTable(
               internal_static_RequestHeader_descriptor,
-              new java.lang.String[] { "CallId", "TraceInfo", "MethodName", "RequestParam", "CellBlockMeta", "Priority", });
+              new java.lang.String[] { "CallId", "TraceInfo", "MethodName", "RequestParam", "CellBlockMeta", });
           internal_static_ResponseHeader_descriptor =
             getDescriptor().getMessageTypes().get(5);
           internal_static_ResponseHeader_fieldAccessorTable = new

Modified: hbase/trunk/hbase-protocol/src/main/protobuf/Client.proto
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-protocol/src/main/protobuf/Client.proto?rev=1527789&r1=1527788&r2=1527789&view=diff
==============================================================================
--- hbase/trunk/hbase-protocol/src/main/protobuf/Client.proto (original)
+++ hbase/trunk/hbase-protocol/src/main/protobuf/Client.proto Mon Sep 30 21:27:33 2013
@@ -319,41 +319,42 @@ message CoprocessorServiceResponse {
 }
 
 /**
- * Mutations to run against a Region.
+ * An action that is part of MultiRequest.
+ * This is a union type - exactly one of the fields will be set.
  */
-message RegionMutation {
-  required RegionSpecifier region = 1;
-  // When set, run mutations as atomic unit.
-  optional bool atomic = 2;
-  repeated MutationProto mutation = 3;
+message MultiAction {
+  optional MutationProto mutation = 1;
+  optional Get get = 2;
 }
 
 /**
- * Either a Result or an Exception NameBytesPair (keyed by
- * exception name whose value is the exception stringified)
- * or maybe empty if no result and no exception.
+ * An individual action result. The result will in the
+ * same order as the action in the request. If an action
+ * returns a value, it is set in value field. If it doesn't
+ * return anything, the result will be empty. If an action
+ * fails to execute due to any exception, the exception
+ * is returned as a stringified parameter.
  */
-message ResultOrException {
-  optional Result result = 1;
+message ActionResult {
+  optional Result value = 1;
   optional NameBytesPair exception = 2;
 }
 
 /**
- * The result of a RegionMutation.
- */
-message RegionMutationResult {
-  repeated ResultOrException resultOrException = 1;
-}
-
-/**
- * Execute a list of actions on a given region in order.
+ * You can execute a list of actions on a given region in order.
+ *
+ * If it is a list of mutate actions, atomic can be set
+ * to make sure they can be processed atomically, just like
+ * RowMutations.
  */
 message MultiRequest {
-  repeated RegionMutation regionMutation = 1;
+  required RegionSpecifier region = 1;
+  repeated MultiAction action = 2;
+  optional bool atomic = 3;
 }
 
 message MultiResponse {
-  repeated RegionMutationResult regionMutationResult = 1;
+  repeated ActionResult result = 1;
 }
 
 

Modified: hbase/trunk/hbase-protocol/src/main/protobuf/RPC.proto
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-protocol/src/main/protobuf/RPC.proto?rev=1527789&r1=1527788&r2=1527789&view=diff
==============================================================================
--- hbase/trunk/hbase-protocol/src/main/protobuf/RPC.proto (original)
+++ hbase/trunk/hbase-protocol/src/main/protobuf/RPC.proto Mon Sep 30 21:27:33 2013
@@ -119,9 +119,7 @@ message RequestHeader {
   optional bool request_param = 4;
   // If present, then an encoded data block follows.
   optional CellBlockMeta cell_block_meta = 5;
-  // 0 is NORMAL priority.  100 is HIGH.  If no priority, treat it as NORMAL.
-  // See HConstants.
-  optional uint32 priority = 6;
+  // TODO: Have client specify priority
 }
 
 message ResponseHeader {

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AnnotationReadingPriorityFunction.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AnnotationReadingPriorityFunction.java?rev=1527789&r1=1527788&r2=1527789&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AnnotationReadingPriorityFunction.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/AnnotationReadingPriorityFunction.java Mon Sep 30 21:27:33 2013
@@ -83,7 +83,8 @@ class AnnotationReadingPriorityFunction 
       CompactRegionRequest.class,
       GetRequest.class,
       MutateRequest.class,
-      ScanRequest.class
+      ScanRequest.class,
+      MultiRequest.class
   };
 
   // Some caches for helping performance
@@ -100,7 +101,7 @@ class AnnotationReadingPriorityFunction 
       if (p != null) {
         // Since we protobuf'd, and then subsequently, when we went with pb style, method names
         // are capitalized.  This meant that this brittle compare of method names gotten by
-        // reflection no longer matched the method names coming in over pb.  TODO: Get rid of this
+        // reflection no longer matched the method names comeing in over pb.  TODO: Get rid of this
         // check.  For now, workaround is to capitalize the names we got from reflection so they
         // have chance of matching the pb ones.
         String capitalizedMethodName = capitalize(m.getName());
@@ -108,6 +109,7 @@ class AnnotationReadingPriorityFunction 
       }
     }
     this.annotatedQos = qosMap;
+
     if (methodMap.get("getRegion") == null) {
       methodMap.put("hasRegion", new HashMap<Class<? extends Message>, Method>());
       methodMap.put("getRegion", new HashMap<Class<? extends Message>, Method>());
@@ -146,14 +148,10 @@ class AnnotationReadingPriorityFunction 
     if (priorityByAnnotation != null) {
       return priorityByAnnotation;
     }
+
     if (param == null) {
       return HConstants.NORMAL_QOS;
     }
-    if (methodName.equalsIgnoreCase("multi") && param instanceof MultiRequest) {
-      // The multi call has its priority set in the header.  All calls should work this way but
-      // only this one has been converted so far.  No priority == NORMAL_QOS.
-      return header.hasPriority()? header.getPriority(): HConstants.NORMAL_QOS;
-    }
     String cls = param.getClass().getName();
     Class<? extends Message> rpcArgClass = argumentToClassMap.get(cls);
     RegionSpecifier regionSpecifier = null;
@@ -203,4 +201,4 @@ class AnnotationReadingPriorityFunction 
   void setRegionServer(final HRegionServer hrs) {
     this.hRegionServer = hrs;
   }
-}
+}
\ No newline at end of file

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java?rev=1527789&r1=1527788&r2=1527789&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java Mon Sep 30 21:27:33 2013
@@ -73,16 +73,16 @@ import org.apache.hadoop.hbase.DroppedSn
 import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.HColumnDescriptor;
 import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.NotServingRegionException;
+import org.apache.hadoop.hbase.RegionTooBusyException;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.UnknownScannerException;
 import org.apache.hadoop.hbase.HConstants.OperationStatusCode;
 import org.apache.hadoop.hbase.HDFSBlocksDistribution;
 import org.apache.hadoop.hbase.HRegionInfo;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.KeyValueUtil;
-import org.apache.hadoop.hbase.NotServingRegionException;
-import org.apache.hadoop.hbase.RegionTooBusyException;
-import org.apache.hadoop.hbase.TableName;
-import org.apache.hadoop.hbase.UnknownScannerException;
 import org.apache.hadoop.hbase.backup.HFileArchiver;
 import org.apache.hadoop.hbase.client.Append;
 import org.apache.hadoop.hbase.client.Delete;
@@ -113,9 +113,11 @@ import org.apache.hadoop.hbase.ipc.RpcSe
 import org.apache.hadoop.hbase.master.AssignmentManager;
 import org.apache.hadoop.hbase.monitoring.MonitoredTask;
 import org.apache.hadoop.hbase.monitoring.TaskMonitor;
+import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
 import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.GetRegionInfoResponse.CompactionState;
 import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntry;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.CoprocessorServiceCall;
+import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.MutationType;
 import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos.SnapshotDescription;
 import org.apache.hadoop.hbase.protobuf.generated.WALProtos.CompactionDescriptor;

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java?rev=1527789&r1=1527788&r2=1527789&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegionServer.java Mon Sep 30 21:27:33 2013
@@ -18,6 +18,8 @@
  */
 package org.apache.hadoop.hbase.regionserver;
 
+import javax.management.ObjectName;
+
 import java.io.IOException;
 import java.lang.Thread.UncaughtExceptionHandler;
 import java.lang.annotation.Retention;
@@ -36,20 +38,18 @@ import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.UUID;
 import java.util.Map.Entry;
 import java.util.Random;
 import java.util.Set;
 import java.util.SortedMap;
 import java.util.TreeMap;
 import java.util.TreeSet;
-import java.util.UUID;
 import java.util.concurrent.ConcurrentHashMap;
 import java.util.concurrent.ConcurrentMap;
 import java.util.concurrent.ConcurrentSkipListMap;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import javax.management.ObjectName;
-
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.hadoop.classification.InterfaceAudience;
@@ -65,6 +65,7 @@ import org.apache.hadoop.hbase.ClockOutO
 import org.apache.hadoop.hbase.DoNotRetryIOException;
 import org.apache.hadoop.hbase.HBaseConfiguration;
 import org.apache.hadoop.hbase.HConstants;
+import org.apache.hadoop.hbase.HConstants.OperationStatusCode;
 import org.apache.hadoop.hbase.HRegionInfo;
 import org.apache.hadoop.hbase.HTableDescriptor;
 import org.apache.hadoop.hbase.HealthCheckChore;
@@ -89,6 +90,7 @@ import org.apache.hadoop.hbase.client.In
 import org.apache.hadoop.hbase.client.Mutation;
 import org.apache.hadoop.hbase.client.Put;
 import org.apache.hadoop.hbase.client.Result;
+import org.apache.hadoop.hbase.client.Row;
 import org.apache.hadoop.hbase.client.RowMutations;
 import org.apache.hadoop.hbase.client.Scan;
 import org.apache.hadoop.hbase.coprocessor.CoprocessorHost;
@@ -118,6 +120,7 @@ import org.apache.hadoop.hbase.protobuf.
 import org.apache.hadoop.hbase.protobuf.RequestConverter;
 import org.apache.hadoop.hbase.protobuf.ResponseConverter;
 import org.apache.hadoop.hbase.protobuf.generated.AdminProtos;
+import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos;
 import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CloseRegionRequest;
 import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CloseRegionResponse;
 import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.CompactRegionRequest;
@@ -135,6 +138,7 @@ import org.apache.hadoop.hbase.protobuf.
 import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.MergeRegionsRequest;
 import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.MergeRegionsResponse;
 import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest;
+import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntry;
 import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionRequest.RegionOpenInfo;
 import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionResponse;
 import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.OpenRegionResponse.RegionOpeningState;
@@ -148,8 +152,8 @@ import org.apache.hadoop.hbase.protobuf.
 import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.StopServerResponse;
 import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesRequest;
 import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.UpdateFavoredNodesResponse;
-import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.WALEntry;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos;
+import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ActionResult;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileRequest.FamilyPath;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.BulkLoadHFileResponse;
@@ -166,9 +170,6 @@ import org.apache.hadoop.hbase.protobuf.
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutateResponse;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MutationProto.MutationType;
-import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionMutation;
-import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionMutationResult;
-import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrException;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanRequest;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ScanResponse;
 import org.apache.hadoop.hbase.protobuf.generated.ClusterStatusProtos;
@@ -184,6 +185,7 @@ import org.apache.hadoop.hbase.protobuf.
 import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStartupResponse;
 import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.RegionServerStatusService;
 import org.apache.hadoop.hbase.protobuf.generated.RegionServerStatusProtos.ReportRSFatalErrorRequest;
+import org.apache.hadoop.hbase.protobuf.generated.WALProtos.WALKey;
 import org.apache.hadoop.hbase.regionserver.HRegion.Operation;
 import org.apache.hadoop.hbase.regionserver.Leases.LeaseStillHeldException;
 import org.apache.hadoop.hbase.regionserver.compactions.CompactionProgress;
@@ -3303,115 +3305,108 @@ public class HRegionServer implements Cl
     // It is also the conduit via which we pass back data.
     PayloadCarryingRpcController controller = (PayloadCarryingRpcController)rpcc;
     CellScanner cellScanner = controller != null ? controller.cellScanner(): null;
+    // Clear scanner so we are not holding on to reference across call.
     if (controller != null) controller.setCellScanner(null);
     List<CellScannable> cellsToReturn = null;
-    MultiResponse.Builder responseBuilder = MultiResponse.newBuilder();
     try {
-      for (RegionMutation regionMutation: request.getRegionMutationList()) {
-        RegionMutationResult.Builder regionMutationResultBuilder = null;
-        HRegion region = getRegion(regionMutation.getRegion());
-        if (regionMutation.hasAtomic() && regionMutation.getAtomic()) {
+      HRegion region = getRegion(request.getRegion());
+      MultiResponse.Builder builder = MultiResponse.newBuilder();
+      List<MutationProto> mutations = new ArrayList<MutationProto>(request.getActionCount());
+      // Do a bunch of mutations atomically.  Mutations are Puts and Deletes.  NOT Gets.
+      if (request.hasAtomic() && request.getAtomic()) {
+        // MultiAction is union type.  Has a Get or a Mutate.
+        for (ClientProtos.MultiAction actionUnion : request.getActionList()) {
+          if (actionUnion.hasMutation()) {
+            mutations.add(actionUnion.getMutation());
+          } else {
+            throw new DoNotRetryIOException("Unsupported atomic action type: " + actionUnion);
+          }
+        }
+        // TODO: We are not updating a metric here.  Should we up requestCount?
+        if (!mutations.isEmpty()) mutateRows(region, mutations, cellScanner);
+      } else {
+        // Do a bunch of Actions.
+        ActionResult.Builder resultBuilder = null;
+        cellsToReturn = new ArrayList<CellScannable>(request.getActionCount());
+        for (ClientProtos.MultiAction actionUnion : request.getActionList()) {
           this.requestCount.increment();
-          mutateRows(region, regionMutation.getMutationList(), cellScanner);
-        } else {
-          regionMutationResultBuilder = RegionMutationResult.newBuilder();
-          cellsToReturn = doNonAtomicRegionMutation(region, regionMutation, cellScanner,
-            regionMutationResultBuilder, cellsToReturn);
-        }
-        // Have one regionmutationresult per regionmutation even if it is empty so we keep results
-        // aligned w/ how the requests came in.
-        responseBuilder.addRegionMutationResult(regionMutationResultBuilder == null?
-          RegionMutationResult.getDefaultInstance(): regionMutationResultBuilder.build());
+          ClientProtos.Result result = null;
+          try {
+            if (actionUnion.hasGet()) {
+              Get get = ProtobufUtil.toGet(actionUnion.getGet());
+              Result r = region.get(get);
+              if (r != null) {
+                // Get a result with no data.  The data will be carried alongside pbs, not as pbs.
+                result = ProtobufUtil.toResultNoData(r);
+                // Add the Result to controller so it gets serialized apart from pb.  Get
+                // Results could be big so good if they are not serialized as pb.
+                cellsToReturn.add(r);
+              }
+            } else if (actionUnion.hasMutation()) {
+              MutationProto mutation = actionUnion.getMutation();
+              MutationType type = mutation.getMutateType();
+              if (type != MutationType.PUT && type != MutationType.DELETE) {
+                if (!mutations.isEmpty()) {
+                  doBatchOp(builder, region, mutations, cellScanner);
+                  mutations.clear();
+                } else if (!region.getRegionInfo().isMetaTable()) {
+                  cacheFlusher.reclaimMemStoreMemory();
+                }
+              }
+              Result r = null;
+              switch (type) {
+              case APPEND:
+                r = append(region, mutation, cellScanner);
+                break;
+              case INCREMENT:
+                r = increment(region, mutation, cellScanner);
+                break;
+              case PUT:
+              case DELETE:
+                mutations.add(mutation);
+                break;
+              default:
+                throw new DoNotRetryIOException("Unsupported mutate type: " + type.name());
+              }
+              if (r != null) {
+                // Put the data into the cellsToReturn and the metadata about the result is all that
+                // we will pass back in the protobuf result.
+                result = ProtobufUtil.toResultNoData(r);
+                cellsToReturn.add(r);
+              }
+            } else {
+              LOG.warn("Error: invalid action: " + actionUnion + ". "
+                + "it must be a Get, Mutate, or Exec.");
+              throw new DoNotRetryIOException("Invalid action, "
+                + "it must be a Get, Mutate, or Exec.");
+            }
+            if (result != null) {
+              if (resultBuilder == null) {
+                resultBuilder = ActionResult.newBuilder();
+              } else {
+                resultBuilder.clear();
+              }
+              resultBuilder.setValue(result);
+              builder.addResult(resultBuilder.build());
+            }
+          } catch (IOException ie) {
+            builder.addResult(ResponseConverter.buildActionResult(ie));
+          }
+        }
+        if (!mutations.isEmpty()) {
+          doBatchOp(builder, region, mutations, cellScanner);
+        }
       }
       // Load the controller with the Cells to return.
       if (cellsToReturn != null && !cellsToReturn.isEmpty() && controller != null) {
         controller.setCellScanner(CellUtil.createCellScanner(cellsToReturn));
       }
-      return responseBuilder.build();
+      return builder.build();
     } catch (IOException ie) {
       throw new ServiceException(ie);
     }
   }
 
-  /**
-   * Run through the regionMutation <code>rm</code> and per Mutation, do the work, and then when
-   * done, add an instance of a {@link ResultOrException} that corresponds to each Mutation.
-   * @param region
-   * @param rm
-   * @param cellScanner
-   * @param builder
-   * @param cellsToReturn  Could be null. May be allocated in this method.  This is what this
-   * method returns as a 'result'.
-   * @return Return the <code>cellScanner</code> passed
-   */
-  private List<CellScannable> doNonAtomicRegionMutation(final HRegion region,
-      final RegionMutation rm, final CellScanner cellScanner,
-      final RegionMutationResult.Builder builder, List<CellScannable> cellsToReturn) {
-    // Gather up CONTIGUOUS Puts and Deletes in this mutations List.  Idea is that rather than do
-    // one at a time, we instead pass them in batch.  Be aware that the corresponding
-    // ResultOrException instance that matches each Put or Delete is then added down in the
-    // doBatchOp call.  We should be staying aligned though the Put and Delete are deferred/batched
-    List<MutationProto> mutations = null;
-    for (ClientProtos.MutationProto m: rm.getMutationList()) {
-      ClientProtos.ResultOrException resultOrException = null;
-      try {
-        Result r = null;
-        MutationType type = m.getMutateType();
-        if (type != MutationType.PUT && type != MutationType.DELETE && mutations != null &&
-            !mutations.isEmpty()) {
-          // Flush out any Puts or Deletes already collected.
-          doBatchOp(builder, region, mutations, cellScanner);
-          mutations.clear();
-        }
-        switch (type) {
-        case APPEND:
-          r = append(region, m, cellScanner);
-          break;
-        case INCREMENT:
-          r = increment(region, m, cellScanner);
-          break;
-        case PUT:
-        case DELETE:
-          // Collect the individual mutations and apply in a batch
-          if (mutations == null) mutations =
-            new ArrayList<MutationProto>(rm.getMutationCount());
-          mutations.add(m);
-          break;
-        default:
-          throw new DoNotRetryIOException("Unsupported mutate type: " + type.name());
-        }
-        if (r != null) {
-          ClientProtos.Result pbResult = null;
-          if (isClientCellBlockSupport()) {
-            pbResult = ProtobufUtil.toResultNoData(r);
-            //  Hard to guess the size here.  Just make a rough guess.
-            if (cellsToReturn == null) cellsToReturn = new ArrayList<CellScannable>(256);
-            cellsToReturn.add(r);
-          } else {
-            pbResult = ProtobufUtil.toResult(r);
-          }
-          resultOrException =
-            ClientProtos.ResultOrException.newBuilder().setResult(pbResult).build();
-        }
-        // Could get to here and there was no result and no exception.  Presumes we added
-        // a Put or Delete to the collecting Mutations List for adding later.  In this
-        // case the corresponding ResultOrException instance for the Put or Delete will be added
-        // down in the doBatchOp method call rather than up here.
-      } catch (IOException ie) {
-        resultOrException = ResultOrException.newBuilder().
-          setException(ResponseConverter.buildException(ie)).build();
-      }
-      if (resultOrException != null) {
-        builder.addResultOrException(resultOrException);
-      }
-    }
-    // Finish up any outstanding mutations
-    if (!mutations.isEmpty()) {
-      doBatchOp(builder, region, mutations, cellScanner);
-    }
-    return cellsToReturn;
-  }
-
 // End Client methods
 // Start Admin methods
 
@@ -3887,10 +3882,11 @@ public class HRegionServer implements Cl
     try {
       checkOpen();
       List<WALEntry> entries = request.getEntryList();
-      if (entries == null || entries.isEmpty()) {
+      if(entries == null || entries.isEmpty()) {
         // empty input
         return ReplicateWALEntryResponse.newBuilder().build();
       }
+      
       HRegion region = this.getRegionByEncodedName(
         entries.get(0).getKey().getEncodedRegionName().toStringUtf8());
       RegionCoprocessorHost coprocessorHost = region.getCoprocessorHost();
@@ -4071,13 +4067,15 @@ public class HRegionServer implements Cl
    * @param region
    * @param mutations
    */
-  protected void doBatchOp(final RegionMutationResult.Builder builder, final HRegion region,
+  protected void doBatchOp(final MultiResponse.Builder builder, final HRegion region,
       final List<MutationProto> mutations, final CellScanner cells) {
     Mutation[] mArray = new Mutation[mutations.size()];
     long before = EnvironmentEdgeManager.currentTimeMillis();
     boolean batchContainsPuts = false, batchContainsDelete = false;
-    ResultOrException resultOrException = null;
     try {
+      ActionResult.Builder resultBuilder = ActionResult.newBuilder();
+      resultBuilder.setValue(ClientProtos.Result.newBuilder().build());
+      ActionResult result = resultBuilder.build();
       int i = 0;
       for (MutationProto m : mutations) {
         Mutation mutation;
@@ -4089,6 +4087,7 @@ public class HRegionServer implements Cl
           batchContainsDelete = true;
         }
         mArray[i++] = mutation;
+        builder.addResult(result);
       }
 
       requestCount.add(mutations.size());
@@ -4100,21 +4099,21 @@ public class HRegionServer implements Cl
       for (i = 0; i < codes.length; i++) {
         switch (codes[i].getOperationStatusCode()) {
           case BAD_FAMILY:
-            resultOrException = ResponseConverter.buildActionResult(
+            result = ResponseConverter.buildActionResult(
                 new NoSuchColumnFamilyException(codes[i].getExceptionMsg()));
-            builder.setResultOrException(i, resultOrException);
+            builder.setResult(i, result);
             break;
 
           case SANITY_CHECK_FAILURE:
-            resultOrException = ResponseConverter.buildActionResult(
+            result = ResponseConverter.buildActionResult(
                 new FailedSanityCheckException(codes[i].getExceptionMsg()));
-            builder.setResultOrException(i, resultOrException);
+            builder.setResult(i, result);
             break;
 
           default:
-            resultOrException = ResponseConverter.buildActionResult(
+            result = ResponseConverter.buildActionResult(
                 new DoNotRetryIOException(codes[i].getExceptionMsg()));
-            builder.setResultOrException(i, resultOrException);
+            builder.setResult(i, result);
             break;
 
           case SUCCESS:
@@ -4122,9 +4121,9 @@ public class HRegionServer implements Cl
         }
       }
     } catch (IOException ie) {
-      resultOrException = ResponseConverter.buildActionResult(ie);
+      ActionResult result = ResponseConverter.buildActionResult(ie);
       for (int i = 0; i < mutations.size(); i++) {
-        builder.setResultOrException(i, resultOrException);
+        builder.setResult(i, result);
       }
     }
     long after = EnvironmentEdgeManager.currentTimeMillis();
@@ -4146,9 +4145,8 @@ public class HRegionServer implements Cl
    *         exceptionMessage if any
    * @throws IOException
    */
-  protected OperationStatus [] doBatchOp(final HRegion region,
-      final List<Pair<MutationType, Mutation>> mutations, boolean isReplay)
-  throws IOException {
+  protected OperationStatus[] doBatchOp(final HRegion region,
+      final List<Pair<MutationType, Mutation>> mutations, boolean isReplay) throws IOException {
     Mutation[] mArray = new Mutation[mutations.size()];
     long before = EnvironmentEdgeManager.currentTimeMillis();
     boolean batchContainsPuts = false, batchContainsDelete = false;

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALEditsReplaySink.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALEditsReplaySink.java?rev=1527789&r1=1527788&r2=1527789&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALEditsReplaySink.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/wal/WALEditsReplaySink.java Mon Sep 30 21:27:33 2013
@@ -33,14 +33,16 @@ import org.apache.hadoop.classification.
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.CellScanner;
 import org.apache.hadoop.hbase.KeyValue;
+import org.apache.hadoop.hbase.TableName;
+import org.apache.hadoop.hbase.DoNotRetryIOException;
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.HRegionInfo;
 import org.apache.hadoop.hbase.HRegionLocation;
-import org.apache.hadoop.hbase.TableName;
 import org.apache.hadoop.hbase.client.Action;
 import org.apache.hadoop.hbase.client.HConnection;
 import org.apache.hadoop.hbase.client.RegionServerCallable;
 import org.apache.hadoop.hbase.client.Row;
+import org.apache.hadoop.hbase.client.RpcRetryingCaller;
 import org.apache.hadoop.hbase.client.RpcRetryingCallerFactory;
 import org.apache.hadoop.hbase.ipc.PayloadCarryingRpcController;
 import org.apache.hadoop.hbase.protobuf.ProtobufUtil;
@@ -51,10 +53,10 @@ import org.apache.hadoop.hbase.protobuf.
 import org.apache.hadoop.hbase.protobuf.generated.HBaseProtos;
 import org.apache.hadoop.hbase.protobuf.generated.WALProtos;
 import org.apache.hadoop.hbase.protobuf.generated.AdminProtos.AdminService;
+import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ActionResult;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRequest;
 import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiResponse;
-import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.RegionMutationResult;
-import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.ResultOrException;
+import org.apache.hadoop.hbase.regionserver.NoSuchColumnFamilyException;
 import org.apache.hadoop.hbase.util.EnvironmentEdgeManager;
 import org.apache.hadoop.hbase.util.Pair;
 
@@ -116,7 +118,7 @@ public class WALEditsReplaySink {
     HRegionLocation loc = null;
     HLog.Entry entry = null;
     List<HLog.Entry> regionEntries = null;
-    // Build the action list.
+    // Build the action list. 
     for (int i = 0; i < batchSize; i++) {
       loc = entries.get(i).getFirst();
       entry = entries.get(i).getSecond();
@@ -128,7 +130,7 @@ public class WALEditsReplaySink {
       }
       regionEntries.add(entry);
     }
-
+    
     long startTime = EnvironmentEdgeManager.currentTimeMillis();
 
     // replaying edits by region
@@ -141,7 +143,7 @@ public class WALEditsReplaySink {
       for (; replayedActions < totalActions;) {
         curBatchSize = (totalActions > (MAX_BATCH_SIZE + replayedActions)) ? MAX_BATCH_SIZE
                 : (totalActions - replayedActions);
-        replayEdits(loc, curRegion, allActions.subList(replayedActions,
+        replayEdits(loc, curRegion, allActions.subList(replayedActions, 
           replayedActions + curBatchSize));
         replayedActions += curBatchSize;
       }
@@ -183,7 +185,7 @@ public class WALEditsReplaySink {
       }
     }
   }
-
+  
   /**
    * Callable that handles the <code>replay</code> method call going against a single regionserver
    * @param <R>
@@ -200,7 +202,7 @@ public class WALEditsReplaySink {
       this.regionInfo = regionInfo;
       setLocation(regionLoc);
     }
-
+    
     @Override
     public ReplicateWALEntryResponse call() throws IOException {
       try {

Modified: hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestQosFunction.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestQosFunction.java?rev=1527789&r1=1527788&r2=1527789&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestQosFunction.java (original)
+++ hbase/trunk/hbase-server/src/test/java/org/apache/hadoop/hbase/regionserver/TestQosFunction.java Mon Sep 30 21:27:33 2013
@@ -20,8 +20,8 @@ import static org.junit.Assert.assertEqu
 
 import org.apache.hadoop.hbase.HConstants;
 import org.apache.hadoop.hbase.SmallTests;
-import org.apache.hadoop.hbase.protobuf.generated.ClientProtos.MultiRequest;
 import org.apache.hadoop.hbase.protobuf.generated.RPCProtos.RequestHeader;
+import org.apache.hadoop.hbase.util.Pair;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
 import org.mockito.Mockito;
@@ -43,19 +43,11 @@ public class TestQosFunction {
     checkMethod("ReplicateWALEntry", HConstants.REPLICATION_QOS, qosFunction);
     // Set method name in pb style with the method name capitalized.
     checkMethod("OpenRegion", HConstants.HIGH_QOS, qosFunction);
-    // Check multi works.
-    checkMethod("Multi", HConstants.NORMAL_QOS, qosFunction, MultiRequest.getDefaultInstance());
   }
 
-  private void checkMethod(final String methodName, final int expected,
-      final AnnotationReadingPriorityFunction qosf) {
-    checkMethod(methodName, expected, qosf, null);
-  }
-
-  private void checkMethod(final String methodName, final int expected,
-      final AnnotationReadingPriorityFunction qosf, final Message param) {
+  private void checkMethod(final String methodName, final int expected, final AnnotationReadingPriorityFunction qosf) {
     RequestHeader.Builder builder = RequestHeader.newBuilder();
     builder.setMethodName(methodName);
-    assertEquals(methodName, expected, qosf.getPriority(builder.build(), param));
+    assertEquals(methodName, expected, qosf.getPriority(builder.build(), null));
   }
 }
\ No newline at end of file