Skip to content

Commit bb84ca7

Browse files
authored
Revert "Remove deprecated constant META_FIELDS_BEFORE_7DOT8 (#13860)" (#13916)
* Revert "Remove deprecated constant META_FIELDS_BEFORE_7DOT8 (#13860)" This reverts commit 9832972. * Update CHANGELOG-3.0 Signed-off-by: Craig Perkins <cwperx@amazon.com> --------- Signed-off-by: Craig Perkins <cwperx@amazon.com>
1 parent fffd101 commit bb84ca7

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

CHANGELOG-3.0.md

-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
2424
- Add task completion count in search backpressure stats API ([#10028](https://github.com/opensearch-project/OpenSearch/pull/10028/))
2525
- Deprecate CamelCase `PathHierarchy` tokenizer name in favor to lowercase `path_hierarchy` ([#10894](https://github.com/opensearch-project/OpenSearch/pull/10894))
2626
- Breaking change: Do not request "search_pipelines" metrics by default in NodesInfoRequest ([#12497](https://github.com/opensearch-project/OpenSearch/pull/12497))
27-
- Remove deprecated constant META_FIELDS_BEFORE_7DOT8 ([#13860](https://github.com/opensearch-project/OpenSearch/pull/13860))
2827

2928
### Deprecated
3029

server/src/main/java/org/opensearch/index/mapper/MapperService.java

+6
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
import java.io.Closeable;
7474
import java.io.IOException;
7575
import java.util.ArrayList;
76+
import java.util.Arrays;
7677
import java.util.Collections;
7778
import java.util.HashMap;
7879
import java.util.HashSet;
@@ -200,6 +201,11 @@ public enum MergeReason {
200201
Property.IndexScope,
201202
Property.Deprecated
202203
);
204+
// Deprecated set of meta-fields, for checking if a field is meta, use an instance method isMetadataField instead
205+
@Deprecated
206+
public static final Set<String> META_FIELDS_BEFORE_7DOT8 = Collections.unmodifiableSet(
207+
new HashSet<>(Arrays.asList("_id", IgnoredFieldMapper.NAME, "_index", "_routing", "_size", "_timestamp", "_ttl", "_type"))
208+
);
203209

204210
private static final DeprecationLogger deprecationLogger = DeprecationLogger.getLogger(MapperService.class);
205211

0 commit comments

Comments
 (0)