This repository has been archived by the owner on Aug 2, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 56
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
k-NN plugin support for Elasticsearch version 7.10.0 (#271)
* ES 7.10 support
- Loading branch information
Showing
13 changed files
with
208 additions
and
54 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,4 +13,4 @@ | |
| # permissions and limitations under the License. | ||
| # | ||
|
|
||
| version=1.6 | ||
| version=1.11.0 | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
138 changes: 138 additions & 0 deletions
138
...ain/java/com/amazon/opendistroforelasticsearch/knn/index/codec/KNN87Codec/KNN87Codec.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,138 @@ | ||
| /* | ||
| * Copyright 2020 Amazon.com, Inc. or its affiliates. All Rights Reserved. | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"). | ||
| * You may not use this file except in compliance with the License. | ||
| * A copy of the License is located at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * or in the "license" file accompanying this file. This file is distributed | ||
| * on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either | ||
| * express or implied. See the License for the specific language governing | ||
| * permissions and limitations under the License. | ||
| */ | ||
|
|
||
| package com.amazon.opendistroforelasticsearch.knn.index.codec.KNN87Codec; | ||
|
|
||
| import com.amazon.opendistroforelasticsearch.knn.index.codec.KNN80Codec.KNN80CompoundFormat; | ||
| import com.amazon.opendistroforelasticsearch.knn.index.codec.KNN80Codec.KNN80DocValuesFormat; | ||
| import org.apache.logging.log4j.LogManager; | ||
| import org.apache.logging.log4j.Logger; | ||
| import org.apache.lucene.codecs.Codec; | ||
| import org.apache.lucene.codecs.CompoundFormat; | ||
| import org.apache.lucene.codecs.DocValuesFormat; | ||
| import org.apache.lucene.codecs.FieldInfosFormat; | ||
| import org.apache.lucene.codecs.LiveDocsFormat; | ||
| import org.apache.lucene.codecs.NormsFormat; | ||
| import org.apache.lucene.codecs.PointsFormat; | ||
| import org.apache.lucene.codecs.PostingsFormat; | ||
| import org.apache.lucene.codecs.SegmentInfoFormat; | ||
| import org.apache.lucene.codecs.StoredFieldsFormat; | ||
| import org.apache.lucene.codecs.TermVectorsFormat; | ||
| import org.apache.lucene.codecs.perfield.PerFieldDocValuesFormat; | ||
|
|
||
| /** | ||
| * Extends the Codec to support a new file format for KNN index | ||
| * based on the mappings. | ||
| * | ||
| */ | ||
| public final class KNN87Codec extends Codec { | ||
|
|
||
| private static final Logger logger = LogManager.getLogger(KNN87Codec.class); | ||
| private final DocValuesFormat docValuesFormat; | ||
| private final DocValuesFormat perFieldDocValuesFormat; | ||
| private final CompoundFormat compoundFormat; | ||
| private Codec lucene87Codec; | ||
| private PostingsFormat postingsFormat = null; | ||
|
|
||
| public static final String KNN_87 = "KNN87Codec"; | ||
| public static final String LUCENE_87 = "Lucene87"; // Lucene Codec to be used | ||
|
|
||
| public KNN87Codec() { | ||
| super(KNN_87); | ||
| // Note that DocValuesFormat can use old Codec's DocValuesFormat. For instance Lucene84 uses Lucene80 | ||
| // DocValuesFormat. Refer to defaultDVFormat in LuceneXXCodec.java to find out which version it uses | ||
| this.docValuesFormat = new KNN80DocValuesFormat(); | ||
| this.perFieldDocValuesFormat = new PerFieldDocValuesFormat() { | ||
| @Override | ||
| public DocValuesFormat getDocValuesFormatForField(String field) { | ||
| return docValuesFormat; | ||
| } | ||
| }; | ||
| this.compoundFormat = new KNN80CompoundFormat(); | ||
| } | ||
|
|
||
| /* | ||
| * This function returns the Codec. | ||
| */ | ||
| public Codec getDelegatee() { | ||
| if (lucene87Codec == null) | ||
| lucene87Codec = Codec.forName(LUCENE_87); | ||
| return lucene87Codec; | ||
| } | ||
|
|
||
| @Override | ||
| public DocValuesFormat docValuesFormat() { | ||
| return this.perFieldDocValuesFormat; | ||
| } | ||
|
|
||
| /* | ||
| * For all the below functions, we could have extended FilterCodec, but this brings | ||
| * SPI related issues while loading Codec in the tests. So fall back to traditional | ||
| * approach of manually overriding. | ||
| */ | ||
|
|
||
|
|
||
| public void setPostingsFormat(PostingsFormat postingsFormat) { | ||
| this.postingsFormat = postingsFormat; | ||
| } | ||
|
|
||
| @Override | ||
| public PostingsFormat postingsFormat() { | ||
| if (this.postingsFormat == null) { | ||
| return getDelegatee().postingsFormat(); | ||
| } | ||
| return this.postingsFormat; | ||
| } | ||
|
|
||
| @Override | ||
| public StoredFieldsFormat storedFieldsFormat() { | ||
| return getDelegatee().storedFieldsFormat(); | ||
| } | ||
|
|
||
| @Override | ||
| public TermVectorsFormat termVectorsFormat() { | ||
| return getDelegatee().termVectorsFormat(); | ||
| } | ||
|
|
||
| @Override | ||
| public FieldInfosFormat fieldInfosFormat() { | ||
| return getDelegatee().fieldInfosFormat(); | ||
| } | ||
|
|
||
| @Override | ||
| public SegmentInfoFormat segmentInfoFormat() { | ||
| return getDelegatee().segmentInfoFormat(); | ||
| } | ||
|
|
||
| @Override | ||
| public NormsFormat normsFormat() { | ||
| return getDelegatee().normsFormat(); | ||
| } | ||
|
|
||
| @Override | ||
| public LiveDocsFormat liveDocsFormat() { | ||
| return getDelegatee().liveDocsFormat(); | ||
| } | ||
|
|
||
| @Override | ||
| public CompoundFormat compoundFormat() { | ||
| return this.compoundFormat; | ||
| } | ||
|
|
||
| @Override | ||
| public PointsFormat pointsFormat() { | ||
| return getDelegatee().pointsFormat(); | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.