HBASE-22277 Removed deprecated methods from Get

apache · Apr 30, 2019 · 2c7fdb3 · 2c7fdb3
1 parent 70296a2
commit 2c7fdb3
Show file tree

Hide file tree

Showing 26 changed files with 144 additions and 200 deletions.
diff --git a/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java b/hbase-backup/src/main/java/org/apache/hadoop/hbase/backup/impl/BackupSystemTable.java
@@ -1405,7 +1405,7 @@ private Put createPutForBackupInfo(BackupInfo context) throws IOException {
   private Get createGetForBackupInfo(String backupId) throws IOException {
     Get get = new Get(rowkey(BACKUP_INFO_PREFIX, backupId));
     get.addFamily(BackupSystemTable.SESSIONS_FAMILY);
-    get.setMaxVersions(1);
+    get.readVersions(1);
     return get;
   }
 
@@ -1440,7 +1440,7 @@ private BackupInfo resultToBackupInfo(Result res) throws IOException {
   private Get createGetForStartCode(String rootPath) throws IOException {
     Get get = new Get(rowkey(START_CODE_ROW, rootPath));
     get.addFamily(BackupSystemTable.META_FAMILY);
-    get.setMaxVersions(1);
+    get.readVersions(1);
     return get;
   }
 
@@ -1463,7 +1463,7 @@ private Put createPutForStartCode(String startCode, String rootPath) {
   private Get createGetForIncrBackupTableSet(String backupRoot) throws IOException {
     Get get = new Get(rowkey(INCR_BACKUP_SET, backupRoot));
     get.addFamily(BackupSystemTable.META_FAMILY);
-    get.setMaxVersions(1);
+    get.readVersions(1);
     return get;
   }
 

diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/client/Get.java
@@ -59,7 +59,7 @@
  * {@link #setTimestamp(long) setTimestamp}.
  * <p>
  * To limit the number of versions of each column to be returned, execute
- * {@link #setMaxVersions(int) setMaxVersions}.
+ * {@link #readVersions(int) readVersions}.
  * <p>
  * To add a filter, call {@link #setFilter(Filter) setFilter}.
  */
@@ -160,26 +160,6 @@ public Get setCheckExistenceOnly(boolean checkExistenceOnly) {
     return this;
   }
 
-  /**
-   * This will always return the default value which is false as client cannot set the value to this
-   * property any more.
-   * @deprecated since 2.0.0 and will be removed in 3.0.0
-   */
-  @Deprecated
-  public boolean isClosestRowBefore() {
-    return closestRowBefore;
-  }
-
-  /**
-   * This is not used any more and does nothing. Use reverse scan instead.
-   * @deprecated since 2.0.0 and will be removed in 3.0.0
-   */
-  @Deprecated
-  public Get setClosestRowBefore(boolean closestRowBefore) {
-    // do Nothing
-    return this;
-  }
-
   /**
    * Get all columns from the specified family.
    * <p>
@@ -227,18 +207,6 @@ public Get setTimeRange(long minStamp, long maxStamp) throws IOException {
     return this;
   }
 
-  /**
-   * Get versions of columns with the specified timestamp.
-   * @param timestamp version timestamp
-   * @return this for invocation chaining
-   * @deprecated As of release 2.0.0, this will be removed in HBase 3.0.0.
-   *             Use {@link #setTimestamp(long)} instead
-   */
-  @Deprecated
-  public Get setTimeStamp(long timestamp) throws IOException {
-    return this.setTimestamp(timestamp);
-  }
-
   /**
    * Get versions of columns with the specified timestamp.
    * @param timestamp version timestamp
@@ -260,30 +228,6 @@ public Get setTimestamp(long timestamp) {
     return (Get) super.setColumnFamilyTimeRange(cf, minStamp, maxStamp);
   }
 
-  /**
-   * Get all available versions.
-   * @return this for invocation chaining
-   * @deprecated It is easy to misunderstand with column family's max versions, so use
-   *             {@link #readAllVersions()} instead.
-   */
-  @Deprecated
-  public Get setMaxVersions() {
-    return readAllVersions();
-  }
-
-  /**
-   * Get up to the specified number of versions of each column.
-   * @param maxVersions maximum versions for each column
-   * @throws IOException if invalid number of versions
-   * @return this for invocation chaining
-   * @deprecated It is easy to misunderstand with column family's max versions, so use
-   *             {@link #readVersions(int)} instead.
-   */
-  @Deprecated
-  public Get setMaxVersions(int maxVersions) throws IOException {
-    return readVersions(maxVersions);
-  }
-
   /**
    * Get all available versions.
    * @return this for invocation chaining

diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/protobuf/ProtobufUtil.java
@@ -381,7 +381,7 @@ public static Get toGet(final ClientProtos.Get proto) throws IOException {
       get.setCacheBlocks(proto.getCacheBlocks());
     }
     if (proto.hasMaxVersions()) {
-      get.setMaxVersions(proto.getMaxVersions());
+      get.readVersions(proto.getMaxVersions());
     }
     if (proto.hasStoreLimit()) {
       get.setMaxResultsPerColumnFamily(proto.getStoreLimit());

diff --git a/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java b/hbase-client/src/main/java/org/apache/hadoop/hbase/shaded/protobuf/ProtobufUtil.java
@@ -524,7 +524,7 @@ public static Get toGet(final ClientProtos.Get proto) throws IOException {
       get.setCacheBlocks(proto.getCacheBlocks());
     }
     if (proto.hasMaxVersions()) {
-      get.setMaxVersions(proto.getMaxVersions());
+      get.readVersions(proto.getMaxVersions());
     }
     if (proto.hasStoreLimit()) {
       get.setMaxResultsPerColumnFamily(proto.getStoreLimit());

diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestGet.java
@@ -175,7 +175,7 @@ public void TestGetRowFromGetCopyConstructor() throws Exception {
     get.setIsolationLevel(IsolationLevel.READ_UNCOMMITTED);
     get.setCheckExistenceOnly(true);
     get.setTimeRange(3, 4);
-    get.setMaxVersions(11);
+    get.readVersions(11);
     get.setMaxResultsPerColumnFamily(10);
     get.setRowOffsetPerColumnFamily(11);
     get.setCacheBlocks(true);

diff --git a/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java b/hbase-client/src/test/java/org/apache/hadoop/hbase/client/TestScan.java
@@ -78,7 +78,7 @@ public void testGetToScan() throws Exception {
             .setIsolationLevel(IsolationLevel.READ_COMMITTED)
             .setLoadColumnFamiliesOnDemand(false)
             .setMaxResultsPerColumnFamily(1000)
-            .setMaxVersions(9999)
+            .readVersions(9999)
             .setRowOffsetPerColumnFamily(5)
             .setTimeRange(0, 13)
             .setAttribute("att_v0", Bytes.toBytes("att_v0"))

diff --git a/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java b/hbase-mapreduce/src/test/java/org/apache/hadoop/hbase/mapreduce/TestImportExport.java
@@ -228,11 +228,11 @@ public void testSimpleCase() throws Throwable {
       assertTrue(runImport(args));
 
       Get g = new Get(ROW1);
-      g.setMaxVersions();
+      g.readAllVersions();
       Result r = t.get(g);
       assertEquals(3, r.size());
       g = new Get(ROW2);
-      g.setMaxVersions();
+      g.readAllVersions();
       r = t.get(g);
       assertEquals(3, r.size());
       g = new Get(ROW3);

diff --git a/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RowResultGenerator.java b/hbase-rest/src/main/java/org/apache/hadoop/hbase/rest/RowResultGenerator.java
@@ -62,7 +62,7 @@ public RowResultGenerator(final String tableName, final RowSpec rowspec,
         }
       }
       get.setTimeRange(rowspec.getStartTime(), rowspec.getEndTime());
-      get.setMaxVersions(rowspec.getMaxVersions());
+      get.readVersions(rowspec.getMaxVersions());
       if (filter != null) {
         get.setFilter(filter);
       }

diff --git a/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java b/hbase-rest/src/test/java/org/apache/hadoop/hbase/rest/client/TestRemoteTable.java
@@ -249,7 +249,7 @@ public void testGet() throws IOException {
 
     get = new Get(ROW_2);
     get.addFamily(COLUMN_1);
-    get.setMaxVersions(2);
+    get.readVersions(2);
     result = remoteTable.get(get);
     int count = 0;
     for (Cell kv: result.listCells()) {
@@ -279,7 +279,7 @@ public void testMultiGet() throws Exception {
     //Test Versions
     gets = new ArrayList<>(2);
     Get g = new Get(ROW_1);
-    g.setMaxVersions(3);
+    g.readVersions(3);
     gets.add(g);
     gets.add(new Get(ROW_2));
     results = remoteTable.get(gets);

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/HRegion.java
@@ -3087,7 +3087,7 @@ public void prepareDeleteTimestamps(Mutation mutation, Map<byte[], List<Cell>> f
           count = kvCount.get(qual);
 
           Get get = new Get(CellUtil.cloneRow(cell));
-          get.setMaxVersions(count);
+          get.readVersions(count);
           get.addColumn(family, qual);
           if (coprocessorHost != null) {
             if (!coprocessorHost.prePrepareTimeStampForDeleteVersion(mutation, cell,

diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/security/access/AccessController.java
@@ -466,9 +466,9 @@ private boolean checkCoveringPermission(User user, OpType request, RegionCoproce
     // version delete just consider only one version for those column cells.
     boolean considerCellTs  = (request == OpType.PUT || request == OpType.DELETE);
     if (considerCellTs) {
-      get.setMaxVersions();
+      get.readAllVersions();
     } else {
-      get.setMaxVersions(1);
+      get.readVersions(1);
     }
     boolean diffCellTsFromOpTs = false;
     for (Map.Entry<byte[], ? extends Collection<?>> entry: familyMap.entrySet()) {
@@ -527,7 +527,7 @@ private boolean checkCoveringPermission(User user, OpType request, RegionCoproce
     // where columns are added with TS other than the Mutation TS. But normally this wont be the
     // case with Put. There no need to get all versions but get latest version only.
     if (!diffCellTsFromOpTs && request == OpType.PUT) {
-      get.setMaxVersions(1);
+      get.readVersions(1);
     }
     if (LOG.isTraceEnabled()) {
       LOG.trace("Scanning for cells with " + get);

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestMultiVersions.java
@@ -171,7 +171,7 @@ public void testGetRowVersions() throws Exception {
     assertTrue(Bytes.equals(value, value2));
     // Now check getRow with multiple versions
     get = new Get(row);
-    get.setMaxVersions();
+    get.readAllVersions();
     r = table.get(get);
     assertTrue(r.size() == 2);
     value = r.getValue(contents, contents);

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSerialization.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TestSerialization.java
@@ -300,7 +300,7 @@ private HRegionInfo createRandomRegion(final String name) {
     Get get = new Get(row);
     get.addColumn(fam, qf1);
     get.setTimeRange(ts, ts+1);
-    get.setMaxVersions(maxVersions);
+    get.readVersions(maxVersions);
 
     ClientProtos.Get getProto = ProtobufUtil.toGet(get);
     Get desGet = ProtobufUtil.toGet(getProto);

diff --git a/hbase-server/src/test/java/org/apache/hadoop/hbase/TimestampTestBase.java b/hbase-server/src/test/java/org/apache/hadoop/hbase/TimestampTestBase.java
@@ -108,7 +108,7 @@ private static void assertOnlyLatest(final Table incommon, final long currentTim
     Get get = null;
     get = new Get(ROW);
     get.addColumn(FAMILY_NAME, QUALIFIER_NAME);
-    get.setMaxVersions(3);
+    get.readVersions(3);
     Result result = incommon.get(get);
     Assert.assertEquals(1, result.size());
     long time = Bytes.toLong(CellUtil.cloneValue(result.rawCells()[0]));
@@ -138,7 +138,7 @@ public static void assertVersions(final Table incommon, final long [] tss)
     // order.
     get = new Get(ROW);
     get.addColumn(FAMILY_NAME, QUALIFIER_NAME);
-    get.setMaxVersions(tss.length);
+    get.readVersions(tss.length);
     Result result = incommon.get(get);
     Cell [] kvs = result.rawCells();
     Assert.assertEquals(kvs.length, tss.length);
@@ -154,7 +154,7 @@ public static void assertVersions(final Table incommon, final long [] tss)
     get = new Get(ROW);
     get.addColumn(FAMILY_NAME, QUALIFIER_NAME);
     get.setTimeRange(0, maxStamp);
-    get.setMaxVersions(kvs.length - 1);
+    get.readVersions(kvs.length - 1);
     result = incommon.get(get);
     kvs = result.rawCells();
     Assert.assertEquals(kvs.length, tss.length - 1);