Deprecate _type from LeafDocLookup #37491
Merged
Conversation
This file contains 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
jdconrad
added
:Core/Infra/Scripting
|
Pinging @elastic/es-core-infra |
rjernst
reviewed
Jan 15, 2019
| @@ -72,6 +79,10 @@ public void setDocument(int docId) { | |||
|
|
|||
| @Override | |||
| public ScriptDocValues<?> get(Object key) { | |||
| // deprecate _type | |||
| if ("_type".equals(key)) { | |||
| DEPRECATION_LOGGER.deprecated(TYPES_DEPRECATION_MESSAGE); | |||
There was a problem hiding this comment.
I think this should be deprecatedAndMaybeLog
| public void testTypesDeprecation() { | ||
| ScriptDocValues<?> fetchedDocValues = docLookup.get("_type"); | ||
| assertEquals(docValues, fetchedDocValues); | ||
| assertWarnings("[types removal] Looking up doc types in scripts is deprecated."); |
There was a problem hiding this comment.
If this warning will be written out, then no need for a package private constant in leaf doc lookup.
jtibshirani
approved these changes
Jan 15, 2019
| @@ -72,6 +79,10 @@ public void setDocument(int docId) { | |||
|
|
|||
| @Override | |||
| public ScriptDocValues<?> get(Object key) { | |||
| // deprecate _type | |||
| if ("_type".equals(key)) { | |||
| DEPRECATION_LOGGER.deprecated(TYPES_DEPRECATION_MESSAGE); | |||
There was a problem hiding this comment.
Should we use deprecatedAndMaybeLog?
There was a problem hiding this comment.
:) already done. @rjernst mentioned the same thing.
|
@rjernst @jtibshirani Thanks for the reviews. Will commit as soon as CI passes. |
rjernst
approved these changes
Jan 15, 2019
| @@ -72,6 +79,10 @@ public void setDocument(int docId) { | |||
|
|
|||
| @Override | |||
| public ScriptDocValues<?> get(Object key) { | |||
| // deprecate _type | |||
| if ("_type".equals(key)) { | |||
| DEPRECATION_LOGGER.deprecatedAndMaybeLog(TYPES_DEPRECATION_MESSAGE, TYPES_DEPRECATION_MESSAGE); | |||
There was a problem hiding this comment.
The first argument to deprecatedAndMaybeLog should be an arbitrary key uniquely identifying this deprecation point. Normally it would be something like type-field-doc-lookup.
|
@elasticmachine test this please |
|
@elasticmachine run gradle build tests 1 |
1 similar comment
|
@elasticmachine run gradle build tests 1 |
cshtdd
added a commit
to cshtdd/elasticsearch
that referenced
this pull request
Jan 16, 2019
* master: Deprecate _type from LeafDocLookup (elastic#37491) Allow system privilege to execute proxied actions (elastic#37508) Update Put Watch to allow unknown fields (elastic#37494) AwaitsFix testAddNewReplicas SQL: Add protocol tests and remove jdbc_type from drivers response (elastic#37516) SQL: [Docs] Add an ES-SQL column for data types (elastic#37529) IndexMetaData#mappingOrDefault doesn't need to take a type argument. (elastic#37480) Simplify + Cleanup Dead Code in Settings (elastic#37341) Reject all requests that have an unconsumed body (elastic#37504) [Ml] Prevent config snapshot failure blocking migration (elastic#37493) Fix line length for aliases and remove suppression (elastic#37455) Add SSL Configuration Library (elastic#37287) SQL: Remove slightly used meta commands (elastic#37506) Simplify Snapshot Create Request Handling (elastic#37464) Remove the use of AbstracLifecycleComponent constructor elastic#37488 (elastic#37488) [ML] log minimum diskspace setting if forecast fails due to insufficient d… (elastic#37486)
48 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This change deprecates _type within LeafDocLookup which is currently used by scripts to fetch the type of document. A recent change (#37281) allows this message to be logged from within scripts.