Skip to content

Commit 5784bdb

Browse files
russcamrusscam
committed
Merge branch 'fix/5.x-multi-term-rewrite' into 5.x
2 parents 5b93f24 + 26b9d5e commit 5784bdb

31 files changed

+592
-174
lines changed

‎docs/query-dsl/compound/full-text/match/match-phrase-prefix-usage.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ q
3333
.MinimumShouldMatch(2)
3434
.PrefixLength(2)
3535
.Operator(Operator.Or)
36-
.FuzzyRewrite(RewriteMultiTerm.ConstantScoreBoolean)
36+
.FuzzyRewrite(MultiTermQueryRewrite.ConstantScoreBoolean)
3737
.Slop(2)
3838
.Name("named_query")
3939
)
@@ -54,7 +54,7 @@ new MatchPhrasePrefixQuery
5454
Fuzziness = Fuzziness.Auto,
5555
FuzzyTranspositions = true,
5656
MinimumShouldMatch = 2,
57-
FuzzyRewrite = RewriteMultiTerm.ConstantScoreBoolean,
57+
FuzzyMultiTermQueryRewrite = MultiTermQueryRewrite.ConstantScoreBoolean,
5858
MaxExpansions = 2,
5959
Slop = 2,
6060
Lenient = true,

‎docs/query-dsl/compound/full-text/match/match-phrase-usage.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ q
3333
.MinimumShouldMatch(2)
3434
.PrefixLength(2)
3535
.Operator(Operator.Or)
36-
.FuzzyRewrite(RewriteMultiTerm.ConstantScoreBoolean)
36+
.FuzzyRewrite(MultiTermQueryRewrite.ConstantScoreBoolean)
3737
.Slop(2)
3838
.Name("named_query")
3939
)
@@ -54,7 +54,7 @@ new MatchPhraseQuery
5454
Fuzziness = Fuzziness.Auto,
5555
FuzzyTranspositions = true,
5656
MinimumShouldMatch = 2,
57-
FuzzyRewrite = RewriteMultiTerm.ConstantScoreBoolean,
57+
FuzzyMultiTermQueryRewrite = MultiTermQueryRewrite.ConstantScoreBoolean,
5858
MaxExpansions = 2,
5959
Slop = 2,
6060
Lenient = true,

‎docs/query-dsl/compound/full-text/match/match-usage.asciidoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ q
3333
.MinimumShouldMatch(2)
3434
.PrefixLength(2)
3535
.Operator(Operator.Or)
36-
.FuzzyRewrite(RewriteMultiTerm.ConstantScoreBoolean)
36+
.FuzzyRewrite(MultiTermQueryRewrite.TopTermsBlendedFreqs(10))
3737
.Slop(2)
3838
.Name("named_query")
3939
)
@@ -54,7 +54,7 @@ new MatchQuery
5454
Fuzziness = Fuzziness.Auto,
5555
FuzzyTranspositions = true,
5656
MinimumShouldMatch = 2,
57-
FuzzyRewrite = RewriteMultiTerm.ConstantScoreBoolean,
57+
FuzzyMultiTermQueryRewrite = MultiTermQueryRewrite.TopTermsBlendedFreqs(10),
5858
MaxExpansions = 2,
5959
Slop = 2,
6060
Lenient = true,
@@ -73,7 +73,7 @@ new MatchQuery
7373
"boost": 1.1,
7474
"query": "hello world",
7575
"analyzer": "standard",
76-
"fuzzy_rewrite": "constant_score_boolean",
76+
"fuzzy_rewrite": "top_terms_blended_freqs_10",
7777
"fuzziness": "AUTO",
7878
"fuzzy_transpositions": true,
7979
"cutoff_frequency": 0.001,

‎docs/query-dsl/compound/full-text/multi-match/multi-match-usage.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ q
3131
.MaxExpansions(2)
3232
.Operator(Operator.Or)
3333
.MinimumShouldMatch(2)
34-
.FuzzyRewrite(RewriteMultiTerm.ConstantScoreBoolean)
34+
.FuzzyRewrite(MultiTermQueryRewrite.ConstantScoreBoolean)
3535
.TieBreaker(1.1)
3636
.CutoffFrequency(0.001)
3737
.Lenient()
@@ -56,7 +56,7 @@ new MultiMatchQuery
5656
MaxExpansions = 2,
5757
Operator = Operator.Or,
5858
MinimumShouldMatch = 2,
59-
FuzzyRewrite = RewriteMultiTerm.ConstantScoreBoolean,
59+
FuzzyMultiTermQueryRewrite = MultiTermQueryRewrite.ConstantScoreBoolean,
6060
TieBreaker = 1.1,
6161
CutoffFrequency = 0.001,
6262
Lenient = true,

‎docs/query-dsl/compound/full-text/query-string/query-string-usage.asciidoc‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ q
3838
.UseDisMax()
3939
.FuzzyPrefixLength(2)
4040
.FuzzyMaxExpansions(3)
41-
.FuzzyRewrite(RewriteMultiTerm.ConstantScore)
42-
.Rewrite(RewriteMultiTerm.ConstantScore)
41+
.FuzzyRewrite(MultiTermQueryRewrite.ConstantScore)
42+
.Rewrite(MultiTermQueryRewrite.ConstantScore)
4343
.Fuzziness(Fuzziness.Auto)
4444
.TieBreaker(1.2)
4545
.AnalyzeWildcard()
@@ -74,8 +74,8 @@ new QueryStringQuery
7474
UseDisMax = true,
7575
FuzzyPrefixLength = 2,
7676
FuzzyMaxExpansions = 3,
77-
FuzzyRewrite = RewriteMultiTerm.ConstantScore,
78-
Rewrite = RewriteMultiTerm.ConstantScore,
77+
FuzzyMultiTermQueryRewrite = MultiTermQueryRewrite.ConstantScore,
78+
MultiTermQueryRewrite = MultiTermQueryRewrite.ConstantScore,
7979
Fuzziness = Fuzziness.Auto,
8080
TieBreaker = 1.2,
8181
AnalyzeWildcard = true,

‎docs/query-dsl/term-level/fuzzy/fuzzy-date-query-usage.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ q
2828
.Value(Project.Instance.StartedOn)
2929
.MaxExpansions(100)
3030
.PrefixLength(3)
31-
.Rewrite(RewriteMultiTerm.ConstantScore)
31+
.Rewrite(MultiTermQueryRewrite.ConstantScore)
3232
.Transpositions()
3333
)
3434
----
@@ -46,7 +46,7 @@ new FuzzyDateQuery
4646
Value = Project.Instance.StartedOn,
4747
MaxExpansions = 100,
4848
PrefixLength = 3,
49-
Rewrite = RewriteMultiTerm.ConstantScore,
49+
MultiTermQueryRewrite = MultiTermQueryRewrite.ConstantScore,
5050
Transpositions = true
5151
}
5252
----

‎docs/query-dsl/term-level/fuzzy/fuzzy-numeric-query-usage.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ q
2828
.Value(12)
2929
.MaxExpansions(100)
3030
.PrefixLength(3)
31-
.Rewrite(RewriteMultiTerm.ConstantScore)
31+
.Rewrite(MultiTermQueryRewrite.ConstantScore)
3232
.Transpositions()
3333
)
3434
----
@@ -46,7 +46,7 @@ new FuzzyNumericQuery
4646
Value = 12,
4747
MaxExpansions = 100,
4848
PrefixLength = 3,
49-
Rewrite = RewriteMultiTerm.ConstantScore,
49+
MultiTermQueryRewrite = MultiTermQueryRewrite.ConstantScore,
5050
Transpositions = true
5151
}
5252
----

‎docs/query-dsl/term-level/fuzzy/fuzzy-query-usage.asciidoc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ q
2828
.Value("ki")
2929
.MaxExpansions(100)
3030
.PrefixLength(3)
31-
.Rewrite(RewriteMultiTerm.ConstantScore)
31+
.Rewrite(MultiTermQueryRewrite.ConstantScore)
3232
.Transpositions()
3333
)
3434
----
@@ -46,7 +46,7 @@ new FuzzyQuery
4646
Value = "ki",
4747
MaxExpansions = 100,
4848
PrefixLength = 3,
49-
Rewrite = RewriteMultiTerm.ConstantScore,
49+
MultiTermQueryRewrite = MultiTermQueryRewrite.ConstantScore,
5050
Transpositions = true
5151
}
5252
----

‎docs/query-dsl/term-level/prefix/prefix-query-usage.asciidoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ q
2525
.Boost(1.1)
2626
.Field(p => p.Description)
2727
.Value("proj")
28-
.Rewrite(RewriteMultiTerm.TopTermsBoostN)
28+
.Rewrite(MultiTermQueryRewrite.TopTerms(10))
2929
)
3030
----
3131

@@ -39,7 +39,7 @@ new PrefixQuery
3939
Boost = 1.1,
4040
Field = "description",
4141
Value = "proj",
42-
Rewrite = RewriteMultiTerm.TopTermsBoostN
42+
MultiTermQueryRewrite = MultiTermQueryRewrite.TopTerms(10)
4343
}
4444
----
4545

@@ -51,7 +51,7 @@ new PrefixQuery
5151
"description": {
5252
"_name": "named_query",
5353
"boost": 1.1,
54-
"rewrite": "top_terms_boost_N",
54+
"rewrite": "top_terms_10",
5555
"value": "proj"
5656
}
5757
}

‎docs/query-dsl/term-level/wildcard/wildcard-query-usage.asciidoc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ q
2525
.Boost(1.1)
2626
.Field(p => p.Description)
2727
.Value("p*oj")
28-
.Rewrite(RewriteMultiTerm.TopTermsBoostN)
28+
.Rewrite(MultiTermQueryRewrite.TopTermsBoost(10))
2929
)
3030
----
3131

@@ -39,7 +39,7 @@ new WildcardQuery
3939
Boost = 1.1,
4040
Field = "description",
4141
Value = "p*oj",
42-
Rewrite = RewriteMultiTerm.TopTermsBoostN
42+
MultiTermQueryRewrite = MultiTermQueryRewrite.TopTermsBoost(10)
4343
}
4444
----
4545

@@ -51,7 +51,7 @@ new WildcardQuery
5151
"description": {
5252
"_name": "named_query",
5353
"boost": 1.1,
54-
"rewrite": "top_terms_boost_N",
54+
"rewrite": "top_terms_boost_10",
5555
"value": "p*oj"
5656
}
5757
}

0 commit comments

Comments
 (0)