-
Notifications
You must be signed in to change notification settings - Fork 25.6k
Add source mode stats to MappingStats #117463
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Changes from 8 commits
Commits
Show all changes
11 commits
Select commit
Hold shift + click to select a range
00ad196
Add source mode stats to MappingStats
martijnvg ab71f49
fix yaml test
martijnvg c62abcf
Merge remote-tracking branch 'es/main' into source_mode_mapping_stats
martijnvg c579950
Merge remote-tracking branch 'es/main' into source_mode_mapping_stats
martijnvg fb77e38
more tests
martijnvg 800abd1
Merge remote-tracking branch 'es/main' into source_mode_mapping_stats
martijnvg 1ddd071
iter
martijnvg 9cf03fd
don't account _source.mode mapping attributes usages
martijnvg 3388d7b
Merge remote-tracking branch 'es/main' into source_mode_mapping_stats
martijnvg ddf13c1
review feedback
martijnvg 9ff2469
take into account 8.17.x transport version
martijnvg File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
50 changes: 50 additions & 0 deletions
50
...-api-spec/src/yamlRestTest/resources/rest-api-spec/test/cluster.stats/40_source_modes.yml
This file contains hidden or 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,50 @@ | ||
| --- | ||
| test source modes: | ||
| - requires: | ||
| cluster_features: ["cluster.stats.source_modes"] | ||
| reason: requires source modes features | ||
|
|
||
| - do: | ||
| indices.create: | ||
| index: test-synthetic | ||
| body: | ||
| settings: | ||
| index: | ||
| mapping: | ||
| source.mode: synthetic | ||
|
|
||
| - do: | ||
| indices.create: | ||
| index: test-stored | ||
|
|
||
| - do: | ||
| indices.create: | ||
| index: test-disabled | ||
| body: | ||
| settings: | ||
| index: | ||
| mapping: | ||
| source.mode: disabled | ||
|
|
||
| - do: | ||
| bulk: | ||
| refresh: true | ||
| body: | ||
| - '{ "create": { "_index": "test-synthetic" } }' | ||
| - '{ "name": "aaaa", "some_string": "AaAa", "some_int": 1000, "some_double": 123.456789, "some_bool": true }' | ||
| - '{ "create": { "_index": "test-stored" } }' | ||
| - '{ "name": "bbbb", "some_string": "BbBb", "some_int": 2000, "some_double": 321.987654, "some_bool": false }' | ||
| - '{ "create": { "_index": "test-disabled" } }' | ||
| - '{ "name": "cccc", "some_string": "CcCc", "some_int": 3000, "some_double": 421.484654, "some_bool": false }' | ||
|
|
||
| - do: | ||
| search: | ||
| index: test-* | ||
| - match: { hits.total.value: 3 } | ||
|
|
||
| - do: | ||
| cluster.stats: { } | ||
|
|
||
| - match: { indices.mappings.source_modes.disabled: 1 } | ||
| - match: { indices.mappings.source_modes.stored: 1 } | ||
| - match: { indices.mappings.source_modes.synthetic: 1 } |
This file contains hidden or 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 hidden or 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
26 changes: 26 additions & 0 deletions
26
server/src/main/java/org/elasticsearch/action/admin/cluster/stats/ClusterStatsFeatures.java
This file contains hidden or 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,26 @@ | ||
| /* | ||
| * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one | ||
| * or more contributor license agreements. Licensed under the "Elastic License | ||
| * 2.0", the "GNU Affero General Public License v3.0 only", and the "Server Side | ||
| * Public License v 1"; you may not use this file except in compliance with, at | ||
| * your election, the "Elastic License 2.0", the "GNU Affero General Public | ||
| * License v3.0 only", or the "Server Side Public License, v 1". | ||
| */ | ||
|
|
||
| package org.elasticsearch.action.admin.cluster.stats; | ||
|
|
||
| import org.elasticsearch.features.FeatureSpecification; | ||
| import org.elasticsearch.features.NodeFeature; | ||
|
|
||
| import java.util.Set; | ||
|
|
||
| /** | ||
| * Spec for cluster stats features. | ||
| */ | ||
| public class ClusterStatsFeatures implements FeatureSpecification { | ||
|
|
||
| @Override | ||
| public Set<NodeFeature> getFeatures() { | ||
| return Set.of(MappingStats.SOURCE_MODES_FEATURE); | ||
| } | ||
| } |
This file contains hidden or 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 hidden or 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
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
nit: maybe use
map.merge()instead.