jt2594838 commented on code in PR #16722:
URL: https://github.com/apache/iotdb/pull/16722#discussion_r2513515065
##########
integration-test/src/test/java/org/apache/iotdb/db/it/IoTDBLoadTsFileWithModIT.java:
##########
@@ -138,7 +138,53 @@ public void testWithNewModFile()
statement.execute(String.format("load \'%s\'",
tmpDir.getAbsolutePath()));
try (final ResultSet resultSet =
- statement.executeQuery("select count(s1) as c from root.test.d1")) {
+ statement.executeQuery("select count(s1) as c from
root.test.d1.de")) {
+ Assert.assertTrue(resultSet.next());
+ Assert.assertEquals(3, resultSet.getLong("c"));
+ }
+ }
+ }
+
+ @Test
+ public void testWithNewModFileAndLoadAttributes()
+ throws SQLException,
+ IOException,
+ DataRegionException,
+ WriteProcessException,
+ IllegalPathException {
+ generateFileWithNewModFile();
+ final String databaseName = "root.test.d1";
+
+ try (final Connection connection = EnvFactory.getEnv().getConnection();
+ final Statement statement = connection.createStatement()) {
+
+ statement.execute(
+ String.format(
+ "load \'%s\' with ("
+ + "'database-name'='%s',"
+ + "'database-level'='2',"
+ + "'convert-on-type-mismatch'='true',"
+ + "'tablet-conversion-threshold'='1024',"
+ + "'verify'='true',"
+ + "'on-success'='none',"
+ + "'async'='false')",
+ tmpDir.getAbsolutePath(),
+ databaseName));
+
+ boolean databaseFound = false;
+ try (final ResultSet resultSet = statement.executeQuery("show
databases")) {
+ while (resultSet.next()) {
+ final String currentDatabase = resultSet.getString(1);
+ if (databaseName.equalsIgnoreCase(currentDatabase)) {
+ databaseFound = true;
+ break;
+ }
+ }
+ }
+ Assert.assertTrue("database-name parameter should create or locate
root.test", databaseFound);
Review Comment:
The message does not make sense. Maybe you can provide what databases are
found and what is missing.
##########
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/active/ActiveLoadPathHelper.java:
##########
@@ -0,0 +1,301 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.db.storageengine.load.active;
+
+import org.apache.iotdb.commons.conf.IoTDBConstant;
+import org.apache.iotdb.db.exception.sql.SemanticException;
+import org.apache.iotdb.db.queryengine.plan.statement.crud.LoadTsFileStatement;
+import org.apache.iotdb.db.storageengine.load.config.LoadTsFileConfigurator;
+
+import java.io.File;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
+/** Utility methods for encoding and decoding load attributes into directory
structures. */
+public final class ActiveLoadPathHelper {
+
+ private static final String SEGMENT_SEPARATOR = "-";
+
+ private static final List<String> KEY_ORDER =
+ Collections.unmodifiableList(
+ Arrays.asList(
+ LoadTsFileConfigurator.DATABASE_NAME_KEY,
+ LoadTsFileConfigurator.DATABASE_LEVEL_KEY,
+ LoadTsFileConfigurator.CONVERT_ON_TYPE_MISMATCH_KEY,
+ LoadTsFileConfigurator.TABLET_CONVERSION_THRESHOLD_KEY,
+ LoadTsFileConfigurator.VERIFY_KEY));
+
+ private ActiveLoadPathHelper() {
+ throw new IllegalStateException("Utility class");
+ }
+
+ public static Map<String, String> buildAttributes(
+ final String databaseName,
+ final Integer databaseLevel,
+ final Boolean convertOnTypeMismatch,
+ final Boolean verify,
+ final Long tabletConversionThresholdBytes) {
+
+ final Map<String, String> attributes = new LinkedHashMap<>();
+ if (Objects.nonNull(databaseName) && !databaseName.isEmpty()) {
+ attributes.put(LoadTsFileConfigurator.DATABASE_NAME_KEY, databaseName);
+ }
+ if (Objects.nonNull(databaseLevel)) {
+ attributes.put(LoadTsFileConfigurator.DATABASE_LEVEL_KEY,
databaseLevel.toString());
+ }
+ if (Objects.nonNull(convertOnTypeMismatch)) {
+ attributes.put(
+ LoadTsFileConfigurator.CONVERT_ON_TYPE_MISMATCH_KEY,
+ Boolean.toString(convertOnTypeMismatch));
+ }
+ if (Objects.nonNull(tabletConversionThresholdBytes)) {
+ attributes.put(
+ LoadTsFileConfigurator.TABLET_CONVERSION_THRESHOLD_KEY,
+ tabletConversionThresholdBytes.toString());
+ }
+ if (Objects.nonNull(verify)) {
+ attributes.put(LoadTsFileConfigurator.VERIFY_KEY,
Boolean.toString(verify));
+ }
+ return attributes;
+ }
+
+ public static File resolveTargetDir(final File baseDir, final Map<String,
String> attributes) {
+ File current = baseDir;
+ for (final String key : KEY_ORDER) {
+ final String value = attributes.get(key);
+ if (value == null) {
+ continue;
+ }
+ current = new File(current, formatSegment(key, value));
+ // compatibility: keep placing tablet conversion and verify under
convert folder
+ if (LoadTsFileConfigurator.CONVERT_ON_TYPE_MISMATCH_KEY.equals(key)) {
+ final String threshold =
+
attributes.get(LoadTsFileConfigurator.TABLET_CONVERSION_THRESHOLD_KEY);
+ if (threshold != null) {
+ current =
+ new File(
+ current,
+
formatSegment(LoadTsFileConfigurator.TABLET_CONVERSION_THRESHOLD_KEY,
threshold));
+ }
+ final String verify =
attributes.get(LoadTsFileConfigurator.VERIFY_KEY);
+ if (verify != null) {
+ current = new File(current,
formatSegment(LoadTsFileConfigurator.VERIFY_KEY, verify));
+ }
+ return current;
+ }
+ }
+ return current;
+ }
+
+ public static Map<String, String> parseAttributes(final File file, final
File pendingDir) {
+ if (file == null) {
+ return Collections.emptyMap();
+ }
+
+ final Map<String, String> attributes = new HashMap<>();
+ File current = file.getParentFile();
+ boolean convertFolderVisited = false;
+ while (current != null) {
+ final String dirName = current.getName();
+ if (pendingDir != null && current.equals(pendingDir)) {
+ break;
+ }
+ for (final String key : KEY_ORDER) {
+ final String prefix = key + SEGMENT_SEPARATOR;
+ if (dirName.startsWith(prefix)) {
+ extractAndValidateAttributeValue(key, dirName, prefix.length())
+ .ifPresent(value -> attributes.putIfAbsent(key, value));
+ if (LoadTsFileConfigurator.CONVERT_ON_TYPE_MISMATCH_KEY.equals(key))
{
+ convertFolderVisited = true;
+ }
+ break;
+ }
+ }
+ if (convertFolderVisited
+ &&
!attributes.containsKey(LoadTsFileConfigurator.TABLET_CONVERSION_THRESHOLD_KEY)
+ && dirName.startsWith(
+ LoadTsFileConfigurator.TABLET_CONVERSION_THRESHOLD_KEY +
SEGMENT_SEPARATOR)) {
+ extractAndValidateAttributeValue(
+ LoadTsFileConfigurator.TABLET_CONVERSION_THRESHOLD_KEY,
+ dirName,
+ (LoadTsFileConfigurator.TABLET_CONVERSION_THRESHOLD_KEY +
SEGMENT_SEPARATOR)
+ .length())
+ .ifPresent(
+ value ->
+ attributes.putIfAbsent(
+
LoadTsFileConfigurator.TABLET_CONVERSION_THRESHOLD_KEY, value));
+ }
+ if (convertFolderVisited
+ && !attributes.containsKey(LoadTsFileConfigurator.VERIFY_KEY)
+ && dirName.startsWith(LoadTsFileConfigurator.VERIFY_KEY +
SEGMENT_SEPARATOR)) {
+ extractAndValidateAttributeValue(
+ LoadTsFileConfigurator.VERIFY_KEY,
+ dirName,
+ (LoadTsFileConfigurator.VERIFY_KEY +
SEGMENT_SEPARATOR).length())
+ .ifPresent(value ->
attributes.putIfAbsent(LoadTsFileConfigurator.VERIFY_KEY, value));
+ }
+ current = current.getParentFile();
+ }
Review Comment:
Why can't we use a simple split?
##########
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/active/ActiveLoadPathHelper.java:
##########
@@ -0,0 +1,301 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.db.storageengine.load.active;
+
+import org.apache.iotdb.commons.conf.IoTDBConstant;
+import org.apache.iotdb.db.exception.sql.SemanticException;
+import org.apache.iotdb.db.queryengine.plan.statement.crud.LoadTsFileStatement;
+import org.apache.iotdb.db.storageengine.load.config.LoadTsFileConfigurator;
+
+import java.io.File;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
+/** Utility methods for encoding and decoding load attributes into directory
structures. */
+public final class ActiveLoadPathHelper {
+
+ private static final String SEGMENT_SEPARATOR = "-";
+
+ private static final List<String> KEY_ORDER =
+ Collections.unmodifiableList(
+ Arrays.asList(
+ LoadTsFileConfigurator.DATABASE_NAME_KEY,
+ LoadTsFileConfigurator.DATABASE_LEVEL_KEY,
+ LoadTsFileConfigurator.CONVERT_ON_TYPE_MISMATCH_KEY,
+ LoadTsFileConfigurator.TABLET_CONVERSION_THRESHOLD_KEY,
+ LoadTsFileConfigurator.VERIFY_KEY));
+
+ private ActiveLoadPathHelper() {
+ throw new IllegalStateException("Utility class");
+ }
+
+ public static Map<String, String> buildAttributes(
+ final String databaseName,
+ final Integer databaseLevel,
+ final Boolean convertOnTypeMismatch,
+ final Boolean verify,
+ final Long tabletConversionThresholdBytes) {
+
+ final Map<String, String> attributes = new LinkedHashMap<>();
+ if (Objects.nonNull(databaseName) && !databaseName.isEmpty()) {
+ attributes.put(LoadTsFileConfigurator.DATABASE_NAME_KEY, databaseName);
+ }
+ if (Objects.nonNull(databaseLevel)) {
+ attributes.put(LoadTsFileConfigurator.DATABASE_LEVEL_KEY,
databaseLevel.toString());
+ }
+ if (Objects.nonNull(convertOnTypeMismatch)) {
+ attributes.put(
+ LoadTsFileConfigurator.CONVERT_ON_TYPE_MISMATCH_KEY,
+ Boolean.toString(convertOnTypeMismatch));
+ }
+ if (Objects.nonNull(tabletConversionThresholdBytes)) {
+ attributes.put(
+ LoadTsFileConfigurator.TABLET_CONVERSION_THRESHOLD_KEY,
+ tabletConversionThresholdBytes.toString());
+ }
+ if (Objects.nonNull(verify)) {
+ attributes.put(LoadTsFileConfigurator.VERIFY_KEY,
Boolean.toString(verify));
+ }
+ return attributes;
+ }
+
+ public static File resolveTargetDir(final File baseDir, final Map<String,
String> attributes) {
+ File current = baseDir;
+ for (final String key : KEY_ORDER) {
+ final String value = attributes.get(key);
+ if (value == null) {
+ continue;
+ }
+ current = new File(current, formatSegment(key, value));
+ // compatibility: keep placing tablet conversion and verify under
convert folder
+ if (LoadTsFileConfigurator.CONVERT_ON_TYPE_MISMATCH_KEY.equals(key)) {
+ final String threshold =
+
attributes.get(LoadTsFileConfigurator.TABLET_CONVERSION_THRESHOLD_KEY);
+ if (threshold != null) {
+ current =
+ new File(
+ current,
+
formatSegment(LoadTsFileConfigurator.TABLET_CONVERSION_THRESHOLD_KEY,
threshold));
+ }
+ final String verify =
attributes.get(LoadTsFileConfigurator.VERIFY_KEY);
+ if (verify != null) {
+ current = new File(current,
formatSegment(LoadTsFileConfigurator.VERIFY_KEY, verify));
+ }
+ return current;
+ }
Review Comment:
Why do we have these?
##########
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/active/ActiveLoadTsFileLoader.java:
##########
@@ -216,24 +217,29 @@ private Optional<ActiveLoadPendingQueue.ActiveLoadEntry>
tryGetNextPendingFile()
private TSStatus loadTsFile(
final ActiveLoadPendingQueue.ActiveLoadEntry entry, final IClientSession
session)
throws FileNotFoundException {
- final LoadTsFileStatement statement = new
LoadTsFileStatement(entry.getFile());
+ final File tsFile = new File(entry.getFile());
+ final LoadTsFileStatement statement = new
LoadTsFileStatement(tsFile.getAbsolutePath());
final List<File> files = statement.getTsFiles();
- // It should be noted here that the instructions in this code block do not
need to use the
- // DataBase, so the DataBase is assigned a value of null. If the DataBase
is used later, an
- // exception will be thrown.
- final File parentFile;
- statement.setDatabase(
- files.isEmpty()
- || !entry.isTableModel()
- || (parentFile = files.get(0).getParentFile()) == null
- ? null
- : parentFile.getName());
statement.setDeleteAfterLoad(true);
- statement.setConvertOnTypeMismatch(true);
- statement.setVerifySchema(isVerify);
statement.setAutoCreateDatabase(
IoTDBDescriptor.getInstance().getConfig().isAutoCreateSchemaEnabled());
+
+ final File pendingDir =
+ entry.getPendingDir() == null
+ ? ActiveLoadPathHelper.findPendingDirectory(tsFile)
+ : new File(entry.getPendingDir());
+ final Map<String, String> attributes =
ActiveLoadPathHelper.parseAttributes(tsFile, pendingDir);
+ ActiveLoadPathHelper.applyAttributesToStatement(attributes, statement,
isVerify);
+
+ final File parentFile;
+ if (statement.getDatabase() == null && entry.isTableModel()) {
+ statement.setDatabase(
+ files.isEmpty() || (parentFile = files.get(0).getParentFile()) ==
null
Review Comment:
Will files.get(0) definitely be an old file?
##########
iotdb-core/datanode/src/main/java/org/apache/iotdb/db/storageengine/load/active/ActiveLoadPathHelper.java:
##########
@@ -0,0 +1,301 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+package org.apache.iotdb.db.storageengine.load.active;
+
+import org.apache.iotdb.commons.conf.IoTDBConstant;
+import org.apache.iotdb.db.exception.sql.SemanticException;
+import org.apache.iotdb.db.queryengine.plan.statement.crud.LoadTsFileStatement;
+import org.apache.iotdb.db.storageengine.load.config.LoadTsFileConfigurator;
+
+import java.io.File;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.LinkedHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Optional;
+
+/** Utility methods for encoding and decoding load attributes into directory
structures. */
+public final class ActiveLoadPathHelper {
+
+ private static final String SEGMENT_SEPARATOR = "-";
+
+ private static final List<String> KEY_ORDER =
+ Collections.unmodifiableList(
+ Arrays.asList(
+ LoadTsFileConfigurator.DATABASE_NAME_KEY,
+ LoadTsFileConfigurator.DATABASE_LEVEL_KEY,
+ LoadTsFileConfigurator.CONVERT_ON_TYPE_MISMATCH_KEY,
+ LoadTsFileConfigurator.TABLET_CONVERSION_THRESHOLD_KEY,
+ LoadTsFileConfigurator.VERIFY_KEY));
+
+ private ActiveLoadPathHelper() {
+ throw new IllegalStateException("Utility class");
+ }
+
+ public static Map<String, String> buildAttributes(
+ final String databaseName,
+ final Integer databaseLevel,
+ final Boolean convertOnTypeMismatch,
+ final Boolean verify,
+ final Long tabletConversionThresholdBytes) {
+
+ final Map<String, String> attributes = new LinkedHashMap<>();
+ if (Objects.nonNull(databaseName) && !databaseName.isEmpty()) {
+ attributes.put(LoadTsFileConfigurator.DATABASE_NAME_KEY, databaseName);
+ }
+ if (Objects.nonNull(databaseLevel)) {
+ attributes.put(LoadTsFileConfigurator.DATABASE_LEVEL_KEY,
databaseLevel.toString());
+ }
+ if (Objects.nonNull(convertOnTypeMismatch)) {
+ attributes.put(
+ LoadTsFileConfigurator.CONVERT_ON_TYPE_MISMATCH_KEY,
+ Boolean.toString(convertOnTypeMismatch));
+ }
+ if (Objects.nonNull(tabletConversionThresholdBytes)) {
+ attributes.put(
+ LoadTsFileConfigurator.TABLET_CONVERSION_THRESHOLD_KEY,
+ tabletConversionThresholdBytes.toString());
+ }
+ if (Objects.nonNull(verify)) {
+ attributes.put(LoadTsFileConfigurator.VERIFY_KEY,
Boolean.toString(verify));
+ }
+ return attributes;
+ }
+
+ public static File resolveTargetDir(final File baseDir, final Map<String,
String> attributes) {
+ File current = baseDir;
+ for (final String key : KEY_ORDER) {
+ final String value = attributes.get(key);
+ if (value == null) {
+ continue;
+ }
+ current = new File(current, formatSegment(key, value));
+ // compatibility: keep placing tablet conversion and verify under
convert folder
+ if (LoadTsFileConfigurator.CONVERT_ON_TYPE_MISMATCH_KEY.equals(key)) {
+ final String threshold =
+
attributes.get(LoadTsFileConfigurator.TABLET_CONVERSION_THRESHOLD_KEY);
+ if (threshold != null) {
+ current =
+ new File(
+ current,
+
formatSegment(LoadTsFileConfigurator.TABLET_CONVERSION_THRESHOLD_KEY,
threshold));
+ }
+ final String verify =
attributes.get(LoadTsFileConfigurator.VERIFY_KEY);
+ if (verify != null) {
+ current = new File(current,
formatSegment(LoadTsFileConfigurator.VERIFY_KEY, verify));
+ }
+ return current;
+ }
+ }
+ return current;
+ }
+
+ public static Map<String, String> parseAttributes(final File file, final
File pendingDir) {
+ if (file == null) {
+ return Collections.emptyMap();
+ }
+
+ final Map<String, String> attributes = new HashMap<>();
+ File current = file.getParentFile();
+ boolean convertFolderVisited = false;
+ while (current != null) {
+ final String dirName = current.getName();
+ if (pendingDir != null && current.equals(pendingDir)) {
+ break;
+ }
+ for (final String key : KEY_ORDER) {
+ final String prefix = key + SEGMENT_SEPARATOR;
+ if (dirName.startsWith(prefix)) {
+ extractAndValidateAttributeValue(key, dirName, prefix.length())
+ .ifPresent(value -> attributes.putIfAbsent(key, value));
+ if (LoadTsFileConfigurator.CONVERT_ON_TYPE_MISMATCH_KEY.equals(key))
{
+ convertFolderVisited = true;
+ }
+ break;
+ }
+ }
+ if (convertFolderVisited
+ &&
!attributes.containsKey(LoadTsFileConfigurator.TABLET_CONVERSION_THRESHOLD_KEY)
+ && dirName.startsWith(
+ LoadTsFileConfigurator.TABLET_CONVERSION_THRESHOLD_KEY +
SEGMENT_SEPARATOR)) {
+ extractAndValidateAttributeValue(
+ LoadTsFileConfigurator.TABLET_CONVERSION_THRESHOLD_KEY,
+ dirName,
+ (LoadTsFileConfigurator.TABLET_CONVERSION_THRESHOLD_KEY +
SEGMENT_SEPARATOR)
+ .length())
+ .ifPresent(
+ value ->
+ attributes.putIfAbsent(
+
LoadTsFileConfigurator.TABLET_CONVERSION_THRESHOLD_KEY, value));
+ }
+ if (convertFolderVisited
+ && !attributes.containsKey(LoadTsFileConfigurator.VERIFY_KEY)
+ && dirName.startsWith(LoadTsFileConfigurator.VERIFY_KEY +
SEGMENT_SEPARATOR)) {
+ extractAndValidateAttributeValue(
+ LoadTsFileConfigurator.VERIFY_KEY,
+ dirName,
+ (LoadTsFileConfigurator.VERIFY_KEY +
SEGMENT_SEPARATOR).length())
+ .ifPresent(value ->
attributes.putIfAbsent(LoadTsFileConfigurator.VERIFY_KEY, value));
+ }
+ current = current.getParentFile();
+ }
+ return attributes;
+ }
+
+ public static File findPendingDirectory(final File file) {
+ if (file == null) {
+ return null;
+ }
+ File current = file.getParentFile();
+ while (current != null) {
+ if
(IoTDBConstant.LOAD_TSFILE_ACTIVE_LISTENING_PENDING_FOLDER_NAME.equals(
+ current.getName())) {
+ return current;
+ }
Review Comment:
Is it possible that an old database have the same name?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
