This is an automated email from the ASF dual-hosted git repository.
vinoyang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hudi.git
The following commit(s) were added to refs/heads/master by this push:
new 7b2a947 [HUDI-1069] Remove duplicate assertNoWriteErrors() (#1797)
7b2a947 is described below
commit 7b2a947aed5649f8cbbade748e464e1228da6e5d
Author: Raymond Xu <[email protected]>
AuthorDate: Tue Jul 7 22:58:15 2020 -0700
[HUDI-1069] Remove duplicate assertNoWriteErrors() (#1797)
---
.../org/apache/hudi/client/TestClientRollback.java | 1 +
.../TestHoodieClientOnCopyOnWriteStorage.java | 1 +
.../apache/hudi/client/TestHoodieReadClient.java | 1 +
.../org/apache/hudi/index/TestHoodieIndex.java | 8 +----
.../apache/hudi/index/hbase/TestHBaseIndex.java | 9 +----
.../org/apache/hudi/io/TestHoodieMergeHandle.java | 14 +-------
.../java/org/apache/hudi/table/TestCleaner.java | 1 +
.../hudi/table/TestHoodieMergeOnReadTable.java | 12 ++-----
.../table/action/compact/TestAsyncCompaction.java | 1 +
.../java/org/apache/hudi/testutils/Assertions.java | 41 ++++++++++++++++++++++
.../hudi/testutils/HoodieClientTestBase.java | 13 +------
11 files changed, 53 insertions(+), 49 deletions(-)
diff --git
a/hudi-client/src/test/java/org/apache/hudi/client/TestClientRollback.java
b/hudi-client/src/test/java/org/apache/hudi/client/TestClientRollback.java
index 90c824d..b37a350 100644
--- a/hudi-client/src/test/java/org/apache/hudi/client/TestClientRollback.java
+++ b/hudi-client/src/test/java/org/apache/hudi/client/TestClientRollback.java
@@ -42,6 +42,7 @@ import java.io.File;
import java.util.List;
import java.util.stream.Collectors;
+import static org.apache.hudi.testutils.Assertions.assertNoWriteErrors;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git
a/hudi-client/src/test/java/org/apache/hudi/client/TestHoodieClientOnCopyOnWriteStorage.java
b/hudi-client/src/test/java/org/apache/hudi/client/TestHoodieClientOnCopyOnWriteStorage.java
index fc1d6ba..1f86bb26 100644
---
a/hudi-client/src/test/java/org/apache/hudi/client/TestHoodieClientOnCopyOnWriteStorage.java
+++
b/hudi-client/src/test/java/org/apache/hudi/client/TestHoodieClientOnCopyOnWriteStorage.java
@@ -72,6 +72,7 @@ import java.util.stream.Collectors;
import static
org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion.VERSION_0;
import static org.apache.hudi.common.util.ParquetUtils.readRowKeysFromParquet;
+import static org.apache.hudi.testutils.Assertions.assertNoWriteErrors;
import static org.apache.hudi.testutils.HoodieTestDataGenerator.NULL_SCHEMA;
import static
org.apache.hudi.testutils.HoodieTestDataGenerator.TRIP_EXAMPLE_SCHEMA;
import static org.junit.jupiter.api.Assertions.assertEquals;
diff --git
a/hudi-client/src/test/java/org/apache/hudi/client/TestHoodieReadClient.java
b/hudi-client/src/test/java/org/apache/hudi/client/TestHoodieReadClient.java
index a59c1f4..80af513 100644
--- a/hudi-client/src/test/java/org/apache/hudi/client/TestHoodieReadClient.java
+++ b/hudi-client/src/test/java/org/apache/hudi/client/TestHoodieReadClient.java
@@ -37,6 +37,7 @@ import java.util.Collection;
import java.util.List;
import java.util.stream.Collectors;
+import static org.apache.hudi.testutils.Assertions.assertNoWriteErrors;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertThrows;
diff --git
a/hudi-client/src/test/java/org/apache/hudi/index/TestHoodieIndex.java
b/hudi-client/src/test/java/org/apache/hudi/index/TestHoodieIndex.java
index 67451f1..66b8ae6 100644
--- a/hudi-client/src/test/java/org/apache/hudi/index/TestHoodieIndex.java
+++ b/hudi-client/src/test/java/org/apache/hudi/index/TestHoodieIndex.java
@@ -73,6 +73,7 @@ import java.util.UUID;
import scala.Tuple2;
+import static org.apache.hudi.testutils.Assertions.assertNoWriteErrors;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -544,13 +545,6 @@ public class TestHoodieIndex extends
HoodieClientTestHarness {
this.index = writeClient.getIndex();
}
- private void assertNoWriteErrors(List<WriteStatus> statuses) {
- // Verify there are no errors
- for (WriteStatus status : statuses) {
- assertFalse(status.hasErrors());
- }
- }
-
public static class DummyHoodieIndex<T extends HoodieRecordPayload> extends
HoodieIndex<T> {
public DummyHoodieIndex(HoodieWriteConfig config) {
diff --git
a/hudi-client/src/test/java/org/apache/hudi/index/hbase/TestHBaseIndex.java
b/hudi-client/src/test/java/org/apache/hudi/index/hbase/TestHBaseIndex.java
index 6763fff..d2ff4a4 100644
--- a/hudi-client/src/test/java/org/apache/hudi/index/hbase/TestHBaseIndex.java
+++ b/hudi-client/src/test/java/org/apache/hudi/index/hbase/TestHBaseIndex.java
@@ -62,8 +62,8 @@ import java.util.List;
import scala.Tuple2;
+import static org.apache.hudi.testutils.Assertions.assertNoWriteErrors;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertThrows;
import static org.junit.jupiter.api.Assertions.assertTrue;
import static org.mockito.ArgumentMatchers.any;
@@ -510,13 +510,6 @@ public class TestHBaseIndex extends
HoodieClientTestHarness {
return writeStatus;
}
- private void assertNoWriteErrors(List<WriteStatus> statuses) {
- // Verify there are no errors
- for (WriteStatus status : statuses) {
- assertFalse(status.hasErrors(), "Errors found in write of " +
status.getFileId());
- }
- }
-
private HoodieWriteConfig getConfig() {
return getConfigBuilder(100).build();
}
diff --git
a/hudi-client/src/test/java/org/apache/hudi/io/TestHoodieMergeHandle.java
b/hudi-client/src/test/java/org/apache/hudi/io/TestHoodieMergeHandle.java
index 75acf68..e06f9b3 100644
--- a/hudi-client/src/test/java/org/apache/hudi/io/TestHoodieMergeHandle.java
+++ b/hudi-client/src/test/java/org/apache/hudi/io/TestHoodieMergeHandle.java
@@ -47,8 +47,8 @@ import java.nio.file.Paths;
import java.util.ArrayList;
import java.util.List;
+import static org.apache.hudi.testutils.Assertions.assertNoWriteErrors;
import static org.junit.jupiter.api.Assertions.assertEquals;
-import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNotEquals;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -306,18 +306,6 @@ public class TestHoodieMergeHandle extends
HoodieClientTestHarness {
return dataSet;
}
- /**
- * Assert no failures in writing hoodie files.
- *
- * @param statuses List of Write Status
- */
- void assertNoWriteErrors(List<WriteStatus> statuses) {
- // Verify there are no errors
- for (WriteStatus status : statuses) {
- assertFalse(status.hasErrors(), "Errors found in write of " +
status.getFileId());
- }
- }
-
HoodieWriteConfig.Builder getConfigBuilder() {
return
HoodieWriteConfig.newBuilder().withPath(basePath).withSchema(HoodieTestDataGenerator.TRIP_EXAMPLE_SCHEMA)
.withParallelism(2, 2)
diff --git a/hudi-client/src/test/java/org/apache/hudi/table/TestCleaner.java
b/hudi-client/src/test/java/org/apache/hudi/table/TestCleaner.java
index 541f84f..3c32bbc 100644
--- a/hudi-client/src/test/java/org/apache/hudi/table/TestCleaner.java
+++ b/hudi-client/src/test/java/org/apache/hudi/table/TestCleaner.java
@@ -82,6 +82,7 @@ import java.util.stream.Stream;
import scala.Tuple3;
import static
org.apache.hudi.common.testutils.HoodieTestUtils.DEFAULT_PARTITION_PATHS;
+import static org.apache.hudi.testutils.Assertions.assertNoWriteErrors;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertNull;
diff --git
a/hudi-client/src/test/java/org/apache/hudi/table/TestHoodieMergeOnReadTable.java
b/hudi-client/src/test/java/org/apache/hudi/table/TestHoodieMergeOnReadTable.java
index 8e0afbc..3bc1f5a 100644
---
a/hudi-client/src/test/java/org/apache/hudi/table/TestHoodieMergeOnReadTable.java
+++
b/hudi-client/src/test/java/org/apache/hudi/table/TestHoodieMergeOnReadTable.java
@@ -47,10 +47,10 @@ import org.apache.hudi.config.HoodieIndexConfig;
import org.apache.hudi.config.HoodieStorageConfig;
import org.apache.hudi.config.HoodieWriteConfig;
import org.apache.hudi.exception.HoodieIOException;
-import org.apache.hudi.hadoop.utils.HoodieHiveUtils;
-import org.apache.hudi.hadoop.utils.HoodieInputFormatUtils;
import org.apache.hudi.hadoop.HoodieParquetInputFormat;
import org.apache.hudi.hadoop.realtime.HoodieParquetRealtimeInputFormat;
+import org.apache.hudi.hadoop.utils.HoodieHiveUtils;
+import org.apache.hudi.hadoop.utils.HoodieInputFormatUtils;
import org.apache.hudi.index.HoodieIndex;
import org.apache.hudi.index.HoodieIndex.IndexType;
import
org.apache.hudi.table.action.deltacommit.DeleteDeltaCommitActionExecutor;
@@ -86,6 +86,7 @@ import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import static org.apache.hudi.testutils.Assertions.assertNoWriteErrors;
import static
org.apache.hudi.testutils.HoodieTestDataGenerator.TRIP_EXAMPLE_SCHEMA;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -1400,13 +1401,6 @@ public class TestHoodieMergeOnReadTable extends
HoodieClientTestHarness {
.withIndexConfig(HoodieIndexConfig.newBuilder().withIndexType(indexType).build());
}
- private void assertNoWriteErrors(List<WriteStatus> statuses) {
- // Verify there are no errors
- for (WriteStatus status : statuses) {
- assertFalse(status.hasErrors(), "Errors found in write of " +
status.getFileId());
- }
- }
-
private FileStatus[] insertAndGetFilePaths(List<HoodieRecord> records,
HoodieWriteClient client,
HoodieWriteConfig cfg, String
commitTime) throws IOException {
JavaRDD<HoodieRecord> writeRecords = jsc.parallelize(records, 1);
diff --git
a/hudi-client/src/test/java/org/apache/hudi/table/action/compact/TestAsyncCompaction.java
b/hudi-client/src/test/java/org/apache/hudi/table/action/compact/TestAsyncCompaction.java
index 553be74..bf37a88 100644
---
a/hudi-client/src/test/java/org/apache/hudi/table/action/compact/TestAsyncCompaction.java
+++
b/hudi-client/src/test/java/org/apache/hudi/table/action/compact/TestAsyncCompaction.java
@@ -61,6 +61,7 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import static org.apache.hudi.testutils.Assertions.assertNoWriteErrors;
import static
org.apache.hudi.testutils.HoodieTestDataGenerator.TRIP_EXAMPLE_SCHEMA;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
diff --git
a/hudi-client/src/test/java/org/apache/hudi/testutils/Assertions.java
b/hudi-client/src/test/java/org/apache/hudi/testutils/Assertions.java
new file mode 100644
index 0000000..ad65610
--- /dev/null
+++ b/hudi-client/src/test/java/org/apache/hudi/testutils/Assertions.java
@@ -0,0 +1,41 @@
+/*
+ * 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.hudi.testutils;
+
+import org.apache.hudi.client.WriteStatus;
+
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertAll;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+
+/**
+ * Commonly used assertion functions.
+ */
+public class Assertions {
+
+ /**
+ * Assert no failures in writing hoodie files.
+ */
+ public static void assertNoWriteErrors(List<WriteStatus> statuses) {
+ assertAll(statuses.stream().map(status -> () ->
+ assertFalse(status.hasErrors(), "Errors found in write of " +
status.getFileId())));
+ }
+}
diff --git
a/hudi-client/src/test/java/org/apache/hudi/testutils/HoodieClientTestBase.java
b/hudi-client/src/test/java/org/apache/hudi/testutils/HoodieClientTestBase.java
index 1db2082..1f5aa54 100644
---
a/hudi-client/src/test/java/org/apache/hudi/testutils/HoodieClientTestBase.java
+++
b/hudi-client/src/test/java/org/apache/hudi/testutils/HoodieClientTestBase.java
@@ -60,6 +60,7 @@ import java.util.Set;
import java.util.function.Function;
import java.util.stream.Collectors;
+import static org.apache.hudi.testutils.Assertions.assertNoWriteErrors;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertFalse;
import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -142,18 +143,6 @@ public class HoodieClientTestBase extends
HoodieClientTestHarness {
return table;
}
- /**
- * Assert no failures in writing hoodie files.
- *
- * @param statuses List of Write Status
- */
- public static void assertNoWriteErrors(List<WriteStatus> statuses) {
- // Verify there are no errors
- for (WriteStatus status : statuses) {
- assertFalse(status.hasErrors(), "Errors found in write of " +
status.getFileId());
- }
- }
-
public void assertPartitionMetadataForRecords(List<HoodieRecord>
inputRecords, FileSystem fs) throws IOException {
Set<String> partitionPathSet = inputRecords.stream()
.map(HoodieRecord::getPartitionPath)
