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 8
8
9
9
package org .elasticsearch .action .admin .indices .mapping .put ;
10
10
11
- import com .carrotsearch .hppc .ObjectHashSet ;
12
-
13
11
import org .elasticsearch .ElasticsearchGenerationException ;
14
12
import org .elasticsearch .Version ;
15
13
import org .elasticsearch .action .ActionRequestValidationException ;
35
33
import java .util .Arrays ;
36
34
import java .util .Map ;
37
35
import java .util .Objects ;
36
+ import java .util .Set ;
38
37
39
38
import static org .elasticsearch .action .ValidateActions .addValidationError ;
40
39
51
50
*/
52
51
public class PutMappingRequest extends AcknowledgedRequest <PutMappingRequest > implements IndicesRequest .Replaceable {
53
52
54
- private static ObjectHashSet <String > RESERVED_FIELDS = ObjectHashSet . from (
53
+ private static Set <String > RESERVED_FIELDS = Set . of (
55
54
"_uid" ,
56
55
"_id" ,
57
56
"_type" ,
Original file line number Diff line number Diff line change 8
8
9
9
package org .elasticsearch .indices ;
10
10
11
- import com .carrotsearch .hppc .ObjectHashSet ;
12
- import com .carrotsearch .hppc .ObjectSet ;
13
-
14
11
import org .apache .lucene .index .DirectoryReader ;
15
12
import org .apache .lucene .util .Accountable ;
16
13
import org .apache .lucene .util .RamUsageEstimator ;
34
31
import java .io .IOException ;
35
32
import java .util .Collection ;
36
33
import java .util .Collections ;
34
+ import java .util .HashSet ;
37
35
import java .util .Iterator ;
38
36
import java .util .Objects ;
39
37
import java .util .Set ;
@@ -319,10 +317,8 @@ public int hashCode() {
319
317
}
320
318
321
319
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 <>();
326
322
for (Iterator <CleanupKey > iterator = keysToClean .iterator (); iterator .hasNext ();) {
327
323
CleanupKey cleanupKey = iterator .next ();
328
324
iterator .remove ();
You can’t perform that action at this time.
0 commit comments