svn commit: r1444998 - /hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactSelection.java

[ec...@apache.org]

Author: eclark
Date: Mon Feb 11 23:53:29 2013
New Revision: 1444998

URL: http://svn.apache.org/r1444998
Log:
HBASE-7821 Remove Duplicated code in CompactSelection

Modified:
    hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactSelection.java

Modified: hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactSelection.java
URL: http://svn.apache.org/viewvc/hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactSelection.java?rev=1444998&r1=1444997&r2=1444998&view=diff
==============================================================================
--- hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactSelection.java (original)
+++ hbase/trunk/hbase-server/src/main/java/org/apache/hadoop/hbase/regionserver/compactions/CompactSelection.java Mon Feb 11 23:53:29 2013
@@ -58,43 +58,6 @@ public class CompactSelection {
   }
 
   /**
-   * Select the expired store files to compact
-   * 
-   * @param maxExpiredTimeStamp
-   *          The store file will be marked as expired if its max time stamp is
-   *          less than this maxExpiredTimeStamp.
-   * @return A CompactSelection contains the expired store files as
-   *         filesToCompact
-   */
-  public CompactSelection selectExpiredStoreFilesToCompact(
-      long maxExpiredTimeStamp) {
-    if (filesToCompact == null || filesToCompact.size() == 0)
-      return null;
-    ArrayList<StoreFile> expiredStoreFiles = null;
-    boolean hasExpiredStoreFiles = false;
-    CompactSelection expiredSFSelection = null;
-
-    for (StoreFile storeFile : this.filesToCompact) {
-      if (storeFile.getReader().getMaxTimestamp() < maxExpiredTimeStamp) {
-        LOG.info("Deleting the expired store file by compaction: "
-            + storeFile.getPath() + " whose maxTimeStamp is "
-            + storeFile.getReader().getMaxTimestamp()
-            + " while the max expired timestamp is " + maxExpiredTimeStamp);
-        if (!hasExpiredStoreFiles) {
-          expiredStoreFiles = new ArrayList<StoreFile>();
-          hasExpiredStoreFiles = true;
-        }
-        expiredStoreFiles.add(storeFile);
-      }
-    }
-
-    if (hasExpiredStoreFiles) {
-      expiredSFSelection = new CompactSelection(expiredStoreFiles);
-    }
-    return expiredSFSelection;
-  }
-
-  /**
    * The current compaction finished, so reset the off peak compactions count
    * if this was an off peak compaction.
    */
@@ -163,10 +126,6 @@ public class CompactSelection {
     return selectionTime;
   }
 
-  public CompactSelection subList(int start, int end) {
-    throw new UnsupportedOperationException();
-  }
-
   public CompactSelection getSubList(int start, int end) {
     filesToCompact = filesToCompact.subList(start, end);
     return this;
@@ -175,8 +134,4 @@ public class CompactSelection {
   public void clearSubList(int start, int end) {
     filesToCompact.subList(start, end).clear();
   }
-
-  private boolean isValidHour(int hour) {
-    return (hour >= 0 && hour <= 23);
-  }
 }