From 6e2dd9a5677526ef2081f30812865488c97586f3 Mon Sep 17 00:00:00 2001
From: Yonik Seeley <yonik@apache.org>
Date: Sat, 19 Sep 2009 00:34:01 +0000
Subject: [PATCH] lucene 2.9 rc5 update

git-svn-id: https://svn.apache.org/repos/asf/lucene/solr/trunk@816834 13f79535-47bb-0310-9956-ffa450edef68
---
 CHANGES.txt                                          | 2 +-
 lib/lucene-analyzers-2.9.0-rc4.jar                   | 2 --
 lib/lucene-analyzers-2.9.0-rc5.jar                   | 2 ++
 lib/lucene-core-2.9.0-rc4.jar                        | 2 --
 lib/lucene-core-2.9.0-rc5.jar                        | 2 ++
 lib/lucene-highlighter-2.9.0-rc4.jar                 | 2 --
 lib/lucene-highlighter-2.9.0-rc5.jar                 | 2 ++
 lib/lucene-memory-2.9.0-rc4.jar                      | 2 --
 lib/lucene-memory-2.9.0-rc5.jar                      | 2 ++
 lib/lucene-misc-2.9.0-rc4.jar                        | 2 --
 lib/lucene-misc-2.9.0-rc5.jar                        | 2 ++
 lib/lucene-queries-2.9.0-rc4.jar                     | 2 --
 lib/lucene-queries-2.9.0-rc5.jar                     | 2 ++
 lib/lucene-snowball-2.9.0-rc4.jar                    | 2 --
 lib/lucene-snowball-2.9.0-rc5.jar                    | 2 ++
 lib/lucene-spellchecker-2.9.0-rc4.jar                | 2 --
 lib/lucene-spellchecker-2.9.0-rc5.jar                | 2 ++
 src/java/org/apache/solr/search/DocSet.java          | 6 ++++++
 src/java/org/apache/solr/search/SortedIntDocSet.java | 6 ++++++
 19 files changed, 29 insertions(+), 17 deletions(-)
 delete mode 100644 lib/lucene-analyzers-2.9.0-rc4.jar
 create mode 100644 lib/lucene-analyzers-2.9.0-rc5.jar
 delete mode 100644 lib/lucene-core-2.9.0-rc4.jar
 create mode 100644 lib/lucene-core-2.9.0-rc5.jar
 delete mode 100644 lib/lucene-highlighter-2.9.0-rc4.jar
 create mode 100644 lib/lucene-highlighter-2.9.0-rc5.jar
 delete mode 100644 lib/lucene-memory-2.9.0-rc4.jar
 create mode 100644 lib/lucene-memory-2.9.0-rc5.jar
 delete mode 100644 lib/lucene-misc-2.9.0-rc4.jar
 create mode 100644 lib/lucene-misc-2.9.0-rc5.jar
 delete mode 100644 lib/lucene-queries-2.9.0-rc4.jar
 create mode 100644 lib/lucene-queries-2.9.0-rc5.jar
 delete mode 100644 lib/lucene-snowball-2.9.0-rc4.jar
 create mode 100644 lib/lucene-snowball-2.9.0-rc5.jar
 delete mode 100644 lib/lucene-spellchecker-2.9.0-rc4.jar
 create mode 100644 lib/lucene-spellchecker-2.9.0-rc5.jar

diff --git a/CHANGES.txt b/CHANGES.txt
index 875d92056ad..ef76bbee2dc 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -61,7 +61,7 @@ error.  See SOLR-1410 for more information.
 
 Versions of Major Components
 ----------------------------
-Apache Lucene 2.9.0-rc4
+Apache Lucene 2.9.0-rc5
 Apache Tika 0.4
 
 Detailed Change List
diff --git a/lib/lucene-analyzers-2.9.0-rc4.jar b/lib/lucene-analyzers-2.9.0-rc4.jar
deleted file mode 100644
index 4ed79a941b0..00000000000
--- a/lib/lucene-analyzers-2.9.0-rc4.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[7e82651f766ce279d83edc96c96200978fce078c] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-analyzers-2.9.0-rc5.jar b/lib/lucene-analyzers-2.9.0-rc5.jar
new file mode 100644
index 00000000000..5a117aef013
--- /dev/null
+++ b/lib/lucene-analyzers-2.9.0-rc5.jar
@@ -0,0 +1,2 @@
+AnyObjectId[6c2723ccb7c16ef050941014049c1a6e14b39ba5] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-core-2.9.0-rc4.jar b/lib/lucene-core-2.9.0-rc4.jar
deleted file mode 100644
index b7455a6690c..00000000000
--- a/lib/lucene-core-2.9.0-rc4.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[4f21b9c67bbb00a5e332ecaf9cb5968300d0ecb3] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-core-2.9.0-rc5.jar b/lib/lucene-core-2.9.0-rc5.jar
new file mode 100644
index 00000000000..1e0c92e4a8c
--- /dev/null
+++ b/lib/lucene-core-2.9.0-rc5.jar
@@ -0,0 +1,2 @@
+AnyObjectId[db6f65a2815103ac9538b406100392c9e0fc1af9] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-highlighter-2.9.0-rc4.jar b/lib/lucene-highlighter-2.9.0-rc4.jar
deleted file mode 100644
index e2693728a44..00000000000
--- a/lib/lucene-highlighter-2.9.0-rc4.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[d0606e9c160a35f0bbe6d5871c23e7991dcfaf1b] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-highlighter-2.9.0-rc5.jar b/lib/lucene-highlighter-2.9.0-rc5.jar
new file mode 100644
index 00000000000..672acfc659e
--- /dev/null
+++ b/lib/lucene-highlighter-2.9.0-rc5.jar
@@ -0,0 +1,2 @@
+AnyObjectId[74320de7292411db06e6714fe9c8a4e37fbb33f8] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-memory-2.9.0-rc4.jar b/lib/lucene-memory-2.9.0-rc4.jar
deleted file mode 100644
index 2b9f88caea4..00000000000
--- a/lib/lucene-memory-2.9.0-rc4.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[ad5d1cef3f06cbd38b5a0db2446cfd6ea2f182c7] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-memory-2.9.0-rc5.jar b/lib/lucene-memory-2.9.0-rc5.jar
new file mode 100644
index 00000000000..89adc054cdb
--- /dev/null
+++ b/lib/lucene-memory-2.9.0-rc5.jar
@@ -0,0 +1,2 @@
+AnyObjectId[db67ede8cfa091524c60001c1ec90c4daaec0647] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-misc-2.9.0-rc4.jar b/lib/lucene-misc-2.9.0-rc4.jar
deleted file mode 100644
index 59d8c088e99..00000000000
--- a/lib/lucene-misc-2.9.0-rc4.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[5ca889e15b9903526a52c0cba45a0668e7cfc42d] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-misc-2.9.0-rc5.jar b/lib/lucene-misc-2.9.0-rc5.jar
new file mode 100644
index 00000000000..f10ec9e28e6
--- /dev/null
+++ b/lib/lucene-misc-2.9.0-rc5.jar
@@ -0,0 +1,2 @@
+AnyObjectId[a2f1839f6012dc462af70266cf8dc9b7c7ccc7e9] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-queries-2.9.0-rc4.jar b/lib/lucene-queries-2.9.0-rc4.jar
deleted file mode 100644
index 910ef73dcda..00000000000
--- a/lib/lucene-queries-2.9.0-rc4.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[ff5ea89c5469b26920f8fee7f389cd02c36e1ac0] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-queries-2.9.0-rc5.jar b/lib/lucene-queries-2.9.0-rc5.jar
new file mode 100644
index 00000000000..b765ba306cf
--- /dev/null
+++ b/lib/lucene-queries-2.9.0-rc5.jar
@@ -0,0 +1,2 @@
+AnyObjectId[096dc792fd71d014cc4c0b03f507ca2b2c497764] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-snowball-2.9.0-rc4.jar b/lib/lucene-snowball-2.9.0-rc4.jar
deleted file mode 100644
index 410b6be29f6..00000000000
--- a/lib/lucene-snowball-2.9.0-rc4.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[87e15434de770a51f3af2bf4ee0b09beb8620569] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-snowball-2.9.0-rc5.jar b/lib/lucene-snowball-2.9.0-rc5.jar
new file mode 100644
index 00000000000..ef0fe2eb963
--- /dev/null
+++ b/lib/lucene-snowball-2.9.0-rc5.jar
@@ -0,0 +1,2 @@
+AnyObjectId[c6dd6e7a276e02f76fffe59993275e2d81763314] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-spellchecker-2.9.0-rc4.jar b/lib/lucene-spellchecker-2.9.0-rc4.jar
deleted file mode 100644
index f1dcb60283e..00000000000
--- a/lib/lucene-spellchecker-2.9.0-rc4.jar
+++ /dev/null
@@ -1,2 +0,0 @@
-AnyObjectId[4e889dee2dc5dde3ce82014140f64f5090cda845] was removed in git history.
-Apache SVN contains full history.
\ No newline at end of file
diff --git a/lib/lucene-spellchecker-2.9.0-rc5.jar b/lib/lucene-spellchecker-2.9.0-rc5.jar
new file mode 100644
index 00000000000..87bde8b757b
--- /dev/null
+++ b/lib/lucene-spellchecker-2.9.0-rc5.jar
@@ -0,0 +1,2 @@
+AnyObjectId[94b969a714ac94fbe5bab3dbbea89571cbaa2ee2] was removed in git history.
+Apache SVN contains full history.
\ No newline at end of file
diff --git a/src/java/org/apache/solr/search/DocSet.java b/src/java/org/apache/solr/search/DocSet.java
index a25095738e6..2135808e6db 100644
--- a/src/java/org/apache/solr/search/DocSet.java
+++ b/src/java/org/apache/solr/search/DocSet.java
@@ -288,6 +288,12 @@ abstract class DocSetBase implements DocSet {
               }
             };
           }
+
+          @Override
+          public boolean isCacheable() {
+            return true;
+          }
+
         };
       }
     };
diff --git a/src/java/org/apache/solr/search/SortedIntDocSet.java b/src/java/org/apache/solr/search/SortedIntDocSet.java
index 28dc6cb68f1..146925687cc 100755
--- a/src/java/org/apache/solr/search/SortedIntDocSet.java
+++ b/src/java/org/apache/solr/search/SortedIntDocSet.java
@@ -648,6 +648,12 @@ public class SortedIntDocSet extends DocSetBase {
 
             };
           }
+
+          @Override
+          public boolean isCacheable() {
+            return true;
+          }
+
         };
       }
     };