From 5f8741a69dd7ef67d3f1809d945b5e2dd504c2e0 Mon Sep 17 00:00:00 2001
From: sdong <siying.d@fb.com>
Date: Mon, 21 Mar 2016 11:46:57 -0700
Subject: [PATCH] Revert "Fix failing Java unit test."

This reverts commit d7ae42b0f89fd25d8aaed28703059889d145596e.

This is reverted as auto buld failure. This commit itself doesn't have any problem. Reverting as it depends on the commit to revert.
---
 .../org/rocksdb/BlockBasedTableConfig.java    | 33 ++-----------------
 1 file changed, 3 insertions(+), 30 deletions(-)

diff --git a/java/src/main/java/org/rocksdb/BlockBasedTableConfig.java b/java/src/main/java/org/rocksdb/BlockBasedTableConfig.java
index 050eff1c8..f569e6f42 100644
--- a/java/src/main/java/org/rocksdb/BlockBasedTableConfig.java
+++ b/java/src/main/java/org/rocksdb/BlockBasedTableConfig.java
@@ -21,7 +21,6 @@ public class BlockBasedTableConfig extends TableFormatConfig {
     wholeKeyFiltering_ = true;
     filter_ = null;
     cacheIndexAndFilterBlocks_ = false;
-    pinL0FilterAndIndexBlocksInCache_ = false;
     hashIndexAllowCollision_ = true;
     blockCacheCompressedSize_ = 0;
     blockCacheCompressedNumShardBits_ = 0;
@@ -227,29 +226,6 @@ public class BlockBasedTableConfig extends TableFormatConfig {
     return this;
   }
 
-  /**
-   * Indicating if we'd like to pin L0 index/filter blocks to the block cache.
-     If not specified, defaults to false.
-   *
-   * @return if L0 index and filter blocks should be pinned to the block cache.
-   */
-  public boolean pinL0FilterAndIndexBlocksInCache() {
-    return pinL0FilterAndIndexBlocksInCache_;
-  }
-
-  /**
-   * Indicating if we'd like to pin L0 index/filter blocks to the block cache.
-     If not specified, defaults to false.
-   *
-   * @param pinL0FilterAndIndexBlocksInCache pin blocks in block cache
-   * @return the reference to the current config.
-   */
-  public BlockBasedTableConfig setPinL0FilterAndIndexBlocksInCache(
-      final boolean pinL0FilterAndIndexBlocksInCache) {
-    pinL0FilterAndIndexBlocksInCache_ = pinL0FilterAndIndexBlocksInCache;
-    return this;
-  }
-
   /**
    * Influence the behavior when kHashSearch is used.
      if false, stores a precise prefix to block range mapping
@@ -417,7 +393,6 @@ public class BlockBasedTableConfig extends TableFormatConfig {
         blockCacheNumShardBits_, blockSize_, blockSizeDeviation_,
         blockRestartInterval_, wholeKeyFiltering_,
         filterHandle, cacheIndexAndFilterBlocks_,
-        pinL0FilterAndIndexBlocksInCache_,
         hashIndexAllowCollision_, blockCacheCompressedSize_,
         blockCacheCompressedNumShardBits_,
         checksumType_.getValue(), indexType_.getValue(),
@@ -428,13 +403,11 @@ public class BlockBasedTableConfig extends TableFormatConfig {
       boolean noBlockCache, long blockCacheSize, int blockCacheNumShardBits,
       long blockSize, int blockSizeDeviation, int blockRestartInterval,
       boolean wholeKeyFiltering, long filterPolicyHandle,
-      boolean cacheIndexAndFilterBlocks, boolean pinL0FilterAndIndexBlocksInCache,
-      boolean hashIndexAllowCollision, long blockCacheCompressedSize,
-      int blockCacheCompressedNumShardBits, byte checkSumType,
-      byte indexType, int formatVersion);
+      boolean cacheIndexAndFilterBlocks, boolean hashIndexAllowCollision,
+      long blockCacheCompressedSize, int blockCacheCompressedNumShardBits,
+      byte checkSumType, byte indexType, int formatVersion);
 
   private boolean cacheIndexAndFilterBlocks_;
-  private boolean pinL0FilterAndIndexBlocksInCache_;
   private IndexType indexType_;
   private boolean hashIndexAllowCollision_;
   private ChecksumType checksumType_;