From 849343a66de4db2b1dbe8a5416b09b0f11aa6781 Mon Sep 17 00:00:00 2001
From: Elliott Clark <eclark@apache.org>
Date: Tue, 17 Mar 2015 10:07:27 -0700
Subject: [PATCH] HBASE-13265 Make thrift2 usable from c++

---
 .../apache/hadoop/hbase/thrift2/hbase.thrift  | 32 +++++++++----------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/hbase-thrift/src/main/resources/org/apache/hadoop/hbase/thrift2/hbase.thrift b/hbase-thrift/src/main/resources/org/apache/hadoop/hbase/thrift2/hbase.thrift
index 7c6d6a28e2e..bc790e70421 100644
--- a/hbase-thrift/src/main/resources/org/apache/hadoop/hbase/thrift2/hbase.thrift
+++ b/hbase-thrift/src/main/resources/org/apache/hadoop/hbase/thrift2/hbase.thrift
@@ -230,8 +230,8 @@ struct TScan {
  * Atomic mutation for the specified row. It can be either Put or Delete.
  */
 union TMutation {
-  1: optional TPut put,
-  2: optional TDelete deleteSingle,
+  1: TPut put,
+  2: TDelete deleteSingle,
 }
 
 /**
@@ -275,7 +275,7 @@ service THBaseService {
     1: required binary table,
 
     /** the TGet to check for */
-    2: required TGet get
+    2: required TGet tget
   ) throws (1:TIOError io)
 
   /**
@@ -291,7 +291,7 @@ service THBaseService {
     1: required binary table,
 
     /** the TGet to fetch */
-    2: required TGet get
+    2: required TGet tget
   ) throws (1: TIOError io)
 
   /**
@@ -310,7 +310,7 @@ service THBaseService {
     /** a list of TGets to fetch, the Result list
         will have the Results at corresponding positions
         or null if there was an error */
-    2: required list<TGet> gets
+    2: required list<TGet> tgets
   ) throws (1: TIOError io)
 
   /**
@@ -321,7 +321,7 @@ service THBaseService {
     1: required binary table,
 
     /** the TPut to put */
-    2: required TPut put
+    2: required TPut tput
   ) throws (1: TIOError io)
 
   /**
@@ -349,7 +349,7 @@ service THBaseService {
     5: binary value,
 
     /** the TPut to put if the check succeeds */
-    6: required TPut put
+    6: required TPut tput
   ) throws (1: TIOError io)
 
   /**
@@ -360,7 +360,7 @@ service THBaseService {
     1: required binary table,
 
     /** a list of TPuts to commit */
-    2: required list<TPut> puts
+    2: required list<TPut> tputs
   ) throws (1: TIOError io)
 
   /**
@@ -374,7 +374,7 @@ service THBaseService {
     1: required binary table,
 
     /** the TDelete to delete */
-    2: required TDelete deleteSingle
+    2: required TDelete tdelete
   ) throws (1: TIOError io)
 
   /**
@@ -389,7 +389,7 @@ service THBaseService {
     1: required binary table,
 
     /** list of TDeletes to delete */
-    2: required list<TDelete> deletes
+    2: required list<TDelete> tdeletes
   ) throws (1: TIOError io)
 
   /**
@@ -417,7 +417,7 @@ service THBaseService {
     5: binary value,
 
     /** the TDelete to execute if the check succeeds */
-    6: required TDelete deleteSingle
+    6: required TDelete tdelete
   ) throws (1: TIOError io)
 
   TResult increment(
@@ -425,7 +425,7 @@ service THBaseService {
     1: required binary table,
 
     /** the TIncrement to increment */
-    2: required TIncrement increment
+    2: required TIncrement tincrement
   ) throws (1: TIOError io)
 
   TResult append(
@@ -433,7 +433,7 @@ service THBaseService {
     1: required binary table,
 
     /** the TAppend to append */
-    2: required TAppend append
+    2: required TAppend tappend
   ) throws (1: TIOError io)
 
   /**
@@ -446,7 +446,7 @@ service THBaseService {
     1: required binary table,
 
     /** the scan object to get a Scanner for */
-    2: required TScan scan,
+    2: required TScan tscan,
   ) throws (1: TIOError io)
 
   /**
@@ -490,7 +490,7 @@ service THBaseService {
     1: required binary table,
 
     /** mutations to apply */
-    2: required TRowMutations rowMutations
+    2: required TRowMutations trowMutations
   ) throws (1: TIOError io)
 
   /**
@@ -504,7 +504,7 @@ service THBaseService {
     1: required binary table,
 
     /** the scan object to get a Scanner for */
-    2: required TScan scan,
+    2: required TScan tscan,
 
     /** number of rows to return */
     3: i32 numRows = 1