Skip to content

[IOTDB-773] add tag attribute size in config check #1381

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
qiaojialin merged 2 commits into from
Jun 17, 2020
Merged

[IOTDB-773] add tag attribute size in config check #1381

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d74adcc
add tag size in config check
qiaojialin Jun 17, 2020
fba4487
add tag size in config check
qiaojialin Jun 17, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 35 additions & 7 deletions server/src/main/java/org/apache/iotdb/db/conf/IoTDBConfigCheck.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
import org.apache.iotdb.db.metadata.MLogWriter;
import org.apache.iotdb.db.metadata.MetadataConstant;
import org.apache.iotdb.tsfile.common.conf.TSFileConfig;
import org.apache.iotdb.tsfile.common.conf.TSFileDescriptor;
import org.apache.iotdb.tsfile.common.constant.TsFileConstant;
import org.apache.iotdb.tsfile.fileSystem.FSFactoryProducer;
import org.slf4j.Logger;
Expand Down Expand Up @@ -69,8 +70,16 @@ public class IoTDBConfigCheck {
private static final String ENABLE_PARTITION_STRING = "enable_partition";
private static boolean enablePartition = IoTDBDescriptor.getInstance().getConfig().isEnablePartition();

private static final String TAG_ATTRIBUTE_SIZE_STRING = "tag_attribute_total_size";
private static final String tagAttributeTotalSize = String.valueOf(IoTDBDescriptor.getInstance().getConfig().getTagAttributeTotalSize());

private static final String MAX_DEGREE_OF_INDEX_STRING = "max_degree_of_index_node";
private static final String maxDegreeOfIndexNode = String.valueOf(TSFileDescriptor.getInstance().getConfig().getMaxDegreeOfIndexNode());

private static final String IOTDB_VERSION_STRING = "iotdb_version";

private static final String ERROR_LOG = "Wrong %s, please set as: %s !";


public static IoTDBConfigCheck getInstance() {
return IoTDBConfigCheckHolder.INSTANCE;
Expand Down Expand Up @@ -112,11 +121,13 @@ private IoTDBConfigCheck() {
System.exit(-1);
}

systemProperties.put(IOTDB_VERSION_STRING, IoTDBConstant.VERSION);
systemProperties.put(TIMESTAMP_PRECISION_STRING, timestampPrecision);
systemProperties.put(PARTITION_INTERVAL_STRING, String.valueOf(partitionInterval));
systemProperties.put(TSFILE_FILE_SYSTEM_STRING, tsfileFileSystem);
systemProperties.put(ENABLE_PARTITION_STRING, String.valueOf(enablePartition));
systemProperties.put(IOTDB_VERSION_STRING, IoTDBConstant.VERSION);
systemProperties.put(TAG_ATTRIBUTE_SIZE_STRING, tagAttributeTotalSize);
systemProperties.put(MAX_DEGREE_OF_INDEX_STRING, maxDegreeOfIndexNode);
}


Expand Down Expand Up @@ -195,6 +206,8 @@ private void upgradePropertiesFile()
properties.setProperty(TSFILE_FILE_SYSTEM_STRING, tsfileFileSystem);
properties.setProperty(IOTDB_VERSION_STRING, IoTDBConstant.VERSION);
properties.setProperty(ENABLE_PARTITION_STRING, String.valueOf(enablePartition));
properties.setProperty(TAG_ATTRIBUTE_SIZE_STRING, tagAttributeTotalSize);
properties.setProperty(MAX_DEGREE_OF_INDEX_STRING, maxDegreeOfIndexNode);
properties.store(tmpFOS, SYSTEM_PROPERTIES_STRING);

// upgrade finished, delete old system.properties file
Expand Down Expand Up @@ -237,6 +250,9 @@ private void upgradePropertiesFileFromBrokenFile()
}
}

/**
* Check all immutable properties
*/
private void checkProperties() throws IOException {
for (Entry<String, String> entry : systemProperties.entrySet()) {
if (!properties.containsKey(entry.getKey())) {
Expand All @@ -246,20 +262,32 @@ private void checkProperties() throws IOException {
}

if (!properties.getProperty(TIMESTAMP_PRECISION_STRING).equals(timestampPrecision)) {
logger.error("Wrong {}, please set as: {} !", TIMESTAMP_PRECISION_STRING, properties
.getProperty(TIMESTAMP_PRECISION_STRING));
logger.error(String.format(ERROR_LOG, TIMESTAMP_PRECISION_STRING, properties
.getProperty(TIMESTAMP_PRECISION_STRING)));
System.exit(-1);
}

if (Long.parseLong(properties.getProperty(PARTITION_INTERVAL_STRING)) != partitionInterval) {
logger.error("Wrong {}, please set as: {} !", PARTITION_INTERVAL_STRING, properties
.getProperty(PARTITION_INTERVAL_STRING));
logger.error(String.format(ERROR_LOG, PARTITION_INTERVAL_STRING, properties
.getProperty(PARTITION_INTERVAL_STRING)));
System.exit(-1);
}

if (!(properties.getProperty(TSFILE_FILE_SYSTEM_STRING).equals(tsfileFileSystem))) {
logger.error("Wrong {}, please set as: {} !", TSFILE_FILE_SYSTEM_STRING, properties
.getProperty(TSFILE_FILE_SYSTEM_STRING));
logger.error(String.format(ERROR_LOG, TSFILE_FILE_SYSTEM_STRING, properties
.getProperty(TSFILE_FILE_SYSTEM_STRING)));
System.exit(-1);
}

if (!(properties.getProperty(TAG_ATTRIBUTE_SIZE_STRING).equals(tagAttributeTotalSize))) {
logger.error(String.format(ERROR_LOG, TAG_ATTRIBUTE_SIZE_STRING, properties
.getProperty(TAG_ATTRIBUTE_SIZE_STRING)));
System.exit(-1);
}

if (!(properties.getProperty(MAX_DEGREE_OF_INDEX_STRING).equals(maxDegreeOfIndexNode))) {
logger.error(String.format(ERROR_LOG, MAX_DEGREE_OF_INDEX_STRING, properties
.getProperty(MAX_DEGREE_OF_INDEX_STRING)));
System.exit(-1);
}
}
Expand Down