Skip to content

Commit e86d45e

Browse files
committed
Use /tmp directory to transfer data from host to container
1 parent cfbfe13 commit e86d45e

File tree

4 files changed

+3
-10
lines changed

4 files changed

+3
-10
lines changed

clickhouse-cli-client/src/main/java/com/clickhouse/client/cli/ClickHouseCommandLine.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ static Process startProcess(ClickHouseNode server, ClickHouseRequest<?> request)
144144
ClickHouseChecker.isNullOrBlank(hostDir) ? System.getProperty("java.io.tmpdir") : hostDir);
145145
String containerDir = (String) config.getOption(ClickHouseCommandLineOption.CLI_CONTAINER_DIRECTORY);
146146
if (ClickHouseChecker.isNullOrBlank(containerDir)) {
147-
containerDir = "/data/";
147+
containerDir = "/tmp/";
148148
} else {
149149
containerDir = ClickHouseUtils.normalizeDirectory(containerDir);
150150
}

clickhouse-cli-client/src/main/java/com/clickhouse/client/cli/config/ClickHouseCommandLineOption.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,10 +37,10 @@ public enum ClickHouseCommandLineOption implements ClickHouseOption {
3737
/**
3838
* Work directory inside container, only works running in docker mode(when
3939
* {@link #CLICKHOUSE_CLI_PATH} is not available). Empty value is treated as
40-
* '/data'.
40+
* '/tmp'.
4141
*/
4242
CLI_CONTAINER_DIRECTORY("cli_container_directory", "",
43-
"Work directory inside container, empty value is treated as '/data'"),
43+
"Work directory inside container, empty value is treated as '/tmp'"),
4444
/**
4545
* Command-line work directory. Empty value is treated as system temporary
4646
* directory(e.g. {@code System.getProperty("java.io.tmpdir")}). When running in

clickhouse-cli-client/src/test/java/com/clickhouse/client/cli/ClickHouseCommandLineClientTest.java

-6
Original file line numberDiff line numberDiff line change
@@ -47,12 +47,6 @@ protected ClickHouseNode getServer() {
4747
return super.getServer();
4848
}
4949

50-
@Test(groups = { "integration" })
51-
@Override
52-
public void testCustomLoad() throws Exception {
53-
throw new SkipException("Skip due to time out error");
54-
}
55-
5650
@Test(groups = { "integration" })
5751
@Override
5852
public void testLoadRawData() throws Exception {

clickhouse-client/src/test/java/com/clickhouse/client/ClientIntegrationTest.java

-1
Original file line numberDiff line numberDiff line change
@@ -975,7 +975,6 @@ public void testCustomWriter() throws Exception {
975975

976976
@Test(groups = { "integration" })
977977
public void testDumpAndLoadFile() throws Exception {
978-
// super.testLoadRawData();
979978
ClickHouseNode server = getServer();
980979
ClickHouseClient.send(server, "drop table if exists test_dump_load_file",
981980
"create table test_dump_load_file(a UInt64, b Nullable(String)) engine=MergeTree() order by tuple()")

0 commit comments

Comments
 (0)