File tree Expand file tree Collapse file tree 2 files changed +5
-10
lines changed
server/src/main/java/org/elasticsearch
action/admin/indices/mapping/put Expand file tree Collapse file tree 2 files changed +5
-10
lines changed Original file line number Diff line number Diff line change 88
99package org .elasticsearch .action .admin .indices .mapping .put ;
1010
11- import com .carrotsearch .hppc .ObjectHashSet ;
12-
1311import org .elasticsearch .ElasticsearchGenerationException ;
1412import org .elasticsearch .Version ;
1513import org .elasticsearch .action .ActionRequestValidationException ;
3533import java .util .Arrays ;
3634import java .util .Map ;
3735import java .util .Objects ;
36+ import java .util .Set ;
3837
3938import static org .elasticsearch .action .ValidateActions .addValidationError ;
4039
5150 */
5251public class PutMappingRequest extends AcknowledgedRequest <PutMappingRequest > implements IndicesRequest .Replaceable {
5352
54- private static ObjectHashSet <String > RESERVED_FIELDS = ObjectHashSet . from (
53+ private static Set <String > RESERVED_FIELDS = Set . of (
5554 "_uid" ,
5655 "_id" ,
5756 "_type" ,
Original file line number Diff line number Diff line change 88
99package org .elasticsearch .indices ;
1010
11- import com .carrotsearch .hppc .ObjectHashSet ;
12- import com .carrotsearch .hppc .ObjectSet ;
13-
1411import org .apache .lucene .index .DirectoryReader ;
1512import org .apache .lucene .util .Accountable ;
1613import org .apache .lucene .util .RamUsageEstimator ;
3431import java .io .IOException ;
3532import java .util .Collection ;
3633import java .util .Collections ;
34+ import java .util .HashSet ;
3735import java .util .Iterator ;
3836import java .util .Objects ;
3937import java .util .Set ;
@@ -319,10 +317,8 @@ public int hashCode() {
319317 }
320318
321319 synchronized void cleanCache () {
322- final ObjectSet <CleanupKey > currentKeysToClean = new ObjectHashSet <>();
323- final ObjectSet <Object > currentFullClean = new ObjectHashSet <>();
324- currentKeysToClean .clear ();
325- currentFullClean .clear ();
320+ final Set <CleanupKey > currentKeysToClean = new HashSet <>();
321+ final Set <Object > currentFullClean = new HashSet <>();
326322 for (Iterator <CleanupKey > iterator = keysToClean .iterator (); iterator .hasNext ();) {
327323 CleanupKey cleanupKey = iterator .next ();
328324 iterator .remove ();
You can’t perform that action at this time.
0 commit comments