svn commit: r1662811 - in /lucene/dev/branches/branch_5x/lucene/core/src: java/org/apache/lucene/search/LRUQueryCache.java test/org/apache/lucene/search/TestLRUQueryCache.java

[jp...@apache.org]

Author: jpountz
Date: Fri Feb 27 20:50:36 2015
New Revision: 1662811

URL: http://svn.apache.org/r1662811
Log:
LUCENE-6303: Fix compile errors on Java 7.

Modified:
    lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/LRUQueryCache.java
    lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java

Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/LRUQueryCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/LRUQueryCache.java?rev=1662811&r1=1662810&r2=1662811&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/LRUQueryCache.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/LRUQueryCache.java Fri Feb 27 20:50:36 2015
@@ -252,8 +252,9 @@ public class LRUQueryCache implements Qu
     query = query.clone();
     query.setBoost(1f);
     assert query == cacheKey(query);
-    Query singleton = uniqueQueries.putIfAbsent(query, query);
+    Query singleton = uniqueQueries.get(query);
     if (singleton == null) {
+      uniqueQueries.put(query, query);
       onQueryCache(singleton, LINKED_HASHTABLE_RAM_BYTES_PER_ENTRY + ramBytesUsed(query));
     } else {
       query = singleton;
@@ -514,8 +515,8 @@ public class LRUQueryCache implements Qu
 
     void putIfAbsent(Query query, DocIdSet set) {
       assert query == cacheKey(query);
-      if (cache.putIfAbsent(query, set) == null) {
-        // the set was actually put
+      if (cache.containsKey(query) == false) {
+        cache.put(query, set);
         onDocIdSetCache(HASHTABLE_RAM_BYTES_PER_ENTRY + set.ramBytesUsed());
       }
     }

Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java?rev=1662811&r1=1662810&r2=1662811&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestLRUQueryCache.java Fri Feb 27 20:50:36 2015
@@ -455,7 +455,11 @@ public class TestLRUQueryCache extends L
 
       @Override
       public void onUse(Query query) {
-        expectedCounts.put(query, 1 + expectedCounts.getOrDefault(query, 0));
+        if (expectedCounts.containsKey(query)) {
+          expectedCounts.put(query, 1 + expectedCounts.get(query));
+        } else {
+          expectedCounts.put(query, 1);
+        }
       }
     };
 
@@ -470,7 +474,11 @@ public class TestLRUQueryCache extends L
     for (int i = 0; i < 20; ++i) {
       final int idx = random().nextInt(queries.length);
       searcher.search(new ConstantScoreQuery(queries[idx]), 1);
-      actualCounts.put(queries[idx], 1 + actualCounts.getOrDefault(queries[idx], 0));
+      if (actualCounts.containsKey(queries[idx])) {
+        actualCounts.put(queries[idx], 1 + actualCounts.get(queries[idx]));
+      } else {
+        actualCounts.put(queries[idx], 1);
+      }
     }
 
     assertEquals(actualCounts, expectedCounts);