diff --git a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportSchema.java b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportSchema.java index acd55b3eb42be..610c9e1f7566f 100644 --- a/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportSchema.java +++ b/iotdb-client/cli/src/main/java/org/apache/iotdb/tool/ImportSchema.java @@ -115,7 +115,6 @@ private static Options createOptions() { Option opFailedFile = Option.builder(FAILED_FILE_ARGS) - .required(false) .longOpt(FAILED_FILE_NAME) .hasArg() .argName(FAILED_FILE_ARGS_NAME) @@ -124,13 +123,6 @@ private static Options createOptions() { .build(); options.addOption(opFailedFile); - Option opAligned = - Option.builder(ALIGNED_ARGS) - .longOpt(ALIGNED_ARGS) - .desc("Whether import schema as aligned timeseries(optional)") - .build(); - options.addOption(opAligned); - Option opBatchPointSize = Option.builder(BATCH_POINT_SIZE_ARGS) .longOpt(BATCH_POINT_SIZE_NAME) @@ -341,35 +333,35 @@ private static void writeScheme( hasStarted.set(true); } else if (pointSize.get() >= batchPointSize) { try { - writeAndEmptyDataSet( - paths, - dataTypes, - encodings, - compressors, - null, - null, - null, - measurementAlias, - 3); - writeAndEmptyDataSet( - pathsWithAlias, - dataTypesWithAlias, - encodingsWithAlias, - compressorsWithAlias, - null, - null, - null, - null, - 3); - paths.clear(); - dataTypes.clear(); - encodings.clear(); - compressors.clear(); - measurementAlias.clear(); - pointSize.set(0); + if (CollectionUtils.isNotEmpty(paths)) { + writeAndEmptyDataSet( + paths, dataTypes, encodings, compressors, null, null, null, null, 3); + } + } catch (Exception e) { + paths.forEach(t -> failedRecords.add(Collections.singletonList(t))); + } + try { + if (CollectionUtils.isNotEmpty(pathsWithAlias)) { + writeAndEmptyDataSet( + pathsWithAlias, + dataTypesWithAlias, + encodingsWithAlias, + compressorsWithAlias, + null, + null, + null, + measurementAlias, + 3); + } } catch (Exception e) { - failedRecords.add((List) (List) paths); + paths.forEach(t -> failedRecords.add(Collections.singletonList(t))); } + paths.clear(); + dataTypes.clear(); + encodings.clear(); + compressors.clear(); + measurementAlias.clear(); + pointSize.set(0); } } else { paths.clear();