comments and whitespaces

Author: stoty

hbase-client/src/main/java/org/apache/omid/transaction/TTable.java

@@ -368,6 +368,7 @@ static public Put markPutAsCommitted(Put put, long timestamp, long commitTimesta
         Map<byte[], List<Cell>> kvs = put.getFamilyCellMap();
         for (List<Cell> kvl : kvs.values()) {
             for (Cell c : kvl) {
+                //Cast needed for HBase 3+
                 KeyValue kv = KeyValueUtil.ensureKeyValue((ExtendedCell)c);
                 Bytes.putLong(kv.getValueArray(), kv.getTimestampOffset(), timestamp);
                 try {
@@ -417,6 +418,7 @@ private Put putInternal(Transaction tx, Put put, boolean addShadowCell) throws I
                 // Reach into keyvalue to update timestamp.
                 // It's not nice to reach into keyvalue internals,
                 // but we want to avoid having to copy the whole thing
+                // Cast needed for HBase 3+
                 KeyValue kv = KeyValueUtil.ensureKeyValue((ExtendedCell)c);
                 Bytes.putLong(kv.getValueArray(), kv.getTimestampOffset(), writeTimestamp);
                 tsput.add(kv);

hbase-common/pom.xml

@@ -45,7 +45,6 @@
             <version>2.5.0</version>
         </dependency>
 
-
         <dependency>
             <groupId>com.google.inject</groupId>
             <artifactId>guice</artifactId>

hbase-common/src/main/java/org/apache/omid/transaction/CellUtils.java

@@ -338,6 +338,7 @@ public static SortedMap<Cell, Optional<Cell>> mapCellsToShadowCells(List<Cell> c
                         // TODO: Should we check also here the MVCC and swap if its greater???
                         // Values are the same, ignore
                     } else {
+                        //Casts needed for HBase 3+
                         if (((ExtendedCell)cell).getSequenceId() > ((ExtendedCell)storedCell).getSequenceId()) { // Swap values
                             Optional<Cell> previousValue = cellToShadowCellMap.remove(storedCell);
                             Preconditions.checkNotNull(previousValue, "Should contain an Optional<Cell> value");

hbase-coprocessor/src/main/java/org/apache/hadoop/hbase/coprocessor/BaseRegionObserver.java

@@ -28,6 +28,7 @@
 
 public abstract class BaseRegionObserver implements RegionObserver, RegionCoprocessor {
     @Override
+    // No generics to work around API change in HBase 3+
     public InternalScanner preCompact(ObserverContext c,
                                       Store store,
                                       InternalScanner scanner,

hbase-coprocessor/src/main/java/org/apache/hadoop/hbase/regionserver/CompactorScanner.java

@@ -72,7 +72,7 @@ public CompactorScanner(ObserverContext c,
                             Client commitTableClient,
                             boolean isMajorCompaction,
                             boolean preserveNonTransactionallyDeletedCells) throws IOException {
-      RegionCoprocessorEnvironment env = (RegionCoprocessorEnvironment)c.getEnvironment();
+        RegionCoprocessorEnvironment env = (RegionCoprocessorEnvironment)c.getEnvironment();
         this.internalScanner = internalScanner;
         this.commitTableClient = commitTableClient;
         this.isMajorCompaction = isMajorCompaction;
@@ -86,17 +86,20 @@ public CompactorScanner(ObserverContext c,
     }
 
     @Override
+    // No generics to work around API change in HBase 3+
     public boolean next(List results) throws IOException {
         return next(results, -1);
     }
 
     @Override
+    // No generics to work around API change in HBase 3+
     public boolean next(List result, ScannerContext scannerContext) throws IOException {
         int limit = scannerContext.getBatchLimit();
         return next(result, limit);
     }
 
-protected boolean next(List result, int limit) throws IOException {
+    // No generics to work around API change in HBase 3+
+    protected boolean next(List result, int limit) throws IOException {
 
         if (currentRowWorthValues.isEmpty()) {
             // 1) Read next row

hbase-coprocessor/src/main/java/org/apache/omid/transaction/CellSkipFilter.java

@@ -29,7 +29,6 @@
 import java.lang.invoke.MethodHandle;
 import java.lang.invoke.MethodHandles;
 import java.lang.invoke.MethodType;
-import java.lang.reflect.Method;
 import java.util.List;
 
 /**
@@ -41,9 +40,9 @@
  */
 
 public class CellSkipFilter extends FilterBase {
-    
+
     private static final Logger LOG = LoggerFactory.getLogger(CellSkipFilter.class);
-    
+
     private final Filter filter;
     // remember the previous cell processed by filter when the return code was NEXT_COL or INCLUDE_AND_NEXT_COL
     private Cell skipColumn = null;
@@ -84,7 +83,7 @@ private boolean skipCellVersion(Cell cell) {
     /**
      * This deprecated method is implemented for backwards compatibility reasons.
      * use {@link CellSkipFilter#filterKeyValue(Cell)}
-     * 
+     *
      * No @Override because HBase 3 completely removes this method
      */
     public ReturnCode filterKeyValue(Cell cell) throws IOException {
@@ -128,7 +127,7 @@ public void reset() throws IOException {
     /**
      * This deprecated method is implemented for backwards compatibility reasons.
      * use {@link CellSkipFilter#filterRowKey(Cell)}
-     * 
+     *
      * No @Override so that this compiles with HBase 3
      */
     public boolean filterRowKey(byte[] buffer, int offset, int length) throws IOException {

hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidCompactor.java

@@ -111,6 +111,7 @@ public void stop(CoprocessorEnvironment e) throws IOException {
 
 
     @Override
+   // No generics to work around API change in HBase 3+
     public InternalScanner preCompact(ObserverContext c,
                                       Store store,
                                       InternalScanner scanner,

hbase-coprocessor/src/main/java/org/apache/omid/transaction/OmidSnapshotFilter.java

@@ -99,6 +99,7 @@ public void stop(CoprocessorEnvironment e) throws IOException {
     }
 
     @Override
+    // No generics to work around API change in HBase 3+
     public void postGetOp(ObserverContext e, Get get, List results) {
         SnapshotFilterImpl snapshotFilter = snapshotFilterMap.get(get);
         if (snapshotFilter != null) {
@@ -108,6 +109,7 @@ public void postGetOp(ObserverContext e, Get get, List results) {
 
 
     @Override
+    // No generics to work around API change in HBase 3+
     public void preGetOp(ObserverContext e, Get get, List results)
             throws IOException {
 
@@ -136,6 +138,7 @@ private SnapshotFilterImpl getSnapshotFilter(ObserverContext<RegionCoprocessorEn
     }
 
     @Override
+    // No generics to work around API change in HBase 3+
     public void preScannerOpen(ObserverContext e,
                                Scan scan) throws IOException {
         byte[] byteTransaction = scan.getAttribute(CellUtils.TRANSACTION_ATTRIBUTE);

hbase-coprocessor/src/main/java/org/apache/omid/transaction/TransactionVisibilityFilter.java

@@ -100,7 +100,7 @@ public TransactionVisibilityFilter(Filter cellFilter,
     /**
      * This deprecated method is implemented for backwards compatibility reasons.
      * use {@link TransactionVisibilityFilter#filterCell(Cell)}
-     * 
+     *
      * No @Override so that it compiles with HBase 3.x
     */
     public ReturnCode filterKeyValue(Cell cell) throws IOException {
@@ -238,10 +238,10 @@ public boolean filterRow() throws IOException {
         return super.filterRow();
     }
 
-    /** 
+    /**
      * This deprecated method is implemented for backwards compatibility reasons.
      * use {@link TransactionVisibilityFilter#filterRowKey(Cell)}
-     * 
+     *
      * No @Override so that it compiles with HBase 3.x
      */
     public boolean filterRowKey(byte[] buffer, int offset, int length) throws IOException {