Skip to content

Commit 4179866

Browse files
MpdreamzMpdreamz
committed
Merge branch '2.x' of github.com:elastic/elasticsearch-net into 2.x
2 parents fc7688d + 4dac582 commit 4179866

40 files changed

+84
-49
lines changed

‎docs/asciidoc/aggregations/bucket/filter/filter-aggregation-usage.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
[[filter-aggregation-usage]]
88
== Filter Aggregation Usage
99

10-
Defines a single bucket of all the documents in the current document set context that match a specified filter.
10+
Defines a single bucket of all the documents in the current document set context that match a specified filter.
1111
Often this will be used to narrow down the current aggregation context to a specific set of documents.
1212

1313
Be sure to read the Elasticsearch documentation on {ref_current}/search-aggregations-bucket-filter-aggregation.html[Filter Aggregation]

‎docs/asciidoc/aggregations/pipeline/moving-average/moving-average-ewma-aggregation-usage.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ new SearchRequest<Project>()
4545
{
4646
Field = "startedOn",
4747
Interval = DateInterval.Month,
48-
Aggregations =
48+
Aggregations =
4949
new SumAggregation("commits", "numberOfCommits") &&
5050
new MovingAverageAggregation("commits_moving_avg", "commits")
5151
{

‎docs/asciidoc/aggregations/pipeline/moving-average/moving-average-holt-linear-aggregation-usage.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ new SearchRequest<Project>()
4646
{
4747
Field = "startedOn",
4848
Interval = DateInterval.Month,
49-
Aggregations =
49+
Aggregations =
5050
new SumAggregation("commits", "numberOfCommits") &&
5151
new MovingAverageAggregation("commits_moving_avg", "commits")
5252
{

‎docs/asciidoc/aggregations/pipeline/moving-average/moving-average-holt-winters-aggregation-usage.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ new SearchRequest<Project>()
5151
{
5252
Field = "startedOn",
5353
Interval = DateInterval.Month,
54-
Aggregations =
54+
Aggregations =
5555
new SumAggregation("commits", "numberOfCommits") &&
5656
new MovingAverageAggregation("commits_moving_avg", "commits")
5757
{

‎docs/asciidoc/aggregations/pipeline/moving-average/moving-average-linear-aggregation-usage.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ new SearchRequest<Project>()
4444
{
4545
Field = "startedOn",
4646
Interval = DateInterval.Month,
47-
Aggregations =
47+
Aggregations =
4848
new SumAggregation("commits", "numberOfCommits") &&
4949
new MovingAverageAggregation("commits_moving_avg", "commits")
5050
{

‎docs/asciidoc/aggregations/pipeline/moving-average/moving-average-simple-aggregation-usage.asciidoc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ new SearchRequest<Project>()
4545
{
4646
Field = "startedOn",
4747
Interval = DateInterval.Month,
48-
Aggregations =
48+
Aggregations =
4949
new SumAggregation("commits", "numberOfCommits") &&
5050
new MovingAverageAggregation("commits_moving_avg", "commits")
5151
{

‎docs/asciidoc/query-dsl/specialized/script/script-query-usage.asciidoc‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,10 @@
77
[[script-query-usage]]
88
== Script Query Usage
99

10+
A query allowing to define {ref_current}/modules-scripting.html[scripts] as queries.
11+
12+
See the Elasticsearch documentation on {ref_current}/query-dsl-script-query.html[script query] for more details.
13+
1014
=== Fluent DSL Example
1115

1216
[source,csharp]
@@ -16,7 +20,7 @@ q
1620
.Name("named_query")
1721
.Boost(1.1)
1822
.Inline(_templateString)
19-
.Params(p=>p.Add("param1", 1))
23+
.Params(p => p.Add("param1", 50))
2024
)
2125
----
2226

@@ -31,7 +35,7 @@ new ScriptQuery
3135
Inline = _templateString,
3236
Params = new Dictionary<string, object>
3337
{
34-
{ "param1", 1 }
38+
{ "param1", 50 }
3539
}
3640
}
3741
----
@@ -44,12 +48,20 @@ new ScriptQuery
4448
"_name": "named_query",
4549
"boost": 1.1,
4650
"script": {
47-
"inline": "doc['num1'].value > param1",
51+
"inline": "doc['numberOfCommits'].value > param1",
4852
"params": {
49-
"param1": 1
53+
"param1": 50
5054
}
5155
}
5256
}
5357
}
5458
----
5559

60+
=== Handling Responses
61+
62+
[source,csharp]
63+
----
64+
response.IsValid.Should().BeTrue();
65+
response.Documents.Count().Should().BeGreaterThan(0);
66+
----
67+

‎src/Nest/Nest.csproj‎

Lines changed: 31 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -1207,37 +1207,37 @@
12071207
<Compile Include="XPack\License\PostLicense\LicenseAcknowledgement.cs" />
12081208
<Compile Include="XPack\License\PostLicense\PostLicenseRequest.cs" />
12091209
<Compile Include="XPack\License\PostLicense\PostLicenseResponse.cs" />
1210-
<Compile Include="XPack\Shield\Authenticate\ElasticClient-Authenticate.cs" />
1211-
<Compile Include="XPack\Shield\Authenticate\AuthenticateRequest.cs" />
1212-
<Compile Include="XPack\Shield\Authenticate\AuthenticateResponse.cs" />
1213-
<Compile Include="XPack\Shield\ClearCachedRealms\ClearCachedRealmsRequest.cs" />
1214-
<Compile Include="XPack\Shield\ClearCachedRealms\ClearCachedRealmsResponse.cs" />
1215-
<Compile Include="XPack\Shield\ClearCachedRealms\ElasticClient-ClearCachedRealms.cs" />
1216-
<Compile Include="XPack\Shield\Role\ClearCachedRoles\ClearCachedRolesRequest.cs" />
1217-
<Compile Include="XPack\Shield\Role\ClearCachedRoles\ClearCachedRolesResponse.cs" />
1218-
<Compile Include="XPack\Shield\Role\ClearCachedRoles\ElasticClient-ClearCachedRoles.cs" />
1219-
<Compile Include="XPack\Shield\ShieldNode.cs" />
1220-
<Compile Include="XPack\Shield\ShieldNodeStatus.cs" />
1221-
<Compile Include="XPack\Shield\Role\DeleteRole\DeleteRoleRequest.cs" />
1222-
<Compile Include="XPack\Shield\Role\DeleteRole\DeleteRoleResponse.cs" />
1223-
<Compile Include="XPack\Shield\Role\DeleteRole\ElasticClient-DeleteRole.cs" />
1224-
<Compile Include="XPack\Shield\Role\GetRole\ElasticClient-GetRole.cs" />
1225-
<Compile Include="XPack\Shield\Role\GetRole\GetRoleRequest.cs" />
1226-
<Compile Include="XPack\Shield\Role\GetRole\GetRoleResponse.cs" />
1227-
<Compile Include="XPack\Shield\Role\GetRole\Role.cs" />
1228-
<Compile Include="XPack\Shield\Role\PutRole\ElasticClient-PutRole.cs" />
1229-
<Compile Include="XPack\Shield\Role\PutRole\IndicesPrivileges.cs" />
1230-
<Compile Include="XPack\Shield\Role\PutRole\PutRoleRequest.cs" />
1231-
<Compile Include="XPack\Shield\Role\PutRole\PutRoleResponse.cs" />
1232-
<Compile Include="XPack\Shield\User\DeleteUser\ElasticClient-DeleteUser.cs" />
1233-
<Compile Include="XPack\Shield\User\DeleteUser\DeleteUserRequest.cs" />
1234-
<Compile Include="XPack\Shield\User\DeleteUser\DeleteUserResponse.cs" />
1235-
<Compile Include="XPack\Shield\User\GetUser\ElasticClient-GetUser.cs" />
1236-
<Compile Include="XPack\Shield\User\GetUser\GetUserResponse.cs" />
1237-
<Compile Include="XPack\Shield\User\GetUser\GetUserRequest.cs" />
1238-
<Compile Include="XPack\Shield\User\PutUser\PutUserRequest.cs" />
1239-
<Compile Include="XPack\Shield\User\PutUser\PutUserResponse.cs" />
1240-
<Compile Include="XPack\Shield\User\PutUser\ElasticClient-PutUser.cs" />
1210+
<Compile Include="XPack\Security\Authenticate\ElasticClient-Authenticate.cs" />
1211+
<Compile Include="XPack\Security\Authenticate\AuthenticateRequest.cs" />
1212+
<Compile Include="XPack\Security\Authenticate\AuthenticateResponse.cs" />
1213+
<Compile Include="XPack\Security\ClearCachedRealms\ClearCachedRealmsRequest.cs" />
1214+
<Compile Include="XPack\Security\ClearCachedRealms\ClearCachedRealmsResponse.cs" />
1215+
<Compile Include="XPack\Security\ClearCachedRealms\ElasticClient-ClearCachedRealms.cs" />
1216+
<Compile Include="XPack\Security\Role\ClearCachedRoles\ClearCachedRolesRequest.cs" />
1217+
<Compile Include="XPack\Security\Role\ClearCachedRoles\ClearCachedRolesResponse.cs" />
1218+
<Compile Include="XPack\Security\Role\ClearCachedRoles\ElasticClient-ClearCachedRoles.cs" />
1219+
<Compile Include="XPack\Security\ShieldNode.cs" />
1220+
<Compile Include="XPack\Security\ShieldNodeStatus.cs" />
1221+
<Compile Include="XPack\Security\Role\DeleteRole\DeleteRoleRequest.cs" />
1222+
<Compile Include="XPack\Security\Role\DeleteRole\DeleteRoleResponse.cs" />
1223+
<Compile Include="XPack\Security\Role\DeleteRole\ElasticClient-DeleteRole.cs" />
1224+
<Compile Include="XPack\Security\Role\GetRole\ElasticClient-GetRole.cs" />
1225+
<Compile Include="XPack\Security\Role\GetRole\GetRoleRequest.cs" />
1226+
<Compile Include="XPack\Security\Role\GetRole\GetRoleResponse.cs" />
1227+
<Compile Include="XPack\Security\Role\GetRole\Role.cs" />
1228+
<Compile Include="XPack\Security\Role\PutRole\ElasticClient-PutRole.cs" />
1229+
<Compile Include="XPack\Security\Role\PutRole\IndicesPrivileges.cs" />
1230+
<Compile Include="XPack\Security\Role\PutRole\PutRoleRequest.cs" />
1231+
<Compile Include="XPack\Security\Role\PutRole\PutRoleResponse.cs" />
1232+
<Compile Include="XPack\Security\User\DeleteUser\ElasticClient-DeleteUser.cs" />
1233+
<Compile Include="XPack\Security\User\DeleteUser\DeleteUserRequest.cs" />
1234+
<Compile Include="XPack\Security\User\DeleteUser\DeleteUserResponse.cs" />
1235+
<Compile Include="XPack\Security\User\GetUser\ElasticClient-GetUser.cs" />
1236+
<Compile Include="XPack\Security\User\GetUser\GetUserResponse.cs" />
1237+
<Compile Include="XPack\Security\User\GetUser\GetUserRequest.cs" />
1238+
<Compile Include="XPack\Security\User\PutUser\PutUserRequest.cs" />
1239+
<Compile Include="XPack\Security\User\PutUser\PutUserResponse.cs" />
1240+
<Compile Include="XPack\Security\User\PutUser\ElasticClient-PutUser.cs" />
12411241
<Compile Include="_Generated\_Descriptors.generated.cs" />
12421242
<Compile Include="_Generated\_LowLevelDispatch.generated.cs" />
12431243
<Compile Include="_Generated\_RequestParametersExtensions.Generated.cs" />

‎src/Nest/XPack/Shield/Authenticate/AuthenticateRequest.cs‎ renamed to ‎src/Nest/XPack/Security/Authenticate/AuthenticateRequest.cs‎

File renamed without changes.

‎src/Nest/XPack/Shield/Authenticate/AuthenticateResponse.cs‎ renamed to ‎src/Nest/XPack/Security/Authenticate/AuthenticateResponse.cs‎

File renamed without changes.

0 commit comments

Comments
 (0)