This is an automated email from the ASF dual-hosted git repository.
fanjia pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/seatunnel.git
The following commit(s) were added to refs/heads/dev by this push:
new bbedb07a9c [Improve]Change System.out.println to log output. (#5912)
bbedb07a9c is described below
commit bbedb07a9c8d7ec46938d44cf271d4bdc91f5070
Author: lightzhao <[email protected]>
AuthorDate: Sat Nov 25 18:04:44 2023 +0800
[Improve]Change System.out.println to log output. (#5912)
---
.../seatunnel/file/writer/OrcReadStrategyTest.java | 9 ++++++---
.../seatunnel/file/writer/ParquetReadStrategyTest.java | 15 +++++++++------
.../seatunnel/jdbc/catalog/psql/PostgresCatalogTest.java | 5 ++++-
.../starrocks/catalog/StarRocksCreateTableTest.java | 5 ++++-
.../seatunnel/engine/e2e/ClusterFaultToleranceIT.java | 2 +-
.../java/org/apache/seatunnel/engine/e2e/ClusterIT.java | 8 ++++----
.../seatunnel/engine/client/SeaTunnelClientTest.java | 10 ++++++----
.../org/apache/seatunnel/engine/client/TestUtils.java | 5 ++++-
.../engine/server/checkpoint/CheckpointSerializeTest.java | 7 +++++--
.../seatunnel/engine/server/master/JobMetricsTest.java | 6 ++++--
10 files changed, 47 insertions(+), 25 deletions(-)
diff --git
a/seatunnel-connectors-v2/connector-file/connector-file-base/src/test/java/org/apache/seatunnel/connectors/seatunnel/file/writer/OrcReadStrategyTest.java
b/seatunnel-connectors-v2/connector-file/connector-file-base/src/test/java/org/apache/seatunnel/connectors/seatunnel/file/writer/OrcReadStrategyTest.java
index 56fbaae386..4c97c783ce 100644
---
a/seatunnel-connectors-v2/connector-file/connector-file-base/src/test/java/org/apache/seatunnel/connectors/seatunnel/file/writer/OrcReadStrategyTest.java
+++
b/seatunnel-connectors-v2/connector-file/connector-file-base/src/test/java/org/apache/seatunnel/connectors/seatunnel/file/writer/OrcReadStrategyTest.java
@@ -29,6 +29,8 @@ import
org.apache.seatunnel.connectors.seatunnel.file.source.reader.OrcReadStrat
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import lombok.extern.slf4j.Slf4j;
+
import java.io.File;
import java.net.URL;
import java.nio.file.Paths;
@@ -37,6 +39,7 @@ import java.util.List;
import static
org.apache.hadoop.fs.CommonConfigurationKeysPublic.FS_DEFAULT_NAME_DEFAULT;
+@Slf4j
public class OrcReadStrategyTest {
@Test
@@ -51,7 +54,7 @@ public class OrcReadStrategyTest {
SeaTunnelRowType seaTunnelRowTypeInfo =
orcReadStrategy.getSeaTunnelRowTypeInfo(localConf,
orcFilePath);
Assertions.assertNotNull(seaTunnelRowTypeInfo);
- System.out.println(seaTunnelRowTypeInfo);
+ log.info(seaTunnelRowTypeInfo.toString());
orcReadStrategy.read(orcFilePath, "", testCollector);
for (SeaTunnelRow row : testCollector.getRows()) {
Assertions.assertEquals(row.getField(0).getClass(), Boolean.class);
@@ -77,7 +80,7 @@ public class OrcReadStrategyTest {
SeaTunnelRowType seaTunnelRowTypeInfo =
orcReadStrategy.getSeaTunnelRowTypeInfo(localConf,
orcFilePath);
Assertions.assertNotNull(seaTunnelRowTypeInfo);
- System.out.println(seaTunnelRowTypeInfo);
+ log.info(seaTunnelRowTypeInfo.toString());
orcReadStrategy.read(orcFilePath, "", testCollector);
for (SeaTunnelRow row : testCollector.getRows()) {
Assertions.assertEquals(row.getField(0).getClass(), Byte.class);
@@ -95,7 +98,7 @@ public class OrcReadStrategyTest {
@Override
public void collect(SeaTunnelRow record) {
- System.out.println(record);
+ log.info(record.toString());
rows.add(record);
}
diff --git
a/seatunnel-connectors-v2/connector-file/connector-file-base/src/test/java/org/apache/seatunnel/connectors/seatunnel/file/writer/ParquetReadStrategyTest.java
b/seatunnel-connectors-v2/connector-file/connector-file-base/src/test/java/org/apache/seatunnel/connectors/seatunnel/file/writer/ParquetReadStrategyTest.java
index 1c36a91453..ffac80407b 100644
---
a/seatunnel-connectors-v2/connector-file/connector-file-base/src/test/java/org/apache/seatunnel/connectors/seatunnel/file/writer/ParquetReadStrategyTest.java
+++
b/seatunnel-connectors-v2/connector-file/connector-file-base/src/test/java/org/apache/seatunnel/connectors/seatunnel/file/writer/ParquetReadStrategyTest.java
@@ -29,6 +29,8 @@ import
org.apache.seatunnel.connectors.seatunnel.file.source.reader.ParquetReadS
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import lombok.extern.slf4j.Slf4j;
+
import java.io.File;
import java.net.URL;
import java.nio.file.Paths;
@@ -39,6 +41,7 @@ import java.util.TimeZone;
import static
org.apache.hadoop.fs.CommonConfigurationKeysPublic.FS_DEFAULT_NAME_DEFAULT;
+@Slf4j
public class ParquetReadStrategyTest {
@Test
public void testParquetRead1() throws Exception {
@@ -51,7 +54,7 @@ public class ParquetReadStrategyTest {
SeaTunnelRowType seaTunnelRowTypeInfo =
parquetReadStrategy.getSeaTunnelRowTypeInfo(localConf, path);
Assertions.assertNotNull(seaTunnelRowTypeInfo);
- System.out.println(seaTunnelRowTypeInfo);
+ log.info(seaTunnelRowTypeInfo.toString());
TestCollector testCollector = new TestCollector();
parquetReadStrategy.read(path, "", testCollector);
}
@@ -67,7 +70,7 @@ public class ParquetReadStrategyTest {
SeaTunnelRowType seaTunnelRowTypeInfo =
parquetReadStrategy.getSeaTunnelRowTypeInfo(localConf, path);
Assertions.assertNotNull(seaTunnelRowTypeInfo);
- System.out.println(seaTunnelRowTypeInfo);
+ log.info(seaTunnelRowTypeInfo.toString());
TestCollector testCollector = new TestCollector();
parquetReadStrategy.read(path, "", testCollector);
}
@@ -83,7 +86,7 @@ public class ParquetReadStrategyTest {
SeaTunnelRowType seaTunnelRowTypeInfo =
parquetReadStrategy.getSeaTunnelRowTypeInfo(localConf, path);
Assertions.assertNotNull(seaTunnelRowTypeInfo);
- System.out.println(seaTunnelRowTypeInfo);
+ log.info(seaTunnelRowTypeInfo.toString());
int index = seaTunnelRowTypeInfo.indexOf("c_timestamp");
TimeZone tz1 = TimeZone.getTimeZone("Asia/Shanghai");
TimeZone.setDefault(tz1);
@@ -119,7 +122,7 @@ public class ParquetReadStrategyTest {
SeaTunnelRowType seaTunnelRowTypeInfo =
parquetReadStrategy.getSeaTunnelRowTypeInfo(localConf, path);
Assertions.assertNotNull(seaTunnelRowTypeInfo);
- System.out.println(seaTunnelRowTypeInfo);
+ log.info(seaTunnelRowTypeInfo.toString());
TestCollector testCollector = new TestCollector();
parquetReadStrategy.read(path, "", testCollector);
List<SeaTunnelRow> rows = testCollector.getRows();
@@ -149,7 +152,7 @@ public class ParquetReadStrategyTest {
SeaTunnelRowType seaTunnelRowTypeInfo =
parquetReadStrategy.getSeaTunnelRowTypeInfo(localConf, path);
Assertions.assertNotNull(seaTunnelRowTypeInfo);
- System.out.println(seaTunnelRowTypeInfo);
+ log.info(seaTunnelRowTypeInfo.toString());
TestCollector testCollector = new TestCollector();
parquetReadStrategy.read(path, "", testCollector);
}
@@ -164,7 +167,7 @@ public class ParquetReadStrategyTest {
@Override
public void collect(SeaTunnelRow record) {
- System.out.println(record);
+ log.info(record.toString());
rows.add(record);
}
diff --git
a/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/psql/PostgresCatalogTest.java
b/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/psql/PostgresCatalogTest.java
index 6ef4d9e654..c04c1941b0 100644
---
a/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/psql/PostgresCatalogTest.java
+++
b/seatunnel-connectors-v2/connector-jdbc/src/test/java/org/apache/seatunnel/connectors/seatunnel/jdbc/catalog/psql/PostgresCatalogTest.java
@@ -25,7 +25,10 @@ import
org.apache.seatunnel.connectors.seatunnel.jdbc.catalog.mysql.MySqlCatalog
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import lombok.extern.slf4j.Slf4j;
+
@Disabled("Please Test it in your local environment")
+@Slf4j
class PostgresCatalogTest {
@Test
@@ -51,7 +54,7 @@ class PostgresCatalogTest {
CatalogTable table =
catalog.getTable(TablePath.of("st_test", "public",
"all_types_table_02"));
- System.out.println("find table: " + table);
+ log.info("find table: " + table);
catalog.createTable(
new TablePath("liulitest", "public", "all_types_table_02"),
table, false);
diff --git
a/seatunnel-connectors-v2/connector-starrocks/src/test/java/org/apache/seatunnel/connectors/seatunnel/starrocks/catalog/StarRocksCreateTableTest.java
b/seatunnel-connectors-v2/connector-starrocks/src/test/java/org/apache/seatunnel/connectors/seatunnel/starrocks/catalog/StarRocksCreateTableTest.java
index 6298921c2d..6a8be734e7 100644
---
a/seatunnel-connectors-v2/connector-starrocks/src/test/java/org/apache/seatunnel/connectors/seatunnel/starrocks/catalog/StarRocksCreateTableTest.java
+++
b/seatunnel-connectors-v2/connector-starrocks/src/test/java/org/apache/seatunnel/connectors/seatunnel/starrocks/catalog/StarRocksCreateTableTest.java
@@ -29,10 +29,13 @@ import
org.apache.seatunnel.connectors.seatunnel.starrocks.sink.StarRocksSaveMod
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
+import lombok.extern.slf4j.Slf4j;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+@Slf4j
public class StarRocksCreateTableTest {
@Test
@@ -71,7 +74,7 @@ public class StarRocksCreateTableTest {
.columns(columns)
.build());
- System.out.println(result);
+ log.info(result);
}
@Test
diff --git
a/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/java/org/apache/seatunnel/engine/e2e/ClusterFaultToleranceIT.java
b/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/java/org/apache/seatunnel/engine/e2e/ClusterFaultToleranceIT.java
index 8222faaa41..f2f5d5c5c8 100644
---
a/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/java/org/apache/seatunnel/engine/e2e/ClusterFaultToleranceIT.java
+++
b/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/java/org/apache/seatunnel/engine/e2e/ClusterFaultToleranceIT.java
@@ -134,7 +134,7 @@ public class ClusterFaultToleranceIT {
Long fileLineNumberFromDir =
FileUtils.getFileLineNumberFromDir(testResources.getLeft());
Assertions.assertEquals(testRowNumber * testParallelism,
fileLineNumberFromDir);
-
System.out.println(engineClient.getJobMetrics(clientJobProxy.getJobId()));
+ log.info(engineClient.getJobMetrics(clientJobProxy.getJobId()));
log.warn("========================clean test
resource====================");
} finally {
if (engineClient != null) {
diff --git
a/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/java/org/apache/seatunnel/engine/e2e/ClusterIT.java
b/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/java/org/apache/seatunnel/engine/e2e/ClusterIT.java
index acb2fab9b8..5ff1b3005c 100644
---
a/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/java/org/apache/seatunnel/engine/e2e/ClusterIT.java
+++
b/seatunnel-e2e/seatunnel-engine-e2e/connector-seatunnel-e2e-base/src/test/java/org/apache/seatunnel/engine/e2e/ClusterIT.java
@@ -65,12 +65,12 @@ public class ClusterIT {
engineClient = new SeaTunnelClient(clientConfig);
Map<String, String> clusterHealthMetrics =
engineClient.getClusterHealthMetrics();
- System.out.println(
+ log.info(
"=====================================cluster
metrics==================================================");
for (Map.Entry<String, String> entry :
clusterHealthMetrics.entrySet()) {
- System.out.println(entry.getKey());
- System.out.println(entry.getValue());
- System.out.println(
+ log.info(entry.getKey());
+ log.info(entry.getValue());
+ log.info(
"======================================================================================================");
}
Assertions.assertEquals(2, clusterHealthMetrics.size());
diff --git
a/seatunnel-engine/seatunnel-engine-client/src/test/java/org/apache/seatunnel/engine/client/SeaTunnelClientTest.java
b/seatunnel-engine/seatunnel-engine-client/src/test/java/org/apache/seatunnel/engine/client/SeaTunnelClientTest.java
index ca7e132353..ea76c28b48 100644
---
a/seatunnel-engine/seatunnel-engine-client/src/test/java/org/apache/seatunnel/engine/client/SeaTunnelClientTest.java
+++
b/seatunnel-engine/seatunnel-engine-client/src/test/java/org/apache/seatunnel/engine/client/SeaTunnelClientTest.java
@@ -45,6 +45,7 @@ import org.junit.jupiter.api.condition.OS;
import com.hazelcast.client.config.ClientConfig;
import com.hazelcast.core.HazelcastInstance;
import com.hazelcast.instance.impl.HazelcastInstanceFactory;
+import lombok.extern.slf4j.Slf4j;
import java.util.concurrent.CompletableFuture;
import java.util.concurrent.ExecutionException;
@@ -57,6 +58,7 @@ import static
org.apache.seatunnel.api.common.metrics.MetricNames.SOURCE_RECEIVE
import static org.awaitility.Awaitility.await;
@DisabledOnOs(OS.WINDOWS)
+@Slf4j
public class SeaTunnelClientTest {
private static SeaTunnelConfig SEATUNNEL_CONFIG =
ConfigProvider.locateAndGetSeaTunnelConfig();
@@ -201,7 +203,7 @@ public class SeaTunnelClientTest {
String jobMetrics = jobClient.getJobMetrics(jobId);
- System.out.println(jobMetrics);
+ log.info(jobMetrics);
Assertions.assertTrue(jobMetrics.contains(SOURCE_RECEIVED_COUNT));
Assertions.assertTrue(jobMetrics.contains(SOURCE_RECEIVED_QPS));
@@ -258,7 +260,7 @@ public class SeaTunnelClientTest {
.getJobStatus(jobId3)
.equals("RUNNING")));
- System.out.println(jobClient.getRunningJobMetrics());
+ log.info(jobClient.getRunningJobMetrics());
await().atMost(30000, TimeUnit.MILLISECONDS)
.untilAsserted(
@@ -334,10 +336,10 @@ public class SeaTunnelClientTest {
.untilAsserted(
() -> {
Thread.sleep(1000);
- System.out.println(
+ log.info(
"======================job status:"
+
jobClient.getJobDetailStatus(jobId));
- System.out.println(
+ log.info(
"======================list job
status:"
+
jobClient.listJobStatus(true));
Assertions.assertTrue(
diff --git
a/seatunnel-engine/seatunnel-engine-client/src/test/java/org/apache/seatunnel/engine/client/TestUtils.java
b/seatunnel-engine/seatunnel-engine-client/src/test/java/org/apache/seatunnel/engine/client/TestUtils.java
index cb1270623d..163d50025e 100644
---
a/seatunnel-engine/seatunnel-engine-client/src/test/java/org/apache/seatunnel/engine/client/TestUtils.java
+++
b/seatunnel-engine/seatunnel-engine-client/src/test/java/org/apache/seatunnel/engine/client/TestUtils.java
@@ -23,9 +23,12 @@ import org.apache.seatunnel.engine.core.job.JobStatusData;
import org.junit.jupiter.api.Test;
+import lombok.extern.slf4j.Slf4j;
+
import java.util.ArrayList;
import java.util.List;
+@Slf4j
public class TestUtils {
public static String getResource(String confFile) {
return System.getProperty("user.dir") + "/src/test/resources/" +
confFile;
@@ -67,6 +70,6 @@ public class TestUtils {
return s1.getSubmitTime() > s2.getSubmitTime() ? -1 : 1;
});
String r = ContentFormatUtil.format(statusDataList);
- System.out.println(r);
+ log.info(r);
}
}
diff --git
a/seatunnel-engine/seatunnel-engine-server/src/test/java/org/apache/seatunnel/engine/server/checkpoint/CheckpointSerializeTest.java
b/seatunnel-engine/seatunnel-engine-server/src/test/java/org/apache/seatunnel/engine/server/checkpoint/CheckpointSerializeTest.java
index 25c38de19e..34c2ba4544 100644
---
a/seatunnel-engine/seatunnel-engine-server/src/test/java/org/apache/seatunnel/engine/server/checkpoint/CheckpointSerializeTest.java
+++
b/seatunnel-engine/seatunnel-engine-server/src/test/java/org/apache/seatunnel/engine/server/checkpoint/CheckpointSerializeTest.java
@@ -28,11 +28,14 @@ import
org.apache.seatunnel.engine.serializer.protobuf.ProtoStuffSerializer;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test;
+import lombok.extern.slf4j.Slf4j;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.List;
+@Slf4j
public class CheckpointSerializeTest {
@Test
@@ -66,7 +69,7 @@ public class CheckpointSerializeTest {
DefaultSerializer<FakeSourceSplit> defaultSerializer =
new DefaultSerializer<FakeSourceSplit>();
FakeSourceSplit split = defaultSerializer.deserialize(bytes);
- System.out.println(split.getSplitId());
+ log.info(String.valueOf(split.getSplitId()));
}
}
@@ -84,7 +87,7 @@ public class CheckpointSerializeTest {
DefaultSerializer<FileSinkState> defaultSerializer =
new DefaultSerializer<FileSinkState>();
FileSinkState fileSinkState =
defaultSerializer.deserialize(bytes);
- System.out.println(fileSinkState.getTransactionDir());
+ log.info(fileSinkState.getTransactionDir());
}
}
}
diff --git
a/seatunnel-engine/seatunnel-engine-server/src/test/java/org/apache/seatunnel/engine/server/master/JobMetricsTest.java
b/seatunnel-engine/seatunnel-engine-server/src/test/java/org/apache/seatunnel/engine/server/master/JobMetricsTest.java
index 413c4b2311..0446e9bb11 100644
---
a/seatunnel-engine/seatunnel-engine-server/src/test/java/org/apache/seatunnel/engine/server/master/JobMetricsTest.java
+++
b/seatunnel-engine/seatunnel-engine-server/src/test/java/org/apache/seatunnel/engine/server/master/JobMetricsTest.java
@@ -33,6 +33,7 @@ import org.junit.jupiter.api.condition.DisabledOnOs;
import org.junit.jupiter.api.condition.OS;
import com.hazelcast.internal.serialization.Data;
+import lombok.extern.slf4j.Slf4j;
import java.util.Collections;
import java.util.concurrent.TimeUnit;
@@ -48,6 +49,7 @@ import static org.junit.jupiter.api.Assertions.fail;
@DisabledOnOs(OS.WINDOWS)
@TestInstance(TestInstance.Lifecycle.PER_CLASS)
+@Slf4j
class JobMetricsTest extends AbstractSeaTunnelServerTest {
@Test
@@ -112,7 +114,7 @@ class JobMetricsTest extends AbstractSeaTunnelServerTest {
Thread.sleep(10000);
-
System.out.println(coordinatorService.getJobMetrics(jobId3).toJsonString());
+ log.info(coordinatorService.getJobMetrics(jobId3).toJsonString());
// start savePoint
coordinatorService.savePoint(jobId3);
@@ -137,7 +139,7 @@ class JobMetricsTest extends AbstractSeaTunnelServerTest {
Thread.sleep(20000);
// check metrics
JobMetrics jobMetrics = coordinatorService.getJobMetrics(jobId3);
- System.out.println(jobMetrics.toJsonString());
+ log.info(jobMetrics.toJsonString());
assertTrue(40 < (Long)
jobMetrics.get(SINK_WRITE_COUNT).get(0).value());
assertTrue(40 < (Long)
jobMetrics.get(SINK_WRITE_COUNT).get(1).value());
assertTrue(40 < (Long)
jobMetrics.get(SOURCE_RECEIVED_COUNT).get(0).value());
