forked from opensearch-project/k-NN
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'opensearch-project:main' into knn-2263
- Loading branch information
Showing
39 changed files
with
3,515 additions
and
56 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
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
82 changes: 82 additions & 0 deletions
82
...ain/java/org/opensearch/knn/index/codec/KNN9120Codec/DerivedSourceStoredFieldsFormat.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,82 @@ | ||
| /* | ||
| * Copyright OpenSearch Contributors | ||
| * SPDX-License-Identifier: Apache-2.0 | ||
| */ | ||
|
|
||
| package org.opensearch.knn.index.codec.KNN9120Codec; | ||
|
|
||
| import lombok.AllArgsConstructor; | ||
| import org.apache.lucene.codecs.StoredFieldsFormat; | ||
| import org.apache.lucene.codecs.StoredFieldsReader; | ||
| import org.apache.lucene.codecs.StoredFieldsWriter; | ||
| import org.apache.lucene.index.FieldInfo; | ||
| import org.apache.lucene.index.FieldInfos; | ||
| import org.apache.lucene.index.SegmentInfo; | ||
| import org.apache.lucene.index.SegmentReadState; | ||
| import org.apache.lucene.store.Directory; | ||
| import org.apache.lucene.store.IOContext; | ||
| import org.opensearch.common.Nullable; | ||
| import org.opensearch.index.mapper.MappedFieldType; | ||
| import org.opensearch.index.mapper.MapperService; | ||
| import org.opensearch.knn.index.KNNSettings; | ||
| import org.opensearch.knn.index.codec.derivedsource.DerivedSourceReadersSupplier; | ||
| import org.opensearch.knn.index.mapper.KNNVectorFieldType; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.ArrayList; | ||
| import java.util.List; | ||
|
|
||
| import static org.opensearch.knn.common.KNNConstants.DERIVED_VECTOR_FIELD_ATTRIBUTE_KEY; | ||
| import static org.opensearch.knn.common.KNNConstants.DERIVED_VECTOR_FIELD_ATTRIBUTE_TRUE_VALUE; | ||
|
|
||
| @AllArgsConstructor | ||
| public class DerivedSourceStoredFieldsFormat extends StoredFieldsFormat { | ||
|
|
||
| private final StoredFieldsFormat delegate; | ||
| private final DerivedSourceReadersSupplier derivedSourceReadersSupplier; | ||
| // IMPORTANT Do not rely on this for the reader, it will be null if SPI is used | ||
| @Nullable | ||
| private final MapperService mapperService; | ||
|
|
||
| @Override | ||
| public StoredFieldsReader fieldsReader(Directory directory, SegmentInfo segmentInfo, FieldInfos fieldInfos, IOContext ioContext) | ||
| throws IOException { | ||
| List<FieldInfo> derivedVectorFields = null; | ||
| for (FieldInfo fieldInfo : fieldInfos) { | ||
| if (DERIVED_VECTOR_FIELD_ATTRIBUTE_TRUE_VALUE.equals(fieldInfo.attributes().get(DERIVED_VECTOR_FIELD_ATTRIBUTE_KEY))) { | ||
| // Lazily initialize the list of fields | ||
| if (derivedVectorFields == null) { | ||
| derivedVectorFields = new ArrayList<>(); | ||
| } | ||
| derivedVectorFields.add(fieldInfo); | ||
| } | ||
| } | ||
| // If no fields have it enabled, we can just short-circuit and return the delegate's fieldReader | ||
| if (derivedVectorFields == null || derivedVectorFields.isEmpty()) { | ||
| return delegate.fieldsReader(directory, segmentInfo, fieldInfos, ioContext); | ||
| } | ||
| return new DerivedSourceStoredFieldsReader( | ||
| delegate.fieldsReader(directory, segmentInfo, fieldInfos, ioContext), | ||
| derivedVectorFields, | ||
| derivedSourceReadersSupplier, | ||
| new SegmentReadState(directory, segmentInfo, fieldInfos, ioContext) | ||
| ); | ||
| } | ||
|
|
||
| @Override | ||
| public StoredFieldsWriter fieldsWriter(Directory directory, SegmentInfo segmentInfo, IOContext ioContext) throws IOException { | ||
| StoredFieldsWriter delegateWriter = delegate.fieldsWriter(directory, segmentInfo, ioContext); | ||
| if (mapperService != null && KNNSettings.isKNNDerivedSourceEnabled(mapperService.getIndexSettings().getSettings())) { | ||
| List<String> vectorFieldTypes = new ArrayList<>(); | ||
| for (MappedFieldType fieldType : mapperService.fieldTypes()) { | ||
| if (fieldType instanceof KNNVectorFieldType) { | ||
| vectorFieldTypes.add(fieldType.name()); | ||
| } | ||
| } | ||
| if (vectorFieldTypes.isEmpty() == false) { | ||
| return new DerivedSourceStoredFieldsWriter(delegateWriter, vectorFieldTypes); | ||
| } | ||
| } | ||
| return delegateWriter; | ||
| } | ||
| } |
Oops, something went wrong.