Skip to content

Commit 8e27229

Browse files
committed
apply
1 parent 89bdeb5 commit 8e27229

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/conf/SystemPropertiesUtils.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,11 +217,11 @@ public static void checkSystemProperties() throws IOException {
217217
if (systemProperties.getProperty("restrict_object_limit", null) != null) {
218218
boolean restrictObjectLimit =
219219
Boolean.parseBoolean(systemProperties.getProperty("restrict_object_limit"));
220-
if (restrictObjectLimit != COMMON_CONFIG.getRestrictObjectLimit()) {
220+
if (restrictObjectLimit != COMMON_CONFIG.isRestrictObjectLimit()) {
221221
LOGGER.warn(
222222
format,
223223
"restrict_object_limit",
224-
COMMON_CONFIG.getRestrictObjectLimit(),
224+
COMMON_CONFIG.isRestrictObjectLimit(),
225225
restrictObjectLimit);
226226
COMMON_CONFIG.setRestrictObjectLimit(restrictObjectLimit);
227227
}
@@ -300,7 +300,7 @@ public static void storeSystemParameters() throws IOException {
300300
systemProperties.setProperty(
301301
"enable_grant_option", String.valueOf(COMMON_CONFIG.getEnableGrantOption()));
302302
systemProperties.setProperty(
303-
"restrict_object_limit", String.valueOf(COMMON_CONFIG.getRestrictObjectLimit()));
303+
"restrict_object_limit", String.valueOf(COMMON_CONFIG.isRestrictObjectLimit()));
304304
systemPropertiesHandler.overwrite(systemProperties);
305305
}
306306

iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/node/NodeManager.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,7 @@ private void setGlobalConfig(ConfigurationResp dataSet) {
179179
globalConfig.setSchemaEngineMode(commonConfig.getSchemaEngineMode());
180180
globalConfig.setTagAttributeTotalSize(commonConfig.getTagAttributeTotalSize());
181181
globalConfig.setEnableGrantOption(commonConfig.getEnableGrantOption());
182-
globalConfig.setRestrictObjectLimit(commonConfig.getRestrictObjectLimit());
182+
globalConfig.setRestrictObjectLimit(commonConfig.isRestrictObjectLimit());
183183
dataSet.setGlobalConfig(globalConfig);
184184
}
185185

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/relational/metadata/fetcher/TableDeviceSchemaValidator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -252,7 +252,7 @@ private void autoCreateOrUpdateDeviceSchema(
252252
}
253253

254254
public static void checkObject4DeviceId(final Object[] deviceId) {
255-
if (!CommonDescriptor.getInstance().getConfig().getRestrictObjectLimit()) {
255+
if (!CommonDescriptor.getInstance().getConfig().isRestrictObjectLimit()) {
256256
return;
257257
}
258258
for (final Object part : deviceId) {

iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/dataregion/IObjectPath.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ interface Factory {
4848
IObjectPath create(int regionId, long time, IDeviceID iDeviceID, String measurement);
4949

5050
Factory FACTORY =
51-
CONFIG.getRestrictObjectLimit()
51+
CONFIG.isRestrictObjectLimit()
5252
? PlainObjectPath.getFACTORY()
5353
: Base32ObjectPath.getFACTORY();
5454
}
@@ -63,7 +63,7 @@ interface Deserializer {
6363
}
6464

6565
static Deserializer getDeserializer() {
66-
return CONFIG.getRestrictObjectLimit()
66+
return CONFIG.isRestrictObjectLimit()
6767
? PlainObjectPath.getDESERIALIZER()
6868
: Base32ObjectPath.getDESERIALIZER();
6969
}

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonConfig.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2730,7 +2730,7 @@ public void setAuditableOperationResult(String auditableOperationResult) {
27302730
this.auditableOperationResult = auditableOperationResult;
27312731
}
27322732

2733-
public boolean getRestrictObjectLimit() {
2733+
public boolean isRestrictObjectLimit() {
27342734
return restrictObjectLimit;
27352735
}
27362736

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/conf/CommonDescriptor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,7 @@ public void loadCommonProps(TrimProperties properties) throws IOException {
284284
config.setRestrictObjectLimit(
285285
Boolean.parseBoolean(
286286
properties.getProperty(
287-
"restrict_object_limit", String.valueOf(config.getRestrictObjectLimit()))));
287+
"restrict_object_limit", String.valueOf(config.isRestrictObjectLimit()))));
288288

289289
loadRetryProperties(properties);
290290
loadBinaryAllocatorProps(properties);

iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/schema/table/TsTable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -415,7 +415,7 @@ public void setProps(Map<String, String> props) {
415415
}
416416

417417
public void checkTableNameAndObjectNames4Object() throws MetadataException {
418-
if (!CommonDescriptor.getInstance().getConfig().getRestrictObjectLimit()) {
418+
if (!CommonDescriptor.getInstance().getConfig().isRestrictObjectLimit()) {
419419
return;
420420
}
421421
if (isInvalid4ObjectType(tableName)) {

0 commit comments

Comments
 (0)