Skip to content

Commit

Permalink
Load: Support remote load in import-tsfile script (#13352)
Browse files Browse the repository at this point in the history 
Co-authored-by: Steve Yurong Su <[email protected]>
  • Loading branch information
@YC27 @SteveYurongSu
YC27 and SteveYurongSu authored Sep 6, 2024
1 parent d982a22 commit 8a2aba2
Show file tree
Hide file tree
Showing 24 changed files with 818 additions and 260 deletions.
10 changes: 10 additions & 0 deletions iotdb-client/cli/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,16 @@
<artifactId>iotdb-thrift</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>iotdb-thrift-commons</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.iotdb</groupId>
<artifactId>pipe-api</artifactId>
<version>2.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Expand Down
2 changes: 1 addition & 1 deletion iotdb-client/cli/src/assembly/resources/tools/backup.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ echo Starting IoTDB Client Data Back Script
echo ------------------------------------------

set CLASSPATH="%IOTDB_HOME%\lib\*"
if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.tool.IoTDBDataBackTool
if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.tool.backup.IoTDBDataBackTool

set logsDir="%IOTDB_HOME%\logs"
if not exist "%logsDir%" (
Expand Down
2 changes: 1 addition & 1 deletion iotdb-client/cli/src/assembly/resources/tools/export-data.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ pushd %~dp0..
if NOT DEFINED IOTDB_HOME set IOTDB_HOME=%CD%
popd

if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.tool.ExportData
if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.tool.data.ExportData
if NOT DEFINED JAVA_HOME goto :err

@REM -----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion iotdb-client/cli/src/assembly/resources/tools/export-schema.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ pushd %~dp0..
if NOT DEFINED IOTDB_HOME set IOTDB_HOME=%CD%
popd

if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.tool.ExportSchema
if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.tool.schema.ExportSchema
if NOT DEFINED JAVA_HOME goto :err

@REM -----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion iotdb-client/cli/src/assembly/resources/tools/export-tsfile.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ pushd %~dp0..
if NOT DEFINED IOTDB_HOME set IOTDB_HOME=%CD%
popd

if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.tool.ExportTsFile
if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.tool.tsfile.ExportTsFile
if NOT DEFINED JAVA_HOME goto :err

@REM -----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion iotdb-client/cli/src/assembly/resources/tools/import-data.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ pushd %~dp0..
if NOT DEFINED IOTDB_HOME set IOTDB_HOME=%CD%
popd

if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.tool.ImportData
if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.tool.data.ImportData
if NOT DEFINED JAVA_HOME goto :err

@REM -----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion iotdb-client/cli/src/assembly/resources/tools/import-schema.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ pushd %~dp0..
if NOT DEFINED IOTDB_HOME set IOTDB_HOME=%CD%
popd

if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.tool.ImportSchema
if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.tool.schema.ImportSchema
if NOT DEFINED JAVA_HOME goto :err

@REM -----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion iotdb-client/cli/src/assembly/resources/tools/load-tsfile.bat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ pushd %~dp0..
if NOT DEFINED IOTDB_HOME set IOTDB_HOME=%CD%
popd

if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.tool.ImportTsFile
if NOT DEFINED MAIN_CLASS set MAIN_CLASS=org.apache.iotdb.tool.tsfile.ImportTsFile
if NOT DEFINED JAVA_HOME goto :err

@REM -----------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion iotdb-client/cli/src/main/java/org/apache/iotdb/cli/AbstractCli.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
import org.apache.iotdb.rpc.IoTDBConnectionException;
import org.apache.iotdb.rpc.RpcUtils;
import org.apache.iotdb.service.rpc.thrift.ServerProperties;
import org.apache.iotdb.tool.ImportData;
import org.apache.iotdb.tool.data.ImportData;

import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.Option;
Expand Down
3 changes: 2 additions & 1 deletion .../apache/iotdb/tool/IoTDBDataBackTool.java → .../iotdb/tool/backup/IoTDBDataBackTool.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,12 @@
* under the License.
*/

package org.apache.iotdb.tool;
package org.apache.iotdb.tool.backup;

import org.apache.iotdb.commons.conf.CommonConfig;
import org.apache.iotdb.commons.conf.IoTDBConstant;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.tool.data.AbstractDataTool;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand Down
2 changes: 1 addition & 1 deletion ...g/apache/iotdb/tool/AbstractDataTool.java → ...che/iotdb/tool/data/AbstractDataTool.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.apache.iotdb.tool;
package org.apache.iotdb.tool.data;

import org.apache.iotdb.cli.utils.IoTPrinter;
import org.apache.iotdb.exception.ArgsErrorException;
Expand Down
2 changes: 1 addition & 1 deletion ...ava/org/apache/iotdb/tool/ExportData.java → ...rg/apache/iotdb/tool/data/ExportData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.apache.iotdb.tool;
package org.apache.iotdb.tool.data;

import org.apache.iotdb.cli.type.ExitType;
import org.apache.iotdb.cli.utils.CliContext;
Expand Down
2 changes: 1 addition & 1 deletion ...ava/org/apache/iotdb/tool/ImportData.java → ...rg/apache/iotdb/tool/data/ImportData.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.apache.iotdb.tool;
package org.apache.iotdb.tool.data;

import org.apache.iotdb.cli.utils.IoTPrinter;
import org.apache.iotdb.commons.exception.IllegalPathException;
Expand Down
2 changes: 1 addition & 1 deletion ...apache/iotdb/tool/AbstractSchemaTool.java → ...iotdb/tool/schema/AbstractSchemaTool.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.apache.iotdb.tool;
package org.apache.iotdb.tool.schema;

import org.apache.iotdb.cli.utils.IoTPrinter;
import org.apache.iotdb.exception.ArgsErrorException;
Expand Down
2 changes: 1 addition & 1 deletion ...a/org/apache/iotdb/tool/ExportSchema.java → ...pache/iotdb/tool/schema/ExportSchema.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.apache.iotdb.tool;
package org.apache.iotdb.tool.schema;

import org.apache.iotdb.cli.type.ExitType;
import org.apache.iotdb.cli.utils.CliContext;
Expand Down
2 changes: 1 addition & 1 deletion ...a/org/apache/iotdb/tool/ImportSchema.java → ...pache/iotdb/tool/schema/ImportSchema.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.apache.iotdb.tool;
package org.apache.iotdb.tool.schema;

import org.apache.iotdb.cli.utils.IoTPrinter;
import org.apache.iotdb.commons.exception.IllegalPathException;
Expand Down
2 changes: 1 addition & 1 deletion ...apache/iotdb/tool/AbstractTsFileTool.java → ...iotdb/tool/tsfile/AbstractTsFileTool.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.apache.iotdb.tool;
package org.apache.iotdb.tool.tsfile;

import org.apache.iotdb.cli.utils.IoTPrinter;
import org.apache.iotdb.exception.ArgsErrorException;
Expand Down
2 changes: 1 addition & 1 deletion ...a/org/apache/iotdb/tool/ExportTsFile.java → ...pache/iotdb/tool/tsfile/ExportTsFile.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* under the License.
*/

package org.apache.iotdb.tool;
package org.apache.iotdb.tool.tsfile;

import org.apache.iotdb.cli.type.ExitType;
import org.apache.iotdb.cli.utils.CliContext;
Expand Down
Loading

0 comments on commit 8a2aba2

Please sign in to comment.