Skip to content

Commit f439c99

Browse files
author
Tom May
committed
Merge commit 'v0.13.1' into cassandra
2 parents be0900b + c1c28e8 commit f439c99

File tree

10 files changed

+53
-59
lines changed

10 files changed

+53
-59
lines changed

‎.idea/inspectionProfiles/Project_Default.xml

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/libraries/lucene.xml

Lines changed: 8 additions & 13 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss");
1111
sdf.setTimeZone(TimeZone.getTimeZone("UTC"));
1212
buildTimeStr = sdf.format(buildTime)
1313

14-
versionNumber = '0.13.0'
14+
versionNumber = '0.13.1'
1515

1616
explodedDistDir = new File(distsDir, 'exploded')
1717
explodedDistLibDir = new File(explodedDistDir, 'lib')

‎modules/elasticsearch/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ dependencies {
3737

3838
compile('net.java.dev.jna:jna:3.2.7') { transitive = false }
3939

40-
compile 'org.apache.lucene:lucene-core:3.0.2'
41-
compile 'org.apache.lucene:lucene-analyzers:3.0.2'
42-
compile 'org.apache.lucene:lucene-queries:3.0.2'
43-
compile 'org.apache.lucene:lucene-fast-vector-highlighter:3.0.2'
40+
compile 'org.apache.lucene:lucene-core:3.0.3'
41+
compile 'org.apache.lucene:lucene-analyzers:3.0.3'
42+
compile 'org.apache.lucene:lucene-queries:3.0.3'
43+
compile 'org.apache.lucene:lucene-fast-vector-highlighter:3.0.3'
4444

4545
testCompile project(':test-testng')
4646
testCompile('org.testng:testng:5.10:jdk15') { transitive = false }

‎modules/elasticsearch/src/main/java/org/apache/lucene/search/FieldCacheImpl.java

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -296,13 +296,11 @@ public int hashCode() {
296296
}
297297

298298
// inherit javadocs
299-
300299
public byte[] getBytes(IndexReader reader, String field) throws IOException {
301300
return getBytes(reader, field, null);
302301
}
303302

304303
// inherit javadocs
305-
306304
public byte[] getBytes(IndexReader reader, String field, ByteParser parser)
307305
throws IOException {
308306
return (byte[]) caches.get(Byte.TYPE).get(reader, new Entry(field, parser));
@@ -347,13 +345,11 @@ protected Object createValue(IndexReader reader, Entry entryKey)
347345
;
348346

349347
// inherit javadocs
350-
351348
public short[] getShorts(IndexReader reader, String field) throws IOException {
352349
return getShorts(reader, field, null);
353350
}
354351

355352
// inherit javadocs
356-
357353
public short[] getShorts(IndexReader reader, String field, ShortParser parser)
358354
throws IOException {
359355
return (short[]) caches.get(Short.TYPE).get(reader, new Entry(field, parser));
@@ -398,13 +394,11 @@ protected Object createValue(IndexReader reader, Entry entryKey)
398394
;
399395

400396
// inherit javadocs
401-
402397
public int[] getInts(IndexReader reader, String field) throws IOException {
403398
return getInts(reader, field, null);
404399
}
405400

406401
// inherit javadocs
407-
408402
public int[] getInts(IndexReader reader, String field, IntParser parser)
409403
throws IOException {
410404
return (int[]) caches.get(Integer.TYPE).get(reader, new Entry(field, parser));
@@ -458,14 +452,12 @@ protected Object createValue(IndexReader reader, Entry entryKey)
458452

459453

460454
// inherit javadocs
461-
462455
public float[] getFloats(IndexReader reader, String field)
463456
throws IOException {
464457
return getFloats(reader, field, null);
465458
}
466459

467460
// inherit javadocs
468-
469461
public float[] getFloats(IndexReader reader, String field, FloatParser parser)
470462
throws IOException {
471463

@@ -524,7 +516,6 @@ public long[] getLongs(IndexReader reader, String field) throws IOException {
524516
}
525517

526518
// inherit javadocs
527-
528519
public long[] getLongs(IndexReader reader, String field, FieldCache.LongParser parser)
529520
throws IOException {
530521
return (long[]) caches.get(Long.TYPE).get(reader, new Entry(field, parser));
@@ -576,14 +567,12 @@ protected Object createValue(IndexReader reader, Entry entry)
576567
;
577568

578569
// inherit javadocs
579-
580570
public double[] getDoubles(IndexReader reader, String field)
581571
throws IOException {
582572
return getDoubles(reader, field, null);
583573
}
584574

585575
// inherit javadocs
586-
587576
public double[] getDoubles(IndexReader reader, String field, FieldCache.DoubleParser parser)
588577
throws IOException {
589578
return (double[]) caches.get(Double.TYPE).get(reader, new Entry(field, parser));
@@ -636,7 +625,6 @@ protected Object createValue(IndexReader reader, Entry entryKey)
636625
;
637626

638627
// inherit javadocs
639-
640628
public String[] getStrings(IndexReader reader, String field)
641629
throws IOException {
642630
return (String[]) caches.get(String.class).get(reader, new Entry(field, (Parser) null));
@@ -675,7 +663,6 @@ protected Object createValue(IndexReader reader, Entry entryKey)
675663
;
676664

677665
// inherit javadocs
678-
679666
public StringIndex getStringIndex(IndexReader reader, String field)
680667
throws IOException {
681668
return (StringIndex) caches.get(StringIndex.class).get(reader, new Entry(field, (Parser) null));
@@ -705,7 +692,7 @@ protected Object createValue(IndexReader reader, Entry entryKey)
705692
try {
706693
do {
707694
Term term = termEnum.term();
708-
if (term == null || term.field() != field) break;
695+
if (term == null || term.field() != field || t >= mterms.length) break;
709696

710697
// store term text
711698
mterms[t] = term.text();

‎modules/elasticsearch/src/main/java/org/elasticsearch/cache/NodeCache.java

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,33 +21,36 @@
2121

2222
import org.elasticsearch.cache.memory.ByteBufferCache;
2323
import org.elasticsearch.cache.query.parser.QueryParserCache;
24-
import org.elasticsearch.cache.query.parser.none.NoneQueryParserCache;
24+
import org.elasticsearch.cluster.ClusterChangedEvent;
25+
import org.elasticsearch.cluster.ClusterService;
26+
import org.elasticsearch.cluster.ClusterStateListener;
2527
import org.elasticsearch.common.component.AbstractComponent;
2628
import org.elasticsearch.common.inject.Inject;
27-
import org.elasticsearch.common.settings.ImmutableSettings;
2829
import org.elasticsearch.common.settings.Settings;
2930

3031
/**
3132
* @author kimchy (shay.banon)
3233
*/
33-
public class NodeCache extends AbstractComponent {
34+
public class NodeCache extends AbstractComponent implements ClusterStateListener {
35+
36+
private final ClusterService clusterService;
3437

3538
private final ByteBufferCache byteBufferCache;
3639

3740
private final QueryParserCache queryParserCache;
3841

39-
public NodeCache() {
40-
this(ImmutableSettings.Builder.EMPTY_SETTINGS, new ByteBufferCache(ImmutableSettings.Builder.EMPTY_SETTINGS), new NoneQueryParserCache());
41-
}
42-
43-
@Inject public NodeCache(Settings settings, ByteBufferCache byteBufferCache, QueryParserCache queryParserCache) {
42+
@Inject public NodeCache(Settings settings, ByteBufferCache byteBufferCache, QueryParserCache queryParserCache, ClusterService clusterService) {
4443
super(settings);
44+
this.clusterService = clusterService;
4545
this.byteBufferCache = byteBufferCache;
4646
this.queryParserCache = queryParserCache;
47+
clusterService.add(this);
4748
}
4849

4950
public void close() {
51+
clusterService.remove(this);
5052
byteBufferCache.close();
53+
queryParserCache.clear();
5154
}
5255

5356
public ByteBufferCache byteBuffer() {
@@ -57,4 +60,12 @@ public ByteBufferCache byteBuffer() {
5760
public QueryParserCache queryParser() {
5861
return queryParserCache;
5962
}
63+
64+
// listen on cluster change events to invalidate the query parser cache
65+
@Override public void clusterChanged(ClusterChangedEvent event) {
66+
// TODO we can do better by detecting just mappings changes
67+
if (event.metaDataChanged()) {
68+
queryParserCache.clear();
69+
}
70+
}
6071
}

‎modules/elasticsearch/src/main/java/org/elasticsearch/common/logging/log4j/LogConfigurator.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -45,17 +45,17 @@ public class LogConfigurator {
4545
.put("dailyRollingFile", "org.apache.log4j.DailyRollingFileAppender")
4646
.put("externallyRolledFile", "org.apache.log4j.ExternallyRolledFileAppender")
4747
.put("file", "org.apache.log4j.FileAppender")
48-
.put("jdbc", "org.apache.log4j.JDBCAppender")
49-
.put("jms", "org.apache.log4j.JMSAppender")
50-
.put("lf5", "org.apache.log4j.LF5Appender")
51-
.put("ntevent", "org.apache.log4j.NTEventLogAppender")
48+
.put("jdbc", "org.apache.log4j.jdbc.JDBCAppender")
49+
.put("jms", "org.apache.log4j.net.JMSAppender")
50+
.put("lf5", "org.apache.log4j.lf5.LF5Appender")
51+
.put("ntevent", "org.apache.log4j.nt.NTEventLogAppender")
5252
.put("null", "org.apache.log4j.NullAppender")
5353
.put("rollingFile", "org.apache.log4j.RollingFileAppender")
54-
.put("smtp", "org.apache.log4j.SMTPAppender")
55-
.put("socket", "org.apache.log4j.SocketAppender")
56-
.put("socketHub", "org.apache.log4j.SocketHubAppender")
57-
.put("syslog", "org.apache.log4j.SyslogAppender")
58-
.put("telnet", "org.apache.log4j.TelnetAppender")
54+
.put("smtp", "org.apache.log4j.net.SMTPAppender")
55+
.put("socket", "org.apache.log4j.net.SocketAppender")
56+
.put("socketHub", "org.apache.log4j.net.SocketHubAppender")
57+
.put("syslog", "org.apache.log4j.net.SyslogAppender")
58+
.put("telnet", "org.apache.log4j.net.TelnetAppender")
5959
// layouts
6060
.put("simple", "org.apache.log4j.SimpleLayout")
6161
.put("html", "org.apache.log4j.HTMLLayout")

‎modules/elasticsearch/src/main/java/org/elasticsearch/index/mapper/MapperService.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -188,23 +188,23 @@ public void remove(String type) {
188188
}
189189
}
190190

191-
mappers = indexNameFieldMappers.get(mapper.names().name());
191+
mappers = indexNameFieldMappers.get(mapper.names().indexName());
192192
if (mappers != null) {
193193
mappers = mappers.remove(mapper);
194194
if (mappers.isEmpty()) {
195-
indexNameFieldMappers = newMapBuilder(indexNameFieldMappers).remove(mapper.names().name()).immutableMap();
195+
indexNameFieldMappers = newMapBuilder(indexNameFieldMappers).remove(mapper.names().indexName()).immutableMap();
196196
} else {
197-
indexNameFieldMappers = newMapBuilder(indexNameFieldMappers).put(mapper.names().name(), mappers).immutableMap();
197+
indexNameFieldMappers = newMapBuilder(indexNameFieldMappers).put(mapper.names().indexName(), mappers).immutableMap();
198198
}
199199
}
200200

201-
mappers = fullNameFieldMappers.get(mapper.names().name());
201+
mappers = fullNameFieldMappers.get(mapper.names().fullName());
202202
if (mappers != null) {
203203
mappers = mappers.remove(mapper);
204204
if (mappers.isEmpty()) {
205-
fullNameFieldMappers = newMapBuilder(fullNameFieldMappers).remove(mapper.names().name()).immutableMap();
205+
fullNameFieldMappers = newMapBuilder(fullNameFieldMappers).remove(mapper.names().fullName()).immutableMap();
206206
} else {
207-
fullNameFieldMappers = newMapBuilder(fullNameFieldMappers).put(mapper.names().name(), mappers).immutableMap();
207+
fullNameFieldMappers = newMapBuilder(fullNameFieldMappers).put(mapper.names().fullName(), mappers).immutableMap();
208208
}
209209
}
210210
}
@@ -555,7 +555,7 @@ private class InternalFieldMapperListener implements FieldMapperListener {
555555
}
556556
indexNameFieldMappers = newMapBuilder(indexNameFieldMappers).put(fieldMapper.names().indexName(), mappers).immutableMap();
557557

558-
mappers = fullNameFieldMappers.get(fieldMapper.names().indexName());
558+
mappers = fullNameFieldMappers.get(fieldMapper.names().fullName());
559559
if (mappers == null) {
560560
mappers = new FieldMappers(fieldMapper);
561561
} else {

‎plugins/analysis/icu/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ dependencies {
3434

3535
compile('com.ibm.icu:icu4j:4.4') { transitive = false }
3636
distLib('com.ibm.icu:icu4j:4.4') { transitive = false }
37-
compile('org.apache.lucene:lucene-collation:3.0.1') { transitive = false }
38-
distLib('org.apache.lucene:lucene-collation:3.0.1') { transitive = false }
37+
compile('org.apache.lucene:lucene-collation:3.0.3') { transitive = false }
38+
distLib('org.apache.lucene:lucene-collation:3.0.3') { transitive = false }
3939

4040

4141
testCompile project(':test-testng')

0 commit comments

Comments
 (0)