diff --git a/parquet-hadoop/pom.xml b/parquet-hadoop/pom.xml
index 33abcfd7db..3a1d49507c 100644
--- a/parquet-hadoop/pom.xml
+++ b/parquet-hadoop/pom.xml
@@ -61,6 +61,12 @@
jarcompile
+
+ org.mockito
+ mockito-all
+ 1.9.5
+ test
+
diff --git a/parquet-hadoop/src/main/java/parquet/hadoop/LruCache.java b/parquet-hadoop/src/main/java/parquet/hadoop/LruCache.java
new file mode 100644
index 0000000000..e9ecb37d2b
--- /dev/null
+++ b/parquet-hadoop/src/main/java/parquet/hadoop/LruCache.java
@@ -0,0 +1,181 @@
+package parquet.hadoop;
+
+import parquet.Log;
+
+import java.util.LinkedHashMap;
+import java.util.Map;
+
+/**
+ * A basic implementation of an LRU cache. Besides evicting the least recently
+ * used entries (either based on insertion or access order), this class also
+ * checks for "stale" entries as entries are inserted or retrieved (note
+ * "staleness" is defined by the entries themselves (see
+ * {@link parquet.hadoop.LruCache.Value}).
+ *
+ * @param The key type. Acts as the key in a {@link java.util.LinkedHashMap}
+ * @param The value type. Must extend {@link parquet.hadoop.LruCache.Value}
+ * so that the "staleness" of the value can be easily determined.
+ */
+final class LruCache> {
+ private static final Log LOG = Log.getLog(LruCache.class);
+
+ private static final float DEFAULT_LOAD_FACTOR = 0.75f;
+
+ private final LinkedHashMap cacheMap;
+
+ /**
+ * Constructs an access-order based LRU cache with {@code maxSize} entries.
+ * @param maxSize The maximum number of entries to store in the cache.
+ */
+ public LruCache(final int maxSize) {
+ this(maxSize, DEFAULT_LOAD_FACTOR, true);
+ }
+
+ /**
+ * Constructs an LRU cache.
+ *
+ * @param maxSize The maximum number of entries to store in the cache.
+ * @param loadFactor Used to determine the initial capacity.
+ * @param accessOrder the ordering mode - {@code true} for access-order,
+ * {@code false} for insertion-order
+ */
+ public LruCache(final int maxSize, final float loadFactor, final boolean accessOrder) {
+ int initialCapacity = Math.round(maxSize / loadFactor);
+ cacheMap =
+ new LinkedHashMap(initialCapacity, loadFactor, accessOrder) {
+ @Override
+ public boolean removeEldestEntry(final Map.Entry eldest) {
+ boolean result = size() > maxSize;
+ if (result) {
+ if (Log.DEBUG) {
+ LOG.debug("Removing eldest entry in cache: "
+ + eldest.getKey());
+ }
+ }
+ return result;
+ }
+ };
+ }
+
+ /**
+ * Removes the mapping for the specified key from this cache if present.
+ * @param key key whose mapping is to be removed from the cache
+ * @return the previous value associated with key, or null if there was no
+ * mapping for key.
+ */
+ public V remove(final K key) {
+ V oldValue = cacheMap.remove(key);
+ if (oldValue != null) {
+ if (Log.DEBUG) {
+ LOG.debug("Removed cache entry for '" + key + "'");
+ }
+ }
+ return oldValue;
+ }
+
+ /**
+ * Associates the specified value with the specified key in this cache. The
+ * value is only inserted if it is not null and it is considered current. If
+ * the cache previously contained a mapping for the key, the old value is
+ * replaced only if the new value is "newer" than the old one.
+ * @param key key with which the specified value is to be associated
+ * @param newValue value to be associated with the specified key
+ */
+ public void put(final K key, final V newValue) {
+ if (newValue == null || !newValue.isCurrent(key)) {
+ if (Log.WARN) {
+ LOG.warn("Ignoring new cache entry for '" + key + "' because it is "
+ + (newValue == null ? "null" : "not current"));
+ }
+ return;
+ }
+
+ V oldValue = cacheMap.get(key);
+ if (oldValue != null && oldValue.isNewerThan(newValue)) {
+ if (Log.WARN) {
+ LOG.warn("Ignoring new cache entry for '" + key + "' because "
+ + "existing cache entry is newer");
+ }
+ return;
+ }
+
+ // no existing value or new value is newer than old value
+ oldValue = cacheMap.put(key, newValue);
+ if (Log.DEBUG) {
+ if (oldValue == null) {
+ LOG.debug("Added new cache entry for '" + key + "'");
+ } else {
+ LOG.debug("Overwrote existing cache entry for '" + key + "'");
+ }
+ }
+ }
+
+ /**
+ * Removes all of the mappings from this cache. The cache will be empty
+ * after this call returns.
+ */
+ public void clear() {
+ cacheMap.clear();
+ }
+
+ /**
+ * Returns the value to which the specified key is mapped, or null if 1) the
+ * value is not current or 2) this cache contains no mapping for the key.
+ * @param key the key whose associated value is to be returned
+ * @return the value to which the specified key is mapped, or null if 1) the
+ * value is not current or 2) this cache contains no mapping for the key
+ */
+ public V getCurrentValue(final K key) {
+ V value = cacheMap.get(key);
+ if (Log.DEBUG) {
+ LOG.debug("Value for '" + key + "' " + (value == null ? "not " : "")
+ + "in cache");
+ }
+ if (value != null && !value.isCurrent(key)) {
+ // value is not current; remove it and return null
+ remove(key);
+ return null;
+ }
+
+ return value;
+ }
+
+ /**
+ * Returns the number of key-value mappings in this cache.
+ * @return the number of key-value mappings in this cache.
+ */
+ public int size() {
+ return cacheMap.size();
+ }
+
+ /**
+ * {@link parquet.hadoop.LruCache} expects all values to follow this
+ * interface so the cache can determine 1) whether values are current (e.g.
+ * the referenced data has not been modified/updated in such a way that the
+ * value is no longer useful) and 2) whether a value is strictly "newer"
+ * than another value.
+ *
+ * @param The key type.
+ * @param Provides a bound for the {@link #isNewerThan(V)} method
+ */
+ interface Value {
+ /**
+ * Is the value still current (e.g. has the referenced data been
+ * modified/updated in such a way that the value is no longer useful)
+ * @param key the key associated with this value
+ * @return {@code true} the value is still current, {@code false} the value
+ * is no longer useful
+ */
+ boolean isCurrent(K key);
+
+ /**
+ * Compares this value with the specified value to check for relative age.
+ * @param otherValue the value to be compared.
+ * @return {@code true} the value is strictly newer than the other value,
+ * {@code false} the value is older or just
+ * as new as the other value.
+ */
+ boolean isNewerThan(V otherValue);
+ }
+
+}
diff --git a/parquet-hadoop/src/main/java/parquet/hadoop/ParquetInputFormat.java b/parquet-hadoop/src/main/java/parquet/hadoop/ParquetInputFormat.java
index 6f6de317d8..021978dc06 100644
--- a/parquet-hadoop/src/main/java/parquet/hadoop/ParquetInputFormat.java
+++ b/parquet-hadoop/src/main/java/parquet/hadoop/ParquetInputFormat.java
@@ -18,9 +18,13 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.Collections;
import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
+import java.util.Set;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.BlockLocation;
@@ -77,8 +81,11 @@ public class ParquetInputFormat extends FileInputFormat {
*/
public static final String UNBOUND_RECORD_FILTER = "parquet.read.filter";
+ private static final int MIN_FOOTER_CACHE_SIZE = 100;
+
+ private LruCache footersCache;
+
private Class readSupportClass;
- private List