honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Bump BWC version to 6.1.0 for #27469

This commit is contained in:
Simon Willnauer 2017-11-21 15:18:36 +01:00
parent 90d2ead14a
commit cc78b24867
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/org/elasticsearch/common/lucene/search/Queries.java
View File

@ -70,7 +70,7 @@ public class Queries {
* @param indexVersionCreated the index version created since newer indices can identify a parent field more efficiently * @param indexVersionCreated the index version created since newer indices can identify a parent field more efficiently
*/ */
public static Query newNonNestedFilter(Version indexVersionCreated) { public static Query newNonNestedFilter(Version indexVersionCreated) {
if (indexVersionCreated.onOrAfter(Version.V_7_0_0_alpha1)) { if (indexVersionCreated.onOrAfter(Version.V_6_1_0)) {
return new DocValuesFieldExistsQuery(SeqNoFieldMapper.PRIMARY_TERM_NAME); return new DocValuesFieldExistsQuery(SeqNoFieldMapper.PRIMARY_TERM_NAME);
} else { } else {
return new BooleanQuery.Builder() return new BooleanQuery.Builder()

2
core/src/main/java/org/elasticsearch/index/mapper/SeqNoFieldMapper.java
View File

@ -255,7 +255,7 @@ public class SeqNoFieldMapper extends MetadataFieldMapper {
assert seqID != null; assert seqID != null;
int numDocs = context.docs().size(); int numDocs = context.docs().size();
final Version versionCreated = context.mapperService().getIndexSettings().getIndexVersionCreated(); final Version versionCreated = context.mapperService().getIndexSettings().getIndexVersionCreated();
final boolean includePrimaryTerm = versionCreated.before(Version.V_7_0_0_alpha1); final boolean includePrimaryTerm = versionCreated.before(Version.V_6_1_0);
for (int i = 1; i < numDocs; i++) { for (int i = 1; i < numDocs; i++) {
final Document doc = context.docs().get(i); final Document doc = context.docs().get(i);
doc.add(seqID.seqNo); doc.add(seqID.seqNo);

2
core/src/test/java/org/apache/lucene/search/QueriesTests.java
View File

@ -32,7 +32,7 @@ public class QueriesTests extends ESTestCase {
// This is a custom query that extends AutomatonQuery and want to make sure the equals method works // This is a custom query that extends AutomatonQuery and want to make sure the equals method works
assertEquals(Queries.newNonNestedFilter(version), Queries.newNonNestedFilter(version)); assertEquals(Queries.newNonNestedFilter(version), Queries.newNonNestedFilter(version));
assertEquals(Queries.newNonNestedFilter(version).hashCode(), Queries.newNonNestedFilter(version).hashCode()); assertEquals(Queries.newNonNestedFilter(version).hashCode(), Queries.newNonNestedFilter(version).hashCode());
if (version.onOrAfter(Version.V_7_0_0_alpha1)) { if (version.onOrAfter(Version.V_6_1_0)) {
assertEquals(Queries.newNonNestedFilter(version), new DocValuesFieldExistsQuery(SeqNoFieldMapper.PRIMARY_TERM_NAME)); assertEquals(Queries.newNonNestedFilter(version), new DocValuesFieldExistsQuery(SeqNoFieldMapper.PRIMARY_TERM_NAME));
} else { } else {
assertEquals(Queries.newNonNestedFilter(version), new BooleanQuery.Builder() assertEquals(Queries.newNonNestedFilter(version), new BooleanQuery.Builder()