Skip to content
Closed
Show file tree
Hide file tree
Changes from 12 commits
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
a0d0b77
add multi_match intercepter
Samiul-TheSoccerFan Aug 1, 2025
dabbb85
implement types
Samiul-TheSoccerFan Aug 1, 2025
21245c3
fixing warning header logic
Samiul-TheSoccerFan Aug 5, 2025
8a3ca94
fix warning header logic in semantic multi_match
Samiul-TheSoccerFan Aug 5, 2025
d5a315d
centralize validation logic for both mixed and single field
Samiul-TheSoccerFan Aug 5, 2025
a71aa73
added comments to better understanding and todo
Samiul-TheSoccerFan Aug 5, 2025
c17fed5
validate query types for single inference field
Samiul-TheSoccerFan Aug 5, 2025
d7a7640
apply field and query boost
Samiul-TheSoccerFan Aug 6, 2025
d8b97f3
fix duplicate boosting retrieve
Samiul-TheSoccerFan Aug 6, 2025
944053f
refactor boosting checks
Samiul-TheSoccerFan Aug 6, 2025
69f439f
Convert MultiFieldInferenceInfo to record
Samiul-TheSoccerFan Aug 6, 2025
776a65c
linting
Samiul-TheSoccerFan Aug 6, 2025
a785a19
refactoring multimatch intercepter
Samiul-TheSoccerFan Aug 8, 2025
1b7501f
refactoring multimatch intercepter
Samiul-TheSoccerFan Aug 8, 2025
00f14de
fix tiebreaker default issue
Samiul-TheSoccerFan Aug 8, 2025
6f618e4
small fix
Samiul-TheSoccerFan Aug 8, 2025
c740804
small refactor
Samiul-TheSoccerFan Aug 8, 2025
8b47269
fix multi index broken search
Samiul-TheSoccerFan Aug 8, 2025
7064442
refactor recalculating of non-inference fields
Samiul-TheSoccerFan Aug 8, 2025
76af4b0
wildcard resolution with field boost
Samiul-TheSoccerFan Aug 11, 2025
53a9a6f
refactor and simplify data structure
Samiul-TheSoccerFan Aug 11, 2025
de5aa6c
linting
Samiul-TheSoccerFan Aug 11, 2025
22a958d
adding yaml tests for multi_match
Samiul-TheSoccerFan Aug 11, 2025
6763057
adding assertion
Samiul-TheSoccerFan Aug 11, 2025
fd8fbb6
update comments
Samiul-TheSoccerFan Aug 11, 2025
3a99284
Merge branch 'main' into poc-multi-match-rewrite
elasticmachine Aug 11, 2025
949a288
validate query types for single inference field
Samiul-TheSoccerFan Aug 12, 2025
f1de7b4
remove score mismatch issue
Samiul-TheSoccerFan Aug 12, 2025
cd213bb
throw exception is type is unrocnizable
Samiul-TheSoccerFan Aug 12, 2025
eb30e4c
default field implementation
Samiul-TheSoccerFan Aug 12, 2025
851cdd2
adding transport layer
Samiul-TheSoccerFan Aug 13, 2025
2e8fea2
logic not to resolve by default
Samiul-TheSoccerFan Aug 13, 2025
b17f8d2
refactor extracting resolvewildcard field
Samiul-TheSoccerFan Aug 13, 2025
046ff0f
multiple boosting per field
Samiul-TheSoccerFan Aug 14, 2025
409e320
linting
Samiul-TheSoccerFan Aug 14, 2025
7ad9675
merge from main
Samiul-TheSoccerFan Aug 14, 2025
e964f2e
remove unnecessary headers
Samiul-TheSoccerFan Aug 14, 2025
80560be
remove modelResitry
Samiul-TheSoccerFan Aug 14, 2025
98ec933
clean up
Samiul-TheSoccerFan Aug 14, 2025
2595efb
fix yaml test failure
Samiul-TheSoccerFan Aug 14, 2025
5c519bc
fix retrievers unit tests
Samiul-TheSoccerFan Aug 14, 2025
41dfd89
Merge branch 'main' into poc-multi-match-rewrite
elasticmachine Aug 14, 2025
7c7fbf8
rename resolve function
Samiul-TheSoccerFan Aug 14, 2025
dfd27d2
combine logic to simplify best fields and most fields
Samiul-TheSoccerFan Aug 15, 2025
b42bc6b
update combine logic to handle user defined tiebreaker and minimum_sh…
Samiul-TheSoccerFan Aug 15, 2025
c1f284a
merge from main
Samiul-TheSoccerFan Aug 15, 2025
13cd7c0
remove duplicate boosting by creating a global boostig fields
Samiul-TheSoccerFan Aug 20, 2025
0accbe2
combine logic to simplify best fields and most fields
Samiul-TheSoccerFan Aug 21, 2025
8b45313
make decisions to resolve wildcard any fields for only multi_match
Samiul-TheSoccerFan Aug 21, 2025
658f171
refactor to push wildcard related work into multi_match
Samiul-TheSoccerFan Aug 21, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import static org.elasticsearch.xpack.inference.queries.SemanticKnnVectorQueryRewriteInterceptor.SEMANTIC_KNN_FILTER_FIX;
import static org.elasticsearch.xpack.inference.queries.SemanticKnnVectorQueryRewriteInterceptor.SEMANTIC_KNN_VECTOR_QUERY_REWRITE_INTERCEPTION_SUPPORTED;
import static org.elasticsearch.xpack.inference.queries.SemanticMatchQueryRewriteInterceptor.SEMANTIC_MATCH_QUERY_REWRITE_INTERCEPTION_SUPPORTED;
import static org.elasticsearch.xpack.inference.queries.SemanticMultiMatchQueryRewriteInterceptor.SEMANTIC_MULTI_MATCH_QUERY_REWRITE_INTERCEPTION_SUPPORTED;
import static org.elasticsearch.xpack.inference.queries.SemanticSparseVectorQueryRewriteInterceptor.SEMANTIC_SPARSE_VECTOR_QUERY_REWRITE_INTERCEPTION_SUPPORTED;
import static org.elasticsearch.xpack.inference.rank.textsimilarity.TextSimilarityRankRetrieverBuilder.RERANK_SNIPPETS;
import static org.elasticsearch.xpack.inference.rank.textsimilarity.TextSimilarityRankRetrieverBuilder.TEXT_SIMILARITY_RERANKER_SNIPPETS;
Expand Down Expand Up @@ -60,6 +61,7 @@ public Set<NodeFeature> getTestFeatures() {
SemanticTextFieldMapper.SEMANTIC_TEXT_SKIP_INFERENCE_FIELDS,
SEMANTIC_TEXT_HIGHLIGHTER,
SEMANTIC_MATCH_QUERY_REWRITE_INTERCEPTION_SUPPORTED,
SEMANTIC_MULTI_MATCH_QUERY_REWRITE_INTERCEPTION_SUPPORTED,
SEMANTIC_SPARSE_VECTOR_QUERY_REWRITE_INTERCEPTION_SUPPORTED,
SemanticInferenceMetadataFieldsMapper.EXPLICIT_NULL_FIXES,
SEMANTIC_KNN_VECTOR_QUERY_REWRITE_INTERCEPTION_SUPPORTED,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@
import org.elasticsearch.xpack.inference.mapper.SemanticTextFieldMapper;
import org.elasticsearch.xpack.inference.queries.SemanticKnnVectorQueryRewriteInterceptor;
import org.elasticsearch.xpack.inference.queries.SemanticMatchQueryRewriteInterceptor;
import org.elasticsearch.xpack.inference.queries.SemanticMultiMatchQueryRewriteInterceptor;
import org.elasticsearch.xpack.inference.queries.SemanticQueryBuilder;
import org.elasticsearch.xpack.inference.queries.SemanticSparseVectorQueryRewriteInterceptor;
import org.elasticsearch.xpack.inference.rank.random.RandomRankBuilder;
Expand Down Expand Up @@ -571,6 +572,7 @@ public List<QueryRewriteInterceptor> getQueryRewriteInterceptors() {
return List.of(
new SemanticKnnVectorQueryRewriteInterceptor(),
new SemanticMatchQueryRewriteInterceptor(),
new SemanticMultiMatchQueryRewriteInterceptor(getModelRegistry()),
new SemanticSparseVectorQueryRewriteInterceptor()
);
}
Expand Down
Loading