Skip to content

Commit 05d7e9f

Browse files
committed
Merge branch 'master' of github.com:elastic/elasticsearch-net
2 parents fd266b1 + bb0bb81 commit 05d7e9f

File tree

246 files changed

+6925
-2339
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

246 files changed

+6925
-2339
lines changed

docs/asciidoc/client-concepts/high-level/mapping/auto-map.asciidoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,8 @@ var descriptor = new CreateIndexDescriptor("myindex")
134134
);
135135
----
136136

137-
Observe that NEST has inferred the Elasticsearch types based on the CLR type of our POCO properties.
138-
In this example,
137+
Observe that NEST has inferred the Elasticsearch types based on the CLR type of our POCO properties.
138+
In this example,
139139

140140
* Birthday was mapped as a `date`,
141141

@@ -562,7 +562,7 @@ var expected = new
562562
coerce = true,
563563
doc_values = false,
564564
ignore_malformed = true,
565-
type = "double"
565+
type = "float"
566566
}
567567
}
568568
}

docs/asciidoc/code-standards/naming-conventions.asciidoc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -101,13 +101,13 @@ var exceptions = new[] <1>
101101
typeof(IndicesShardStoresRequest),
102102
typeof(RenderSearchTemplateRequest),
103103
//UNMAPPED
104-
typeof(ReindexRequest),
105104
typeof(IngestDeletePipelineRequest),
106105
typeof(IngestGetPipelineRequest),
107106
typeof(IngestPutPipelineRequest),
108107
typeof(IngestSimulateRequest),
109-
typeof(TasksCancelRequest),
110-
typeof(TasksListRequest),
108+
typeof(ClusterAllocationExplainRequest),
109+
typeof(ReindexRethrottleRequest),
110+
//typeof(ReindexRequest),
111111
typeof(UpdateByQueryRequest)
112112
};
113113
Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
:ref_current: https://www.elastic.co/guide/en/elasticsearch/reference/current
2+
3+
:github: https://github.com/elastic/elasticsearch-net
4+
5+
:nuget: https://www.nuget.org/packages
6+
7+
[[converters]]
8+
== Converters
9+
10+
[source,csharp]
11+
----
12+
var converters = typeof(IElasticClient).Assembly().GetTypes()
13+
.Where(t => typeof(JsonConverter).IsAssignableFrom(t))
14+
.ToList();
15+
var visible = new List<string>();
16+
17+
foreach (var converter in converters)
18+
{
19+
if (converter.IsVisible())
20+
visible.Add(converter.Name);
21+
}
22+
23+
visible.Should().BeEmpty();
24+
----
25+

docs/asciidoc/query-dsl-usage.asciidoc

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
:includes-from-dirs: query-dsl/compound,query-dsl/geo,query-dsl/joining,query-dsl/nest-specific,query-dsl/span,query-dsl/specialized,query-dsl/term-level
22

3-
include::../../docs/asciidoc/query-dsl/compound/and/and-query-usage.asciidoc[]
4-
53
include::../../docs/asciidoc/query-dsl/compound/bool/bool-dsl-complex-query-usage.asciidoc[]
64

75
include::../../docs/asciidoc/query-dsl/compound/bool/bool-query-usage.asciidoc[]
@@ -12,8 +10,6 @@ include::../../docs/asciidoc/query-dsl/compound/constant-score/constant-score-qu
1210

1311
include::../../docs/asciidoc/query-dsl/compound/dismax/dismax-query-usage.asciidoc[]
1412

15-
include::../../docs/asciidoc/query-dsl/compound/filtered/filtered-query-usage.asciidoc[]
16-
1713
include::../../docs/asciidoc/query-dsl/compound/full-text/common-terms/common-terms-usage.asciidoc[]
1814

1915
include::../../docs/asciidoc/query-dsl/compound/full-text/match/match-phrase-prefix-usage.asciidoc[]
@@ -34,12 +30,6 @@ include::../../docs/asciidoc/query-dsl/compound/indices/indices-no-match-query-u
3430

3531
include::../../docs/asciidoc/query-dsl/compound/indices/indices-query-usage.asciidoc[]
3632

37-
include::../../docs/asciidoc/query-dsl/compound/limit/limit-query-usage.asciidoc[]
38-
39-
include::../../docs/asciidoc/query-dsl/compound/not/not-query-usage.asciidoc[]
40-
41-
include::../../docs/asciidoc/query-dsl/compound/or/or-query-usage.asciidoc[]
42-
4333
include::../../docs/asciidoc/query-dsl/geo/bounding-box/geo-bounding-box-query-usage.asciidoc[]
4434

4535
include::../../docs/asciidoc/query-dsl/geo/distance/geo-distance-query-usage.asciidoc[]

docs/asciidoc/query-dsl.asciidoc

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
--
88
NEST exposes all of the query DSL endpoints available in Elasticsearch
99

10-
* <<and-query-usage,And Query Usage>>
11-
1210
* <<bool-dsl-complex-query-usage,Bool Dsl Complex Query Usage>>
1311

1412
* <<bool-query-usage,Bool Query Usage>>
@@ -19,8 +17,6 @@ NEST exposes all of the query DSL endpoints available in Elasticsearch
1917

2018
* <<dismax-query-usage,Dismax Query Usage>>
2119

22-
* <<filtered-query-usage,Filtered Query Usage>>
23-
2420
* <<common-terms-usage,Common Terms Usage>>
2521

2622
* <<match-phrase-prefix-usage,Match Phrase Prefix Usage>>
@@ -41,12 +37,6 @@ NEST exposes all of the query DSL endpoints available in Elasticsearch
4137

4238
* <<indices-query-usage,Indices Query Usage>>
4339

44-
* <<limit-query-usage,Limit Query Usage>>
45-
46-
* <<not-query-usage,Not Query Usage>>
47-
48-
* <<or-query-usage,Or Query Usage>>
49-
5040
* <<geo-bounding-box-query-usage,Geo Bounding Box Query Usage>>
5141

5242
* <<geo-distance-query-usage,Geo Distance Query Usage>>

docs/asciidoc/query-dsl/compound/and/and-query-usage.asciidoc

Lines changed: 0 additions & 62 deletions
This file was deleted.

docs/asciidoc/query-dsl/compound/filtered/filtered-query-usage.asciidoc

Lines changed: 0 additions & 56 deletions
This file was deleted.

docs/asciidoc/query-dsl/compound/limit/limit-query-usage.asciidoc

Lines changed: 0 additions & 45 deletions
This file was deleted.

docs/asciidoc/query-dsl/compound/not/not-query-usage.asciidoc

Lines changed: 0 additions & 62 deletions
This file was deleted.

0 commit comments

Comments
 (0)