Skip to content

Commit 7630301

Browse files
Introduce a Few Settings Singleton Instances (#78897) (#78908)
This is mostly motivated by the ILM steps changes, that showed up as hot in profiling since instantiating a `Settings` instance turns out to be somewhat expensive. Also cleans up a couple of other spots and some duplication as well.
1 parent 0989704 commit 7630301

File tree

33 files changed

+101
-74
lines changed

33 files changed

+101
-74
lines changed

client/rest-high-level/src/main/java/org/elasticsearch/client/indices/CreateIndexRequest.java

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@
3636
import java.util.Objects;
3737
import java.util.Set;
3838

39-
import static org.elasticsearch.common.settings.Settings.Builder.EMPTY_SETTINGS;
40-
4139
/**
4240
* A request to create an index.
4341
*/
@@ -47,7 +45,7 @@ public class CreateIndexRequest extends TimedRequest implements Validatable, ToX
4745
static final ParseField ALIASES = new ParseField("aliases");
4846

4947
private final String index;
50-
private Settings settings = EMPTY_SETTINGS;
48+
private Settings settings = Settings.EMPTY;
5149

5250
private BytesReference mappings;
5351
private XContentType mappingsXContentType;

client/rest-high-level/src/main/java/org/elasticsearch/client/indices/IndexTemplateMetadata.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public static class Builder {
178178

179179
private List<String> indexPatterns;
180180

181-
private Settings settings = Settings.Builder.EMPTY_SETTINGS;
181+
private Settings settings = Settings.EMPTY;
182182

183183
private MappingMetadata mappings;
184184

client/rest-high-level/src/main/java/org/elasticsearch/client/indices/PutIndexTemplateRequest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
import java.util.stream.Collectors;
4141

4242
import static org.elasticsearch.action.ValidateActions.addValidationError;
43-
import static org.elasticsearch.common.settings.Settings.Builder.EMPTY_SETTINGS;
4443

4544
/**
4645
* A request to create an index template.
@@ -66,7 +65,7 @@ public class PutIndexTemplateRequest extends MasterNodeRequest<PutIndexTemplateR
6665

6766
private boolean create;
6867

69-
private Settings settings = EMPTY_SETTINGS;
68+
private Settings settings = Settings.EMPTY;
7069

7170
private BytesReference mappings = null;
7271

server/src/internalClusterTest/java/org/elasticsearch/recovery/SimpleRecoveryIT.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ public Settings indexSettings() {
2929
}
3030

3131
protected Settings recoverySettings() {
32-
return Settings.Builder.EMPTY_SETTINGS;
32+
return Settings.EMPTY;
3333
}
3434

3535
@Override

server/src/main/java/org/elasticsearch/action/admin/cluster/repositories/put/PutRepositoryRequest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
import java.util.Map;
2222

2323
import static org.elasticsearch.action.ValidateActions.addValidationError;
24-
import static org.elasticsearch.common.settings.Settings.Builder.EMPTY_SETTINGS;
2524
import static org.elasticsearch.common.settings.Settings.readSettingsFromStream;
2625
import static org.elasticsearch.common.settings.Settings.writeSettingsToStream;
2726

@@ -39,7 +38,7 @@ public class PutRepositoryRequest extends AcknowledgedRequest<PutRepositoryReque
3938

4039
private boolean verify = true;
4140

42-
private Settings settings = EMPTY_SETTINGS;
41+
private Settings settings = Settings.EMPTY;
4342

4443
public PutRepositoryRequest(StreamInput in) throws IOException {
4544
super(in);

server/src/main/java/org/elasticsearch/action/admin/cluster/settings/ClusterUpdateSettingsRequest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@
2626
import static org.elasticsearch.action.ValidateActions.addValidationError;
2727
import static org.elasticsearch.common.settings.Settings.readSettingsFromStream;
2828
import static org.elasticsearch.common.settings.Settings.writeSettingsToStream;
29-
import static org.elasticsearch.common.settings.Settings.Builder.EMPTY_SETTINGS;
3029

3130
/**
3231
* Request for an update cluster settings action
@@ -44,8 +43,8 @@ public class ClusterUpdateSettingsRequest extends AcknowledgedRequest<ClusterUpd
4443
PARSER.declareObject((r, t) -> r.transientSettings = t, (p, c) -> Settings.fromXContent(p), TRANSIENT);
4544
}
4645

47-
private Settings transientSettings = EMPTY_SETTINGS;
48-
private Settings persistentSettings = EMPTY_SETTINGS;
46+
private Settings transientSettings = Settings.EMPTY;
47+
private Settings persistentSettings = Settings.EMPTY;
4948

5049
public ClusterUpdateSettingsRequest(StreamInput in) throws IOException {
5150
super(in);

server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/create/CreateSnapshotRequest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333

3434
import static org.elasticsearch.action.ValidateActions.addValidationError;
3535
import static org.elasticsearch.common.Strings.EMPTY_ARRAY;
36-
import static org.elasticsearch.common.settings.Settings.Builder.EMPTY_SETTINGS;
3736
import static org.elasticsearch.common.settings.Settings.readSettingsFromStream;
3837
import static org.elasticsearch.common.settings.Settings.writeSettingsToStream;
3938
import static org.elasticsearch.common.xcontent.support.XContentMapValues.nodeBooleanValue;
@@ -70,7 +69,7 @@ public class CreateSnapshotRequest extends MasterNodeRequest<CreateSnapshotReque
7069

7170
private boolean partial = false;
7271

73-
private Settings settings = EMPTY_SETTINGS;
72+
private Settings settings = Settings.EMPTY;
7473

7574
private boolean includeGlobalState = true;
7675

server/src/main/java/org/elasticsearch/action/admin/cluster/snapshots/restore/RestoreSnapshotRequest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
import java.util.Objects;
3232

3333
import static org.elasticsearch.action.ValidateActions.addValidationError;
34-
import static org.elasticsearch.common.settings.Settings.Builder.EMPTY_SETTINGS;
3534
import static org.elasticsearch.common.settings.Settings.readSettingsFromStream;
3635
import static org.elasticsearch.common.settings.Settings.writeSettingsToStream;
3736
import static org.elasticsearch.common.xcontent.support.XContentMapValues.nodeBooleanValue;
@@ -55,7 +54,7 @@ public class RestoreSnapshotRequest extends MasterNodeRequest<RestoreSnapshotReq
5554
private boolean includeGlobalState = false;
5655
private boolean partial = false;
5756
private boolean includeAliases = true;
58-
private Settings indexSettings = EMPTY_SETTINGS;
57+
private Settings indexSettings = Settings.EMPTY;
5958
private String[] ignoreIndexSettings = Strings.EMPTY_ARRAY;
6059

6160
// This field does not get serialised (except toString for debugging purpose) because it is always set locally by authz

server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexClusterStateUpdateRequest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ public class CreateIndexClusterStateUpdateRequest extends ClusterStateUpdateRequ
3838
private boolean copySettings;
3939
private SystemDataStreamDescriptor systemDataStreamDescriptor;
4040

41-
private Settings settings = Settings.Builder.EMPTY_SETTINGS;
41+
private Settings settings = Settings.EMPTY;
4242

4343
private final Map<String, String> mappings = new HashMap<>();
4444

server/src/main/java/org/elasticsearch/action/admin/indices/create/CreateIndexRequest.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import java.util.Set;
4646

4747
import static org.elasticsearch.action.ValidateActions.addValidationError;
48-
import static org.elasticsearch.common.settings.Settings.Builder.EMPTY_SETTINGS;
4948
import static org.elasticsearch.common.settings.Settings.readSettingsFromStream;
5049
import static org.elasticsearch.common.settings.Settings.writeSettingsToStream;
5150

@@ -68,7 +67,7 @@ public class CreateIndexRequest extends AcknowledgedRequest<CreateIndexRequest>
6867

6968
private String index;
7069

71-
private Settings settings = EMPTY_SETTINGS;
70+
private Settings settings = Settings.EMPTY;
7271

7372
private final Map<String, String> mappings = new HashMap<>();
7473

@@ -127,7 +126,7 @@ public CreateIndexRequest() {
127126
* @param index the name of the index
128127
*/
129128
public CreateIndexRequest(String index) {
130-
this(index, EMPTY_SETTINGS);
129+
this(index, Settings.EMPTY);
131130
}
132131

133132
/**

0 commit comments

Comments
 (0)