Upgrade to Lucene 3.0.3, closes elastic#549.

Author: kimchy

.idea/libraries/lucene.xml

@@ -37,10 +37,10 @@ dependencies {
 
     compile('net.java.dev.jna:jna:3.2.7') { transitive = false }
 
-    compile 'org.apache.lucene:lucene-core:3.0.2'
-    compile 'org.apache.lucene:lucene-analyzers:3.0.2'
-    compile 'org.apache.lucene:lucene-queries:3.0.2'
-    compile 'org.apache.lucene:lucene-fast-vector-highlighter:3.0.2'
+    compile 'org.apache.lucene:lucene-core:3.0.3'
+    compile 'org.apache.lucene:lucene-analyzers:3.0.3'
+    compile 'org.apache.lucene:lucene-queries:3.0.3'
+    compile 'org.apache.lucene:lucene-fast-vector-highlighter:3.0.3'
 
     testCompile project(':test-testng')
     testCompile('org.testng:testng:5.10:jdk15') { transitive = false }

.idea/modules/plugin-analysis-icu.iml

@@ -296,13 +296,11 @@ public int hashCode() {
     }
 
     // inherit javadocs
-
     public byte[] getBytes(IndexReader reader, String field) throws IOException {
         return getBytes(reader, field, null);
     }
 
     // inherit javadocs
-
     public byte[] getBytes(IndexReader reader, String field, ByteParser parser)
             throws IOException {
         return (byte[]) caches.get(Byte.TYPE).get(reader, new Entry(field, parser));
@@ -347,13 +345,11 @@ protected Object createValue(IndexReader reader, Entry entryKey)
     ;
 
     // inherit javadocs
-
     public short[] getShorts(IndexReader reader, String field) throws IOException {
         return getShorts(reader, field, null);
     }
 
     // inherit javadocs
-
     public short[] getShorts(IndexReader reader, String field, ShortParser parser)
             throws IOException {
         return (short[]) caches.get(Short.TYPE).get(reader, new Entry(field, parser));
@@ -398,13 +394,11 @@ protected Object createValue(IndexReader reader, Entry entryKey)
     ;
 
     // inherit javadocs
-
     public int[] getInts(IndexReader reader, String field) throws IOException {
         return getInts(reader, field, null);
     }
 
     // inherit javadocs
-
     public int[] getInts(IndexReader reader, String field, IntParser parser)
             throws IOException {
         return (int[]) caches.get(Integer.TYPE).get(reader, new Entry(field, parser));
@@ -458,14 +452,12 @@ protected Object createValue(IndexReader reader, Entry entryKey)
 
 
     // inherit javadocs
-
     public float[] getFloats(IndexReader reader, String field)
             throws IOException {
         return getFloats(reader, field, null);
     }
 
     // inherit javadocs
-
     public float[] getFloats(IndexReader reader, String field, FloatParser parser)
             throws IOException {
 
@@ -524,7 +516,6 @@ public long[] getLongs(IndexReader reader, String field) throws IOException {
     }
 
     // inherit javadocs
-
     public long[] getLongs(IndexReader reader, String field, FieldCache.LongParser parser)
             throws IOException {
         return (long[]) caches.get(Long.TYPE).get(reader, new Entry(field, parser));
@@ -576,14 +567,12 @@ protected Object createValue(IndexReader reader, Entry entry)
     ;
 
     // inherit javadocs
-
     public double[] getDoubles(IndexReader reader, String field)
             throws IOException {
         return getDoubles(reader, field, null);
     }
 
     // inherit javadocs
-
     public double[] getDoubles(IndexReader reader, String field, FieldCache.DoubleParser parser)
             throws IOException {
         return (double[]) caches.get(Double.TYPE).get(reader, new Entry(field, parser));
@@ -636,7 +625,6 @@ protected Object createValue(IndexReader reader, Entry entryKey)
     ;
 
     // inherit javadocs
-
     public String[] getStrings(IndexReader reader, String field)
             throws IOException {
         return (String[]) caches.get(String.class).get(reader, new Entry(field, (Parser) null));
@@ -675,7 +663,6 @@ protected Object createValue(IndexReader reader, Entry entryKey)
     ;
 
     // inherit javadocs
-
     public StringIndex getStringIndex(IndexReader reader, String field)
             throws IOException {
         return (StringIndex) caches.get(StringIndex.class).get(reader, new Entry(field, (Parser) null));
@@ -705,7 +692,7 @@ protected Object createValue(IndexReader reader, Entry entryKey)
             try {
                 do {
                     Term term = termEnum.term();
-                    if (term == null || term.field() != field) break;
+                    if (term == null || term.field() != field || t >= mterms.length) break;
 
                     // store term text
                     mterms[t] = term.text();

modules/elasticsearch/build.gradle

@@ -34,8 +34,8 @@ dependencies {
 
     compile('com.ibm.icu:icu4j:4.4') { transitive = false }
     distLib('com.ibm.icu:icu4j:4.4') { transitive = false }
-    compile('org.apache.lucene:lucene-collation:3.0.1') { transitive = false }
-    distLib('org.apache.lucene:lucene-collation:3.0.1') { transitive = false }
+    compile('org.apache.lucene:lucene-collation:3.0.3') { transitive = false }
+    distLib('org.apache.lucene:lucene-collation:3.0.3') { transitive = false }
 
 
     testCompile project(':test-testng')