HBASE-22323 Fixed broken Thrift generation

hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftHBaseServiceHandler.java

@@ -69,7 +69,7 @@
 import org.apache.hadoop.hbase.thrift.HBaseServiceHandler;
 import org.apache.hadoop.hbase.thrift2.generated.TAppend;
 import org.apache.hadoop.hbase.thrift2.generated.TColumnFamilyDescriptor;
-import org.apache.hadoop.hbase.thrift2.generated.TCompareOp;
+import org.apache.hadoop.hbase.thrift2.generated.TCompareOperator;
 import org.apache.hadoop.hbase.thrift2.generated.TDelete;
 import org.apache.hadoop.hbase.thrift2.generated.TGet;
 import org.apache.hadoop.hbase.thrift2.generated.THBaseService;
@@ -340,7 +340,8 @@ public List<TDelete> deleteMultiple(ByteBuffer table, List<TDelete> deletes) thr
 
   @Override
   public boolean checkAndMutate(ByteBuffer table, ByteBuffer row, ByteBuffer family,
-      ByteBuffer qualifier, TCompareOp compareOp, ByteBuffer value, TRowMutations rowMutations)
+      ByteBuffer qualifier, TCompareOperator compareOp, ByteBuffer value,
+      TRowMutations rowMutations)
           throws TIOError, TException {
     checkReadOnlyMode();
     try (final Table htable = getTable(table)) {

hbase-thrift/src/main/java/org/apache/hadoop/hbase/thrift2/ThriftUtilities.java

@@ -77,7 +77,7 @@
 import org.apache.hadoop.hbase.thrift2.generated.TColumnFamilyDescriptor;
 import org.apache.hadoop.hbase.thrift2.generated.TColumnIncrement;
 import org.apache.hadoop.hbase.thrift2.generated.TColumnValue;
-import org.apache.hadoop.hbase.thrift2.generated.TCompareOp;
+import org.apache.hadoop.hbase.thrift2.generated.TCompareOperator;
 import org.apache.hadoop.hbase.thrift2.generated.TCompressionAlgorithm;
 import org.apache.hadoop.hbase.thrift2.generated.TConsistency;
 import org.apache.hadoop.hbase.thrift2.generated.TDataBlockEncoding;
@@ -783,7 +783,7 @@ private static Durability durabilityFromThrift(TDurability tDurability) {
     }
   }
 
-  public static CompareOperator compareOpFromThrift(TCompareOp tCompareOp) {
+  public static CompareOperator compareOpFromThrift(TCompareOperator tCompareOp) {
     switch (tCompareOp.getValue()) {
       case 0: return CompareOperator.LESS;
       case 1: return CompareOperator.LESS_OR_EQUAL;
@@ -1432,15 +1432,15 @@ public static TRowMutations rowMutationsFromHBase(RowMutations in) {
     return tRowMutations;
   }
 
-  public static TCompareOp compareOpFromHBase(CompareOperator compareOp) {
+  public static TCompareOperator compareOpFromHBase(CompareOperator compareOp) {
     switch (compareOp) {
-      case LESS: return TCompareOp.LESS;
-      case LESS_OR_EQUAL: return TCompareOp.LESS_OR_EQUAL;
-      case EQUAL: return TCompareOp.EQUAL;
-      case NOT_EQUAL: return TCompareOp.NOT_EQUAL;
-      case GREATER_OR_EQUAL: return TCompareOp.GREATER_OR_EQUAL;
-      case GREATER: return TCompareOp.GREATER;
-      case NO_OP: return TCompareOp.NO_OP;
+      case LESS: return TCompareOperator.LESS;
+      case LESS_OR_EQUAL: return TCompareOperator.LESS_OR_EQUAL;
+      case EQUAL: return TCompareOperator.EQUAL;
+      case NOT_EQUAL: return TCompareOperator.NOT_EQUAL;
+      case GREATER_OR_EQUAL: return TCompareOperator.GREATER_OR_EQUAL;
+      case GREATER: return TCompareOperator.GREATER;
+      case NO_OP: return TCompareOperator.NO_OP;
       default: return null;
     }
   }