lw309637554 commented on a change in pull request #1756: URL: https://github.com/apache/hudi/pull/1756#discussion_r449948557
########## File path: hudi-client/src/test/java/org/apache/hudi/table/action/rollback/TestCopyOnWriteRollbackActionExecutor.java ########## @@ -0,0 +1,247 @@ +/* + * 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.table.action.rollback; + +import org.apache.hudi.common.model.FileSlice; +import org.apache.hudi.common.model.HoodieFileGroup; +import org.apache.hudi.common.model.HoodieRecord; +import org.apache.hudi.common.table.timeline.HoodieInstant; +import org.apache.hudi.common.table.timeline.HoodieTimeline; +import org.apache.hudi.client.HoodieWriteClient; +import org.apache.hudi.client.WriteStatus; +import org.apache.hudi.common.HoodieRollbackStat; +import org.apache.hudi.common.testutils.HoodieTestUtils; +import org.apache.hudi.common.util.Option; +import org.apache.hudi.config.HoodieIndexConfig; +import org.apache.hudi.config.HoodieWriteConfig; +import org.apache.hudi.index.HoodieIndex; +import org.apache.hudi.table.HoodieTable; +import org.apache.hudi.testutils.HoodieClientTestBase; +import org.apache.hudi.testutils.HoodieTestDataGenerator; +import org.apache.spark.api.java.JavaRDD; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import java.util.stream.Collectors; + +import static org.apache.hudi.testutils.HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH; +import static org.apache.hudi.testutils.HoodieTestDataGenerator.DEFAULT_SECOND_PARTITION_PATH; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + +public class TestCopyOnWriteRollbackActionExecutor extends HoodieClientTestBase { + @BeforeEach + public void setUp() throws Exception { + initPath(); + initSparkContexts(); + //just generate tow partitions Review comment: ok ########## File path: hudi-client/src/main/java/org/apache/hudi/io/HoodieWriteHandle.java ########## @@ -97,28 +98,9 @@ public Path makeNewPath(String partitionPath) { * * @param partitionPath Partition path */ - protected void createMarkerFile(String partitionPath) { - Path markerPath = makeNewMarkerPath(partitionPath); - try { - LOG.info("Creating Marker Path=" + markerPath); - fs.create(markerPath, false).close(); - } catch (IOException e) { - throw new HoodieException("Failed to create marker file " + markerPath, e); - } - } - - /** - * THe marker path will be <base-path>/.hoodie/.temp/<instant_ts>/2019/04/25/filename. - */ - private Path makeNewMarkerPath(String partitionPath) { - Path markerRootPath = new Path(hoodieTable.getMetaClient().getMarkerFolderPath(instantTime)); - Path path = FSUtils.getPartitionPath(markerRootPath, partitionPath); - try { - fs.mkdirs(path); // create a new partition as needed. - } catch (IOException e) { - throw new HoodieIOException("Failed to make dir " + path, e); - } - return new Path(path.toString(), FSUtils.makeMarkerFile(instantTime, writeToken, fileId)); + protected void createMarkerFile(String partitionPath, String dataFileName) { + MarkerFiles markerFiles = new MarkerFiles(hoodieTable, instantTime); + markerFiles.createMarkerFile(partitionPath, dataFileName, getIOType()); Review comment: > nit: we can just name this `create()` yes ,i will be better ########## File path: hudi-client/src/test/java/org/apache/hudi/client/TestTableSchemaEvolution.java ########## @@ -408,6 +416,16 @@ public void testCopyOnWriteTable() throws Exception { checkReadRecords("000", 2 * numRecords); } + @Test + public void testCopyOnWriteTableUsingFileListRollBack() throws Exception { + testCopyOnWriteTable(false); + } + + @Test + public void testCopyOnWriteTableUsingMarkersRollBack() throws Exception { Review comment: yes ,i will remove it ---------------------------------------------------------------- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. For queries about this service, please contact Infrastructure at: [email protected]
