yanghua commented on a change in pull request #1554: URL: https://github.com/apache/incubator-hudi/pull/1554#discussion_r418430527
########## File path: hudi-cli/src/test/java/org/apache/hudi/cli/commands/TestRepairsCommand.java ########## @@ -0,0 +1,206 @@ +/* + * 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.cli.commands; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.Path; +import org.apache.hudi.cli.AbstractShellIntegrationTest; +import org.apache.hudi.cli.HoodieCLI; +import org.apache.hudi.cli.HoodiePrintHelper; +import org.apache.hudi.cli.HoodieTableHeaderFields; +import org.apache.hudi.cli.common.HoodieTestCommitMetadataGenerator; +import org.apache.hudi.common.HoodieTestDataGenerator; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.common.model.HoodieTableType; +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.springframework.shell.core.CommandResult; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.net.URL; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.stream.Collectors; + +import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * Test class for {@link RepairsCommand}. + */ +public class TestRepairsCommand extends AbstractShellIntegrationTest { + + private String tablePath; + + @Before + public void init() throws IOException { + String tableName = "test_table"; + tablePath = basePath + File.separator + tableName; + + // Create table and connect + new TableCommand().createTable( + tablePath, "test_table", HoodieTableType.COPY_ON_WRITE.name(), + "", TimelineLayoutVersion.VERSION_1, "org.apache.hudi.common.model.HoodieAvroPayload"); + } + + /** + * Test case for dry run 'repair addpartitionmeta'. + */ + @Test + public void testAddPartitionMetaWithDryRun() throws IOException { + // create commit instant + new File(tablePath + "/.hoodie/100.commit").createNewFile(); + + // create partition path + String partition1 = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH; + String partition2 = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_SECOND_PARTITION_PATH; + String partition3 = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_THIRD_PARTITION_PATH; + fs.mkdirs(new Path(partition1)); + fs.mkdirs(new Path(partition2)); + fs.mkdirs(new Path(partition3)); + + // default is dry run. + CommandResult cr = getShell().executeCommand("repair addpartitionmeta"); + Assert.assertTrue(cr.isSuccess()); + + // expected all 'No'. + String[][] rows = FSUtils.getAllPartitionFoldersThreeLevelsDown(fs, tablePath) + .stream() + .map(partition -> new String[]{partition, "No", "None"}) + .toArray(String[][]::new); + String expected = HoodiePrintHelper.print(new String[] {HoodieTableHeaderFields.HEADER_PARTITION_PATH, + HoodieTableHeaderFields.HEADER_METADATA_PRESENT, HoodieTableHeaderFields.HEADER_REPAIR_ACTION}, rows); + + Assert.assertEquals(expected, cr.getResult().toString()); + } + + /** + * Test case for real run 'repair addpartitionmeta'. + */ + @Test + public void testAddPartitionMetaWithRealRun() throws IOException { + // create commit instant + new File(tablePath + "/.hoodie/100.commit").createNewFile(); Review comment: ditto ########## File path: hudi-cli/src/test/java/org/apache/hudi/cli/commands/TestRepairsCommand.java ########## @@ -0,0 +1,206 @@ +/* + * 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.cli.commands; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.Path; +import org.apache.hudi.cli.AbstractShellIntegrationTest; +import org.apache.hudi.cli.HoodieCLI; +import org.apache.hudi.cli.HoodiePrintHelper; +import org.apache.hudi.cli.HoodieTableHeaderFields; +import org.apache.hudi.cli.common.HoodieTestCommitMetadataGenerator; +import org.apache.hudi.common.HoodieTestDataGenerator; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.common.model.HoodieTableType; +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.springframework.shell.core.CommandResult; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.net.URL; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.stream.Collectors; + +import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * Test class for {@link RepairsCommand}. + */ +public class TestRepairsCommand extends AbstractShellIntegrationTest { + + private String tablePath; + + @Before + public void init() throws IOException { + String tableName = "test_table"; + tablePath = basePath + File.separator + tableName; + + // Create table and connect + new TableCommand().createTable( + tablePath, "test_table", HoodieTableType.COPY_ON_WRITE.name(), + "", TimelineLayoutVersion.VERSION_1, "org.apache.hudi.common.model.HoodieAvroPayload"); + } + + /** + * Test case for dry run 'repair addpartitionmeta'. + */ + @Test + public void testAddPartitionMetaWithDryRun() throws IOException { + // create commit instant + new File(tablePath + "/.hoodie/100.commit").createNewFile(); + + // create partition path + String partition1 = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH; + String partition2 = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_SECOND_PARTITION_PATH; + String partition3 = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_THIRD_PARTITION_PATH; + fs.mkdirs(new Path(partition1)); + fs.mkdirs(new Path(partition2)); + fs.mkdirs(new Path(partition3)); + + // default is dry run. + CommandResult cr = getShell().executeCommand("repair addpartitionmeta"); + Assert.assertTrue(cr.isSuccess()); + + // expected all 'No'. + String[][] rows = FSUtils.getAllPartitionFoldersThreeLevelsDown(fs, tablePath) + .stream() + .map(partition -> new String[]{partition, "No", "None"}) + .toArray(String[][]::new); + String expected = HoodiePrintHelper.print(new String[] {HoodieTableHeaderFields.HEADER_PARTITION_PATH, + HoodieTableHeaderFields.HEADER_METADATA_PRESENT, HoodieTableHeaderFields.HEADER_REPAIR_ACTION}, rows); + + Assert.assertEquals(expected, cr.getResult().toString()); + } + + /** + * Test case for real run 'repair addpartitionmeta'. + */ + @Test + public void testAddPartitionMetaWithRealRun() throws IOException { + // create commit instant + new File(tablePath + "/.hoodie/100.commit").createNewFile(); + + // create partition path + String partition1 = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH; + String partition2 = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_SECOND_PARTITION_PATH; + String partition3 = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_THIRD_PARTITION_PATH; + fs.mkdirs(new Path(partition1)); + fs.mkdirs(new Path(partition2)); + fs.mkdirs(new Path(partition3)); Review comment: Multiple methods have this code snippet. Can we extract it into `init` method? Or Judge exists before create? ########## File path: hudi-cli/src/test/java/org/apache/hudi/cli/commands/TestRepairsCommand.java ########## @@ -0,0 +1,206 @@ +/* + * 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.cli.commands; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.Path; +import org.apache.hudi.cli.AbstractShellIntegrationTest; +import org.apache.hudi.cli.HoodieCLI; +import org.apache.hudi.cli.HoodiePrintHelper; +import org.apache.hudi.cli.HoodieTableHeaderFields; +import org.apache.hudi.cli.common.HoodieTestCommitMetadataGenerator; +import org.apache.hudi.common.HoodieTestDataGenerator; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.common.model.HoodieTableType; +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.springframework.shell.core.CommandResult; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.net.URL; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.stream.Collectors; + +import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * Test class for {@link RepairsCommand}. + */ +public class TestRepairsCommand extends AbstractShellIntegrationTest { + + private String tablePath; + + @Before + public void init() throws IOException { + String tableName = "test_table"; + tablePath = basePath + File.separator + tableName; + + // Create table and connect + new TableCommand().createTable( + tablePath, "test_table", HoodieTableType.COPY_ON_WRITE.name(), + "", TimelineLayoutVersion.VERSION_1, "org.apache.hudi.common.model.HoodieAvroPayload"); + } + + /** + * Test case for dry run 'repair addpartitionmeta'. + */ + @Test + public void testAddPartitionMetaWithDryRun() throws IOException { + // create commit instant + new File(tablePath + "/.hoodie/100.commit").createNewFile(); Review comment: Use `Files.createFile()`? ########## File path: hudi-cli/src/test/java/org/apache/hudi/cli/commands/TestRepairsCommand.java ########## @@ -0,0 +1,206 @@ +/* + * 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.cli.commands; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.Path; +import org.apache.hudi.cli.AbstractShellIntegrationTest; +import org.apache.hudi.cli.HoodieCLI; +import org.apache.hudi.cli.HoodiePrintHelper; +import org.apache.hudi.cli.HoodieTableHeaderFields; +import org.apache.hudi.cli.common.HoodieTestCommitMetadataGenerator; +import org.apache.hudi.common.HoodieTestDataGenerator; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.common.model.HoodieTableType; +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.springframework.shell.core.CommandResult; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.net.URL; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.stream.Collectors; + +import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * Test class for {@link RepairsCommand}. + */ +public class TestRepairsCommand extends AbstractShellIntegrationTest { + + private String tablePath; + + @Before + public void init() throws IOException { + String tableName = "test_table"; + tablePath = basePath + File.separator + tableName; + + // Create table and connect + new TableCommand().createTable( + tablePath, "test_table", HoodieTableType.COPY_ON_WRITE.name(), + "", TimelineLayoutVersion.VERSION_1, "org.apache.hudi.common.model.HoodieAvroPayload"); + } + + /** + * Test case for dry run 'repair addpartitionmeta'. + */ + @Test + public void testAddPartitionMetaWithDryRun() throws IOException { + // create commit instant + new File(tablePath + "/.hoodie/100.commit").createNewFile(); + + // create partition path + String partition1 = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH; + String partition2 = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_SECOND_PARTITION_PATH; + String partition3 = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_THIRD_PARTITION_PATH; + fs.mkdirs(new Path(partition1)); + fs.mkdirs(new Path(partition2)); + fs.mkdirs(new Path(partition3)); + + // default is dry run. + CommandResult cr = getShell().executeCommand("repair addpartitionmeta"); + Assert.assertTrue(cr.isSuccess()); + + // expected all 'No'. + String[][] rows = FSUtils.getAllPartitionFoldersThreeLevelsDown(fs, tablePath) + .stream() + .map(partition -> new String[]{partition, "No", "None"}) + .toArray(String[][]::new); + String expected = HoodiePrintHelper.print(new String[] {HoodieTableHeaderFields.HEADER_PARTITION_PATH, + HoodieTableHeaderFields.HEADER_METADATA_PRESENT, HoodieTableHeaderFields.HEADER_REPAIR_ACTION}, rows); + + Assert.assertEquals(expected, cr.getResult().toString()); + } + + /** + * Test case for real run 'repair addpartitionmeta'. + */ + @Test + public void testAddPartitionMetaWithRealRun() throws IOException { + // create commit instant + new File(tablePath + "/.hoodie/100.commit").createNewFile(); + + // create partition path + String partition1 = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH; + String partition2 = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_SECOND_PARTITION_PATH; + String partition3 = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_THIRD_PARTITION_PATH; + fs.mkdirs(new Path(partition1)); + fs.mkdirs(new Path(partition2)); + fs.mkdirs(new Path(partition3)); + + CommandResult cr = getShell().executeCommand("repair addpartitionmeta --dryrun false"); + Assert.assertTrue(cr.isSuccess()); + + List<String> paths = FSUtils.getAllPartitionFoldersThreeLevelsDown(fs, tablePath); + // after dry run, the action will be 'Repaired' + String[][] rows = paths.stream() + .map(partition -> new String[]{partition, "No", "Repaired"}) + .toArray(String[][]::new); + String expected = HoodiePrintHelper.print(new String[] {HoodieTableHeaderFields.HEADER_PARTITION_PATH, + HoodieTableHeaderFields.HEADER_METADATA_PRESENT, HoodieTableHeaderFields.HEADER_REPAIR_ACTION}, rows); + + Assert.assertEquals(expected, cr.getResult().toString()); + + cr = getShell().executeCommand("repair addpartitionmeta"); + + // after real run, Metadata is present now. + rows = paths.stream() + .map(partition -> new String[]{partition, "Yes", "None"}) + .toArray(String[][]::new); + expected = HoodiePrintHelper.print(new String[] {HoodieTableHeaderFields.HEADER_PARTITION_PATH, + HoodieTableHeaderFields.HEADER_METADATA_PRESENT, HoodieTableHeaderFields.HEADER_REPAIR_ACTION}, rows); + Assert.assertEquals(expected, cr.getResult().toString()); + } + + /** + * Test case for 'repair overwrite-hoodie-props'. + */ + @Test + public void testOverwriteHoodieProperties() throws IOException { + URL newProps = this.getClass().getClassLoader().getResource("table-config.properties"); + assertNotNull("New property file must exist", newProps); + + CommandResult cr = getShell().executeCommand("repair overwrite-hoodie-props --new-props-file " + newProps.getPath()); + Assert.assertTrue(cr.isSuccess()); + + Map<String, String> oldProps = HoodieCLI.getTableMetaClient().getTableConfig().getProps(); + + // after overwrite, the stored value in .hoodie is equals to which read from properties. + Map<String, String> result = HoodieTableMetaClient.reload(HoodieCLI.getTableMetaClient()).getTableConfig().getProps(); + Properties expectProps = new Properties(); + expectProps.load(new FileInputStream(new File(newProps.getPath()))); + + Map<String, String> expected = expectProps.entrySet().stream() + .collect(Collectors.toMap(e -> String.valueOf(e.getKey()), e -> String.valueOf(e.getValue()))); + Assert.assertEquals(expected, result); + + // check result + List<String> allPropsStr = Arrays.asList("hoodie.table.name", "hoodie.table.type", + "hoodie.archivelog.folder", "hoodie.timeline.layout.version"); + String[][] rows = allPropsStr.stream().sorted().map(key -> new String[]{key, + oldProps.getOrDefault(key, null), result.getOrDefault(key, null)}) + .toArray(String[][]::new); + String expect = HoodiePrintHelper.print(new String[] {HoodieTableHeaderFields.HEADER_HOODIE_PROPERTY, + HoodieTableHeaderFields.HEADER_OLD_VALUE, HoodieTableHeaderFields.HEADER_NEW_VALUE}, rows); + + Assert.assertEquals(expect, cr.getResult().toString()); + } + + /** + * Test case for 'repair corrupted clean files'. + */ + @Test + public void testRemoveCorruptedPendingCleanAction() throws IOException { + HoodieCLI.conf = jsc.hadoopConfiguration(); + + Configuration conf = HoodieCLI.conf; + + metaClient = HoodieCLI.getTableMetaClient(); + + // Create four requested files + for (int i = 100; i < 104; i++) { + String timestamp = String.valueOf(i); + // Write corrupted requested Compaction + HoodieTestCommitMetadataGenerator.createCompactionRequestedFile(tablePath, timestamp, conf); + } + + // reload metaclient + metaClient = HoodieTableMetaClient.reload(metaClient); + // first, there are four instants + assertEquals(4, metaClient.getActiveTimeline().filterInflightsAndRequested().getInstants().count()); + + CommandResult cr = getShell().executeCommand("repair corrupted clean files"); + assertTrue(cr.isSuccess()); + + // reload metaclient Review comment: `metaclient` -> `meta client`? ########## File path: hudi-cli/src/test/java/org/apache/hudi/cli/integ/ITTestRepairsCommand.java ########## @@ -0,0 +1,170 @@ +/* + * 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.cli.integ; + +import org.apache.avro.Schema; +import org.apache.hadoop.fs.FileStatus; +import org.apache.hadoop.fs.Path; +import org.apache.hudi.avro.HoodieAvroUtils; +import org.apache.hudi.cli.AbstractShellIntegrationTest; +import org.apache.hudi.cli.HoodieCLI; +import org.apache.hudi.cli.commands.RepairsCommand; +import org.apache.hudi.cli.commands.TableCommand; +import org.apache.hudi.common.HoodieClientTestUtils; +import org.apache.hudi.common.HoodieTestDataGenerator; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.common.model.HoodieLogFile; +import org.apache.hudi.common.model.HoodieRecord; +import org.apache.hudi.common.model.HoodieTableType; +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; +import org.apache.hudi.common.table.view.HoodieTableFileSystemView; +import org.apache.hudi.common.util.SchemaTestUtil; +import org.apache.spark.sql.Dataset; + +import org.junit.Before; +import org.junit.Test; +import org.springframework.shell.core.CommandResult; + +import java.io.File; +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; +import java.util.stream.Collectors; + +import static org.apache.spark.sql.functions.lit; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +/** + * Integration test class for {@link RepairsCommand#deduplicate}. + */ +public class ITTestRepairsCommand extends AbstractShellIntegrationTest { Review comment: It would be better to add the description you mentioned into the Javadoc of this class? ########## File path: hudi-cli/src/test/java/org/apache/hudi/cli/integ/ITTestRepairsCommand.java ########## @@ -0,0 +1,172 @@ +/* + * 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.cli.integ; + +import org.apache.avro.Schema; +import org.apache.hadoop.fs.FileStatus; +import org.apache.hadoop.fs.Path; +import org.apache.hudi.avro.HoodieAvroUtils; +import org.apache.hudi.cli.AbstractShellIntegrationTest; +import org.apache.hudi.cli.HoodieCLI; +import org.apache.hudi.cli.commands.RepairsCommand; +import org.apache.hudi.cli.commands.TableCommand; +import org.apache.hudi.common.HoodieClientTestUtils; +import org.apache.hudi.common.HoodieTestDataGenerator; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.common.model.HoodieLogFile; +import org.apache.hudi.common.model.HoodieRecord; +import org.apache.hudi.common.model.HoodieTableType; +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; +import org.apache.hudi.common.table.view.HoodieTableFileSystemView; +import org.apache.hudi.common.util.SchemaTestUtil; +import org.apache.spark.sql.Dataset; + +import org.junit.Before; +import org.junit.Test; +import org.springframework.shell.core.CommandResult; + +import java.io.File; +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; +import java.util.stream.Collectors; + +import static org.apache.spark.sql.functions.lit; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +/** + * Integration test class for {@link RepairsCommand#deduplicate}. + */ +public class ITTestRepairsCommand extends AbstractShellIntegrationTest { + String duplicatedPartitionPath; + String repairedOutputPath; + + @Before + public void init() throws IOException, URISyntaxException { + String tablePath = basePath + File.separator + "test_table"; + duplicatedPartitionPath = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH; + repairedOutputPath = basePath + File.separator + "tmp"; + + HoodieCLI.conf = jsc.hadoopConfiguration(); + + // Create table and connect + new TableCommand().createTable( + tablePath, "test_table", HoodieTableType.COPY_ON_WRITE.name(), + "", TimelineLayoutVersion.VERSION_1, "org.apache.hudi.common.model.HoodieAvroPayload"); + + // generate 200 records + Schema schema = HoodieAvroUtils.addMetadataFields(SchemaTestUtil.getSimpleSchema()); + + String fileName1 = "1_0_20160401010101.parquet"; + String fileName2 = "2_0_20160401010101.parquet"; + + List<HoodieRecord> hoodieRecords1 = SchemaTestUtil.generateHoodieTestRecords(0, 100, schema); + HoodieClientTestUtils.writeParquetFile(tablePath, HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH, + fileName1, hoodieRecords1, schema, null, false); + List<HoodieRecord> hoodieRecords2 = SchemaTestUtil.generateHoodieTestRecords(100, 100, schema); + HoodieClientTestUtils.writeParquetFile(tablePath, HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH, + fileName2, hoodieRecords2, schema, null, false); + + // generate commit file + String fileId1 = UUID.randomUUID().toString(); + String testWriteToken = "1-0-1"; + String commitTime = FSUtils.getCommitTime(fileName1); + new File(duplicatedPartitionPath + "/" + + FSUtils.makeLogFileName(fileId1, HoodieLogFile.DELTA_EXTENSION, commitTime, 1, testWriteToken)) + .createNewFile(); + new File(tablePath + "/.hoodie/" + commitTime + ".commit").createNewFile(); + + // read records and get 10 to generate duplicates + Dataset df = sqlContext.read().parquet(duplicatedPartitionPath); + + String fileName3 = "3_0_20160401010202.parquet"; + commitTime = FSUtils.getCommitTime(fileName3); + df.limit(10).withColumn("_hoodie_commit_time", lit(commitTime)) + .write().parquet(duplicatedPartitionPath + File.separator + fileName3); + new File(tablePath + "/.hoodie/" + commitTime + ".commit").createNewFile(); + + metaClient = HoodieTableMetaClient.reload(HoodieCLI.getTableMetaClient()); + } + + /** + * Test case for dry run deduplicate. + */ + @Test + public void testDeduplicate() throws IOException { + // get fs and check number of latest files + HoodieTableFileSystemView fsView = new HoodieTableFileSystemView(metaClient, + metaClient.getActiveTimeline().getCommitTimeline().filterCompletedInstants(), + fs.listStatus(new Path(duplicatedPartitionPath))); + List<String> filteredStatuses = fsView.getLatestBaseFiles().map(f -> f.getPath()).collect(Collectors.toList()); + assertEquals("There should be 3 files.", 3, filteredStatuses.size()); + + // Before deduplicate, all files contain 210 records + String[] files = filteredStatuses.toArray(new String[filteredStatuses.size()]); + Dataset df = sqlContext.read().parquet(files); + assertEquals(210, df.count()); + + String partitionPath = HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH; + String cmdStr = "repair deduplicate --duplicatedPartitionPath " + partitionPath + + " --repairedOutputPath " + repairedOutputPath + " --sparkMaster local"; + CommandResult cr = getShell().executeCommand(cmdStr); + assertTrue(cr.isSuccess()); + assertEquals(RepairsCommand.DEDUPLICATE_RETURN_PREFIX + repairedOutputPath, cr.getResult().toString()); + + // After deduplicate, there are 200 records + FileStatus[] fileStatus = fs.listStatus(new Path(repairedOutputPath)); + files = Arrays.stream(fileStatus).map(status -> status.getPath().toString()).toArray(String[]::new); + Dataset result = sqlContext.read().parquet(files); + assertEquals(200, result.count()); + } + + /** + * Test case for real run deduplicate. + */ + @Test + public void testDeduplicateWithReal() throws IOException { + // get fs and check number of latest files + HoodieTableFileSystemView fsView = new HoodieTableFileSystemView(metaClient, + metaClient.getActiveTimeline().getCommitTimeline().filterCompletedInstants(), + fs.listStatus(new Path(duplicatedPartitionPath))); + List<String> filteredStatuses = fsView.getLatestBaseFiles().map(f -> f.getPath()).collect(Collectors.toList()); + assertEquals("There should be 3 files.", 3, filteredStatuses.size()); + + // Before deduplicate, all files contain 210 records + String[] files = filteredStatuses.toArray(new String[filteredStatuses.size()]); Review comment: ditto ########## File path: hudi-cli/src/test/java/org/apache/hudi/cli/integ/ITTestRepairsCommand.java ########## @@ -0,0 +1,172 @@ +/* + * 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.cli.integ; + +import org.apache.avro.Schema; +import org.apache.hadoop.fs.FileStatus; +import org.apache.hadoop.fs.Path; +import org.apache.hudi.avro.HoodieAvroUtils; +import org.apache.hudi.cli.AbstractShellIntegrationTest; +import org.apache.hudi.cli.HoodieCLI; +import org.apache.hudi.cli.commands.RepairsCommand; +import org.apache.hudi.cli.commands.TableCommand; +import org.apache.hudi.common.HoodieClientTestUtils; +import org.apache.hudi.common.HoodieTestDataGenerator; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.common.model.HoodieLogFile; +import org.apache.hudi.common.model.HoodieRecord; +import org.apache.hudi.common.model.HoodieTableType; +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; +import org.apache.hudi.common.table.view.HoodieTableFileSystemView; +import org.apache.hudi.common.util.SchemaTestUtil; +import org.apache.spark.sql.Dataset; + +import org.junit.Before; +import org.junit.Test; +import org.springframework.shell.core.CommandResult; + +import java.io.File; +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; +import java.util.stream.Collectors; + +import static org.apache.spark.sql.functions.lit; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +/** + * Integration test class for {@link RepairsCommand#deduplicate}. + */ +public class ITTestRepairsCommand extends AbstractShellIntegrationTest { + String duplicatedPartitionPath; + String repairedOutputPath; Review comment: add an empty line before these two lines and mark them `private`. ########## File path: hudi-cli/src/test/java/org/apache/hudi/cli/integ/ITTestRepairsCommand.java ########## @@ -0,0 +1,172 @@ +/* + * 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.cli.integ; + +import org.apache.avro.Schema; +import org.apache.hadoop.fs.FileStatus; +import org.apache.hadoop.fs.Path; +import org.apache.hudi.avro.HoodieAvroUtils; +import org.apache.hudi.cli.AbstractShellIntegrationTest; +import org.apache.hudi.cli.HoodieCLI; +import org.apache.hudi.cli.commands.RepairsCommand; +import org.apache.hudi.cli.commands.TableCommand; +import org.apache.hudi.common.HoodieClientTestUtils; +import org.apache.hudi.common.HoodieTestDataGenerator; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.common.model.HoodieLogFile; +import org.apache.hudi.common.model.HoodieRecord; +import org.apache.hudi.common.model.HoodieTableType; +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; +import org.apache.hudi.common.table.view.HoodieTableFileSystemView; +import org.apache.hudi.common.util.SchemaTestUtil; +import org.apache.spark.sql.Dataset; + +import org.junit.Before; +import org.junit.Test; +import org.springframework.shell.core.CommandResult; + +import java.io.File; +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; +import java.util.stream.Collectors; + +import static org.apache.spark.sql.functions.lit; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +/** + * Integration test class for {@link RepairsCommand#deduplicate}. + */ +public class ITTestRepairsCommand extends AbstractShellIntegrationTest { + String duplicatedPartitionPath; + String repairedOutputPath; + + @Before + public void init() throws IOException, URISyntaxException { + String tablePath = basePath + File.separator + "test_table"; + duplicatedPartitionPath = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH; + repairedOutputPath = basePath + File.separator + "tmp"; + + HoodieCLI.conf = jsc.hadoopConfiguration(); + + // Create table and connect + new TableCommand().createTable( + tablePath, "test_table", HoodieTableType.COPY_ON_WRITE.name(), + "", TimelineLayoutVersion.VERSION_1, "org.apache.hudi.common.model.HoodieAvroPayload"); + + // generate 200 records + Schema schema = HoodieAvroUtils.addMetadataFields(SchemaTestUtil.getSimpleSchema()); + + String fileName1 = "1_0_20160401010101.parquet"; + String fileName2 = "2_0_20160401010101.parquet"; + + List<HoodieRecord> hoodieRecords1 = SchemaTestUtil.generateHoodieTestRecords(0, 100, schema); + HoodieClientTestUtils.writeParquetFile(tablePath, HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH, + fileName1, hoodieRecords1, schema, null, false); + List<HoodieRecord> hoodieRecords2 = SchemaTestUtil.generateHoodieTestRecords(100, 100, schema); + HoodieClientTestUtils.writeParquetFile(tablePath, HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH, + fileName2, hoodieRecords2, schema, null, false); + + // generate commit file + String fileId1 = UUID.randomUUID().toString(); + String testWriteToken = "1-0-1"; + String commitTime = FSUtils.getCommitTime(fileName1); + new File(duplicatedPartitionPath + "/" + + FSUtils.makeLogFileName(fileId1, HoodieLogFile.DELTA_EXTENSION, commitTime, 1, testWriteToken)) + .createNewFile(); + new File(tablePath + "/.hoodie/" + commitTime + ".commit").createNewFile(); + + // read records and get 10 to generate duplicates + Dataset df = sqlContext.read().parquet(duplicatedPartitionPath); + + String fileName3 = "3_0_20160401010202.parquet"; + commitTime = FSUtils.getCommitTime(fileName3); + df.limit(10).withColumn("_hoodie_commit_time", lit(commitTime)) + .write().parquet(duplicatedPartitionPath + File.separator + fileName3); + new File(tablePath + "/.hoodie/" + commitTime + ".commit").createNewFile(); Review comment: ditto ########## File path: hudi-cli/src/test/java/org/apache/hudi/cli/integ/ITTestRepairsCommand.java ########## @@ -0,0 +1,172 @@ +/* + * 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.cli.integ; + +import org.apache.avro.Schema; +import org.apache.hadoop.fs.FileStatus; +import org.apache.hadoop.fs.Path; +import org.apache.hudi.avro.HoodieAvroUtils; +import org.apache.hudi.cli.AbstractShellIntegrationTest; +import org.apache.hudi.cli.HoodieCLI; +import org.apache.hudi.cli.commands.RepairsCommand; +import org.apache.hudi.cli.commands.TableCommand; +import org.apache.hudi.common.HoodieClientTestUtils; +import org.apache.hudi.common.HoodieTestDataGenerator; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.common.model.HoodieLogFile; +import org.apache.hudi.common.model.HoodieRecord; +import org.apache.hudi.common.model.HoodieTableType; +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; +import org.apache.hudi.common.table.view.HoodieTableFileSystemView; +import org.apache.hudi.common.util.SchemaTestUtil; +import org.apache.spark.sql.Dataset; + +import org.junit.Before; +import org.junit.Test; +import org.springframework.shell.core.CommandResult; + +import java.io.File; +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; +import java.util.stream.Collectors; + +import static org.apache.spark.sql.functions.lit; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +/** + * Integration test class for {@link RepairsCommand#deduplicate}. + */ +public class ITTestRepairsCommand extends AbstractShellIntegrationTest { + String duplicatedPartitionPath; + String repairedOutputPath; + + @Before + public void init() throws IOException, URISyntaxException { + String tablePath = basePath + File.separator + "test_table"; + duplicatedPartitionPath = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH; + repairedOutputPath = basePath + File.separator + "tmp"; + + HoodieCLI.conf = jsc.hadoopConfiguration(); + + // Create table and connect + new TableCommand().createTable( + tablePath, "test_table", HoodieTableType.COPY_ON_WRITE.name(), + "", TimelineLayoutVersion.VERSION_1, "org.apache.hudi.common.model.HoodieAvroPayload"); + + // generate 200 records + Schema schema = HoodieAvroUtils.addMetadataFields(SchemaTestUtil.getSimpleSchema()); + + String fileName1 = "1_0_20160401010101.parquet"; + String fileName2 = "2_0_20160401010101.parquet"; + + List<HoodieRecord> hoodieRecords1 = SchemaTestUtil.generateHoodieTestRecords(0, 100, schema); + HoodieClientTestUtils.writeParquetFile(tablePath, HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH, + fileName1, hoodieRecords1, schema, null, false); + List<HoodieRecord> hoodieRecords2 = SchemaTestUtil.generateHoodieTestRecords(100, 100, schema); + HoodieClientTestUtils.writeParquetFile(tablePath, HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH, + fileName2, hoodieRecords2, schema, null, false); + + // generate commit file + String fileId1 = UUID.randomUUID().toString(); + String testWriteToken = "1-0-1"; + String commitTime = FSUtils.getCommitTime(fileName1); + new File(duplicatedPartitionPath + "/" + + FSUtils.makeLogFileName(fileId1, HoodieLogFile.DELTA_EXTENSION, commitTime, 1, testWriteToken)) + .createNewFile(); Review comment: `Files.createFile` ########## File path: hudi-cli/src/test/java/org/apache/hudi/cli/integ/ITTestRepairsCommand.java ########## @@ -0,0 +1,172 @@ +/* + * 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.cli.integ; + +import org.apache.avro.Schema; +import org.apache.hadoop.fs.FileStatus; +import org.apache.hadoop.fs.Path; +import org.apache.hudi.avro.HoodieAvroUtils; +import org.apache.hudi.cli.AbstractShellIntegrationTest; +import org.apache.hudi.cli.HoodieCLI; +import org.apache.hudi.cli.commands.RepairsCommand; +import org.apache.hudi.cli.commands.TableCommand; +import org.apache.hudi.common.HoodieClientTestUtils; +import org.apache.hudi.common.HoodieTestDataGenerator; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.common.model.HoodieLogFile; +import org.apache.hudi.common.model.HoodieRecord; +import org.apache.hudi.common.model.HoodieTableType; +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; +import org.apache.hudi.common.table.view.HoodieTableFileSystemView; +import org.apache.hudi.common.util.SchemaTestUtil; +import org.apache.spark.sql.Dataset; + +import org.junit.Before; +import org.junit.Test; +import org.springframework.shell.core.CommandResult; + +import java.io.File; +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; +import java.util.stream.Collectors; + +import static org.apache.spark.sql.functions.lit; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +/** + * Integration test class for {@link RepairsCommand#deduplicate}. + */ +public class ITTestRepairsCommand extends AbstractShellIntegrationTest { + String duplicatedPartitionPath; + String repairedOutputPath; + + @Before + public void init() throws IOException, URISyntaxException { + String tablePath = basePath + File.separator + "test_table"; + duplicatedPartitionPath = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH; + repairedOutputPath = basePath + File.separator + "tmp"; + + HoodieCLI.conf = jsc.hadoopConfiguration(); + + // Create table and connect + new TableCommand().createTable( + tablePath, "test_table", HoodieTableType.COPY_ON_WRITE.name(), + "", TimelineLayoutVersion.VERSION_1, "org.apache.hudi.common.model.HoodieAvroPayload"); + + // generate 200 records + Schema schema = HoodieAvroUtils.addMetadataFields(SchemaTestUtil.getSimpleSchema()); + + String fileName1 = "1_0_20160401010101.parquet"; + String fileName2 = "2_0_20160401010101.parquet"; + + List<HoodieRecord> hoodieRecords1 = SchemaTestUtil.generateHoodieTestRecords(0, 100, schema); + HoodieClientTestUtils.writeParquetFile(tablePath, HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH, + fileName1, hoodieRecords1, schema, null, false); + List<HoodieRecord> hoodieRecords2 = SchemaTestUtil.generateHoodieTestRecords(100, 100, schema); + HoodieClientTestUtils.writeParquetFile(tablePath, HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH, + fileName2, hoodieRecords2, schema, null, false); + + // generate commit file + String fileId1 = UUID.randomUUID().toString(); + String testWriteToken = "1-0-1"; + String commitTime = FSUtils.getCommitTime(fileName1); + new File(duplicatedPartitionPath + "/" + + FSUtils.makeLogFileName(fileId1, HoodieLogFile.DELTA_EXTENSION, commitTime, 1, testWriteToken)) + .createNewFile(); + new File(tablePath + "/.hoodie/" + commitTime + ".commit").createNewFile(); Review comment: ditto ########## File path: hudi-cli/src/test/java/org/apache/hudi/cli/commands/TestRepairsCommand.java ########## @@ -0,0 +1,206 @@ +/* + * 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.cli.commands; + +import org.apache.hadoop.conf.Configuration; +import org.apache.hadoop.fs.Path; +import org.apache.hudi.cli.AbstractShellIntegrationTest; +import org.apache.hudi.cli.HoodieCLI; +import org.apache.hudi.cli.HoodiePrintHelper; +import org.apache.hudi.cli.HoodieTableHeaderFields; +import org.apache.hudi.cli.common.HoodieTestCommitMetadataGenerator; +import org.apache.hudi.common.HoodieTestDataGenerator; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.common.model.HoodieTableType; +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; + +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; +import org.springframework.shell.core.CommandResult; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; +import java.net.URL; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.Properties; +import java.util.stream.Collectors; + +import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + +/** + * Test class for {@link RepairsCommand}. + */ +public class TestRepairsCommand extends AbstractShellIntegrationTest { + + private String tablePath; + + @Before + public void init() throws IOException { + String tableName = "test_table"; + tablePath = basePath + File.separator + tableName; + + // Create table and connect + new TableCommand().createTable( + tablePath, "test_table", HoodieTableType.COPY_ON_WRITE.name(), + "", TimelineLayoutVersion.VERSION_1, "org.apache.hudi.common.model.HoodieAvroPayload"); + } + + /** + * Test case for dry run 'repair addpartitionmeta'. + */ + @Test + public void testAddPartitionMetaWithDryRun() throws IOException { + // create commit instant + new File(tablePath + "/.hoodie/100.commit").createNewFile(); + + // create partition path + String partition1 = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH; + String partition2 = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_SECOND_PARTITION_PATH; + String partition3 = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_THIRD_PARTITION_PATH; + fs.mkdirs(new Path(partition1)); + fs.mkdirs(new Path(partition2)); + fs.mkdirs(new Path(partition3)); + + // default is dry run. + CommandResult cr = getShell().executeCommand("repair addpartitionmeta"); + Assert.assertTrue(cr.isSuccess()); + + // expected all 'No'. + String[][] rows = FSUtils.getAllPartitionFoldersThreeLevelsDown(fs, tablePath) + .stream() + .map(partition -> new String[]{partition, "No", "None"}) + .toArray(String[][]::new); + String expected = HoodiePrintHelper.print(new String[] {HoodieTableHeaderFields.HEADER_PARTITION_PATH, + HoodieTableHeaderFields.HEADER_METADATA_PRESENT, HoodieTableHeaderFields.HEADER_REPAIR_ACTION}, rows); + + Assert.assertEquals(expected, cr.getResult().toString()); + } + + /** + * Test case for real run 'repair addpartitionmeta'. + */ + @Test + public void testAddPartitionMetaWithRealRun() throws IOException { + // create commit instant + new File(tablePath + "/.hoodie/100.commit").createNewFile(); + + // create partition path + String partition1 = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH; + String partition2 = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_SECOND_PARTITION_PATH; + String partition3 = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_THIRD_PARTITION_PATH; + fs.mkdirs(new Path(partition1)); + fs.mkdirs(new Path(partition2)); + fs.mkdirs(new Path(partition3)); + + CommandResult cr = getShell().executeCommand("repair addpartitionmeta --dryrun false"); + Assert.assertTrue(cr.isSuccess()); + + List<String> paths = FSUtils.getAllPartitionFoldersThreeLevelsDown(fs, tablePath); + // after dry run, the action will be 'Repaired' + String[][] rows = paths.stream() + .map(partition -> new String[]{partition, "No", "Repaired"}) + .toArray(String[][]::new); + String expected = HoodiePrintHelper.print(new String[] {HoodieTableHeaderFields.HEADER_PARTITION_PATH, + HoodieTableHeaderFields.HEADER_METADATA_PRESENT, HoodieTableHeaderFields.HEADER_REPAIR_ACTION}, rows); + + Assert.assertEquals(expected, cr.getResult().toString()); + + cr = getShell().executeCommand("repair addpartitionmeta"); + + // after real run, Metadata is present now. + rows = paths.stream() + .map(partition -> new String[]{partition, "Yes", "None"}) + .toArray(String[][]::new); + expected = HoodiePrintHelper.print(new String[] {HoodieTableHeaderFields.HEADER_PARTITION_PATH, + HoodieTableHeaderFields.HEADER_METADATA_PRESENT, HoodieTableHeaderFields.HEADER_REPAIR_ACTION}, rows); + Assert.assertEquals(expected, cr.getResult().toString()); + } + + /** + * Test case for 'repair overwrite-hoodie-props'. + */ + @Test + public void testOverwriteHoodieProperties() throws IOException { + URL newProps = this.getClass().getClassLoader().getResource("table-config.properties"); + assertNotNull("New property file must exist", newProps); + + CommandResult cr = getShell().executeCommand("repair overwrite-hoodie-props --new-props-file " + newProps.getPath()); + Assert.assertTrue(cr.isSuccess()); + + Map<String, String> oldProps = HoodieCLI.getTableMetaClient().getTableConfig().getProps(); + + // after overwrite, the stored value in .hoodie is equals to which read from properties. + Map<String, String> result = HoodieTableMetaClient.reload(HoodieCLI.getTableMetaClient()).getTableConfig().getProps(); + Properties expectProps = new Properties(); + expectProps.load(new FileInputStream(new File(newProps.getPath()))); + + Map<String, String> expected = expectProps.entrySet().stream() + .collect(Collectors.toMap(e -> String.valueOf(e.getKey()), e -> String.valueOf(e.getValue()))); + Assert.assertEquals(expected, result); + + // check result + List<String> allPropsStr = Arrays.asList("hoodie.table.name", "hoodie.table.type", + "hoodie.archivelog.folder", "hoodie.timeline.layout.version"); + String[][] rows = allPropsStr.stream().sorted().map(key -> new String[]{key, + oldProps.getOrDefault(key, null), result.getOrDefault(key, null)}) + .toArray(String[][]::new); + String expect = HoodiePrintHelper.print(new String[] {HoodieTableHeaderFields.HEADER_HOODIE_PROPERTY, + HoodieTableHeaderFields.HEADER_OLD_VALUE, HoodieTableHeaderFields.HEADER_NEW_VALUE}, rows); + + Assert.assertEquals(expect, cr.getResult().toString()); + } + + /** + * Test case for 'repair corrupted clean files'. + */ + @Test + public void testRemoveCorruptedPendingCleanAction() throws IOException { + HoodieCLI.conf = jsc.hadoopConfiguration(); + + Configuration conf = HoodieCLI.conf; + + metaClient = HoodieCLI.getTableMetaClient(); + + // Create four requested files + for (int i = 100; i < 104; i++) { + String timestamp = String.valueOf(i); + // Write corrupted requested Compaction + HoodieTestCommitMetadataGenerator.createCompactionRequestedFile(tablePath, timestamp, conf); + } + + // reload metaclient Review comment: `metaclient` -> `meta client`? ########## File path: hudi-cli/src/test/java/org/apache/hudi/cli/integ/ITTestRepairsCommand.java ########## @@ -0,0 +1,172 @@ +/* + * 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.cli.integ; + +import org.apache.avro.Schema; +import org.apache.hadoop.fs.FileStatus; +import org.apache.hadoop.fs.Path; +import org.apache.hudi.avro.HoodieAvroUtils; +import org.apache.hudi.cli.AbstractShellIntegrationTest; +import org.apache.hudi.cli.HoodieCLI; +import org.apache.hudi.cli.commands.RepairsCommand; +import org.apache.hudi.cli.commands.TableCommand; +import org.apache.hudi.common.HoodieClientTestUtils; +import org.apache.hudi.common.HoodieTestDataGenerator; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.common.model.HoodieLogFile; +import org.apache.hudi.common.model.HoodieRecord; +import org.apache.hudi.common.model.HoodieTableType; +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; +import org.apache.hudi.common.table.view.HoodieTableFileSystemView; +import org.apache.hudi.common.util.SchemaTestUtil; +import org.apache.spark.sql.Dataset; + +import org.junit.Before; +import org.junit.Test; +import org.springframework.shell.core.CommandResult; + +import java.io.File; +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; +import java.util.stream.Collectors; + +import static org.apache.spark.sql.functions.lit; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +/** + * Integration test class for {@link RepairsCommand#deduplicate}. + */ +public class ITTestRepairsCommand extends AbstractShellIntegrationTest { + String duplicatedPartitionPath; + String repairedOutputPath; + + @Before + public void init() throws IOException, URISyntaxException { + String tablePath = basePath + File.separator + "test_table"; + duplicatedPartitionPath = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH; + repairedOutputPath = basePath + File.separator + "tmp"; + + HoodieCLI.conf = jsc.hadoopConfiguration(); + + // Create table and connect + new TableCommand().createTable( + tablePath, "test_table", HoodieTableType.COPY_ON_WRITE.name(), + "", TimelineLayoutVersion.VERSION_1, "org.apache.hudi.common.model.HoodieAvroPayload"); + + // generate 200 records + Schema schema = HoodieAvroUtils.addMetadataFields(SchemaTestUtil.getSimpleSchema()); + + String fileName1 = "1_0_20160401010101.parquet"; + String fileName2 = "2_0_20160401010101.parquet"; + + List<HoodieRecord> hoodieRecords1 = SchemaTestUtil.generateHoodieTestRecords(0, 100, schema); + HoodieClientTestUtils.writeParquetFile(tablePath, HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH, + fileName1, hoodieRecords1, schema, null, false); + List<HoodieRecord> hoodieRecords2 = SchemaTestUtil.generateHoodieTestRecords(100, 100, schema); + HoodieClientTestUtils.writeParquetFile(tablePath, HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH, + fileName2, hoodieRecords2, schema, null, false); + + // generate commit file + String fileId1 = UUID.randomUUID().toString(); + String testWriteToken = "1-0-1"; + String commitTime = FSUtils.getCommitTime(fileName1); + new File(duplicatedPartitionPath + "/" + + FSUtils.makeLogFileName(fileId1, HoodieLogFile.DELTA_EXTENSION, commitTime, 1, testWriteToken)) + .createNewFile(); + new File(tablePath + "/.hoodie/" + commitTime + ".commit").createNewFile(); + + // read records and get 10 to generate duplicates + Dataset df = sqlContext.read().parquet(duplicatedPartitionPath); + + String fileName3 = "3_0_20160401010202.parquet"; + commitTime = FSUtils.getCommitTime(fileName3); + df.limit(10).withColumn("_hoodie_commit_time", lit(commitTime)) + .write().parquet(duplicatedPartitionPath + File.separator + fileName3); + new File(tablePath + "/.hoodie/" + commitTime + ".commit").createNewFile(); + + metaClient = HoodieTableMetaClient.reload(HoodieCLI.getTableMetaClient()); + } + + /** + * Test case for dry run deduplicate. + */ + @Test + public void testDeduplicate() throws IOException { + // get fs and check number of latest files + HoodieTableFileSystemView fsView = new HoodieTableFileSystemView(metaClient, + metaClient.getActiveTimeline().getCommitTimeline().filterCompletedInstants(), + fs.listStatus(new Path(duplicatedPartitionPath))); + List<String> filteredStatuses = fsView.getLatestBaseFiles().map(f -> f.getPath()).collect(Collectors.toList()); + assertEquals("There should be 3 files.", 3, filteredStatuses.size()); + + // Before deduplicate, all files contain 210 records + String[] files = filteredStatuses.toArray(new String[filteredStatuses.size()]); Review comment: We do not need to specify the size for `toArray()`. `new String[0]` is OK. ########## File path: hudi-cli/src/test/java/org/apache/hudi/cli/integ/ITTestRepairsCommand.java ########## @@ -0,0 +1,172 @@ +/* + * 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.cli.integ; + +import org.apache.avro.Schema; +import org.apache.hadoop.fs.FileStatus; +import org.apache.hadoop.fs.Path; +import org.apache.hudi.avro.HoodieAvroUtils; +import org.apache.hudi.cli.AbstractShellIntegrationTest; +import org.apache.hudi.cli.HoodieCLI; +import org.apache.hudi.cli.commands.RepairsCommand; +import org.apache.hudi.cli.commands.TableCommand; +import org.apache.hudi.common.HoodieClientTestUtils; +import org.apache.hudi.common.HoodieTestDataGenerator; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.common.model.HoodieLogFile; +import org.apache.hudi.common.model.HoodieRecord; +import org.apache.hudi.common.model.HoodieTableType; +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; +import org.apache.hudi.common.table.view.HoodieTableFileSystemView; +import org.apache.hudi.common.util.SchemaTestUtil; +import org.apache.spark.sql.Dataset; + +import org.junit.Before; +import org.junit.Test; +import org.springframework.shell.core.CommandResult; + +import java.io.File; +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; +import java.util.stream.Collectors; + +import static org.apache.spark.sql.functions.lit; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +/** + * Integration test class for {@link RepairsCommand#deduplicate}. + */ +public class ITTestRepairsCommand extends AbstractShellIntegrationTest { + String duplicatedPartitionPath; + String repairedOutputPath; + + @Before + public void init() throws IOException, URISyntaxException { + String tablePath = basePath + File.separator + "test_table"; + duplicatedPartitionPath = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH; + repairedOutputPath = basePath + File.separator + "tmp"; + + HoodieCLI.conf = jsc.hadoopConfiguration(); + + // Create table and connect + new TableCommand().createTable( + tablePath, "test_table", HoodieTableType.COPY_ON_WRITE.name(), + "", TimelineLayoutVersion.VERSION_1, "org.apache.hudi.common.model.HoodieAvroPayload"); + + // generate 200 records + Schema schema = HoodieAvroUtils.addMetadataFields(SchemaTestUtil.getSimpleSchema()); + + String fileName1 = "1_0_20160401010101.parquet"; + String fileName2 = "2_0_20160401010101.parquet"; + + List<HoodieRecord> hoodieRecords1 = SchemaTestUtil.generateHoodieTestRecords(0, 100, schema); + HoodieClientTestUtils.writeParquetFile(tablePath, HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH, + fileName1, hoodieRecords1, schema, null, false); + List<HoodieRecord> hoodieRecords2 = SchemaTestUtil.generateHoodieTestRecords(100, 100, schema); + HoodieClientTestUtils.writeParquetFile(tablePath, HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH, + fileName2, hoodieRecords2, schema, null, false); + + // generate commit file + String fileId1 = UUID.randomUUID().toString(); + String testWriteToken = "1-0-1"; + String commitTime = FSUtils.getCommitTime(fileName1); + new File(duplicatedPartitionPath + "/" + + FSUtils.makeLogFileName(fileId1, HoodieLogFile.DELTA_EXTENSION, commitTime, 1, testWriteToken)) + .createNewFile(); + new File(tablePath + "/.hoodie/" + commitTime + ".commit").createNewFile(); + + // read records and get 10 to generate duplicates + Dataset df = sqlContext.read().parquet(duplicatedPartitionPath); + + String fileName3 = "3_0_20160401010202.parquet"; + commitTime = FSUtils.getCommitTime(fileName3); + df.limit(10).withColumn("_hoodie_commit_time", lit(commitTime)) + .write().parquet(duplicatedPartitionPath + File.separator + fileName3); + new File(tablePath + "/.hoodie/" + commitTime + ".commit").createNewFile(); + + metaClient = HoodieTableMetaClient.reload(HoodieCLI.getTableMetaClient()); + } + + /** + * Test case for dry run deduplicate. + */ + @Test + public void testDeduplicate() throws IOException { + // get fs and check number of latest files + HoodieTableFileSystemView fsView = new HoodieTableFileSystemView(metaClient, + metaClient.getActiveTimeline().getCommitTimeline().filterCompletedInstants(), + fs.listStatus(new Path(duplicatedPartitionPath))); + List<String> filteredStatuses = fsView.getLatestBaseFiles().map(f -> f.getPath()).collect(Collectors.toList()); Review comment: `map(f -> f.getPath())` -> `map(HoodieBaseFile::getPath)` ########## File path: hudi-cli/src/test/java/org/apache/hudi/cli/integ/ITTestRepairsCommand.java ########## @@ -0,0 +1,172 @@ +/* + * 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.cli.integ; + +import org.apache.avro.Schema; +import org.apache.hadoop.fs.FileStatus; +import org.apache.hadoop.fs.Path; +import org.apache.hudi.avro.HoodieAvroUtils; +import org.apache.hudi.cli.AbstractShellIntegrationTest; +import org.apache.hudi.cli.HoodieCLI; +import org.apache.hudi.cli.commands.RepairsCommand; +import org.apache.hudi.cli.commands.TableCommand; +import org.apache.hudi.common.HoodieClientTestUtils; +import org.apache.hudi.common.HoodieTestDataGenerator; +import org.apache.hudi.common.fs.FSUtils; +import org.apache.hudi.common.model.HoodieLogFile; +import org.apache.hudi.common.model.HoodieRecord; +import org.apache.hudi.common.model.HoodieTableType; +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.timeline.versioning.TimelineLayoutVersion; +import org.apache.hudi.common.table.view.HoodieTableFileSystemView; +import org.apache.hudi.common.util.SchemaTestUtil; +import org.apache.spark.sql.Dataset; + +import org.junit.Before; +import org.junit.Test; +import org.springframework.shell.core.CommandResult; + +import java.io.File; +import java.io.IOException; +import java.net.URISyntaxException; +import java.util.Arrays; +import java.util.List; +import java.util.UUID; +import java.util.stream.Collectors; + +import static org.apache.spark.sql.functions.lit; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +/** + * Integration test class for {@link RepairsCommand#deduplicate}. + */ +public class ITTestRepairsCommand extends AbstractShellIntegrationTest { + String duplicatedPartitionPath; + String repairedOutputPath; + + @Before + public void init() throws IOException, URISyntaxException { + String tablePath = basePath + File.separator + "test_table"; + duplicatedPartitionPath = tablePath + File.separator + HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH; + repairedOutputPath = basePath + File.separator + "tmp"; + + HoodieCLI.conf = jsc.hadoopConfiguration(); + + // Create table and connect + new TableCommand().createTable( + tablePath, "test_table", HoodieTableType.COPY_ON_WRITE.name(), + "", TimelineLayoutVersion.VERSION_1, "org.apache.hudi.common.model.HoodieAvroPayload"); + + // generate 200 records + Schema schema = HoodieAvroUtils.addMetadataFields(SchemaTestUtil.getSimpleSchema()); + + String fileName1 = "1_0_20160401010101.parquet"; + String fileName2 = "2_0_20160401010101.parquet"; + + List<HoodieRecord> hoodieRecords1 = SchemaTestUtil.generateHoodieTestRecords(0, 100, schema); + HoodieClientTestUtils.writeParquetFile(tablePath, HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH, + fileName1, hoodieRecords1, schema, null, false); + List<HoodieRecord> hoodieRecords2 = SchemaTestUtil.generateHoodieTestRecords(100, 100, schema); + HoodieClientTestUtils.writeParquetFile(tablePath, HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH, + fileName2, hoodieRecords2, schema, null, false); + + // generate commit file + String fileId1 = UUID.randomUUID().toString(); + String testWriteToken = "1-0-1"; + String commitTime = FSUtils.getCommitTime(fileName1); + new File(duplicatedPartitionPath + "/" + + FSUtils.makeLogFileName(fileId1, HoodieLogFile.DELTA_EXTENSION, commitTime, 1, testWriteToken)) + .createNewFile(); + new File(tablePath + "/.hoodie/" + commitTime + ".commit").createNewFile(); + + // read records and get 10 to generate duplicates + Dataset df = sqlContext.read().parquet(duplicatedPartitionPath); + + String fileName3 = "3_0_20160401010202.parquet"; + commitTime = FSUtils.getCommitTime(fileName3); + df.limit(10).withColumn("_hoodie_commit_time", lit(commitTime)) + .write().parquet(duplicatedPartitionPath + File.separator + fileName3); + new File(tablePath + "/.hoodie/" + commitTime + ".commit").createNewFile(); + + metaClient = HoodieTableMetaClient.reload(HoodieCLI.getTableMetaClient()); + } + + /** + * Test case for dry run deduplicate. + */ + @Test + public void testDeduplicate() throws IOException { + // get fs and check number of latest files + HoodieTableFileSystemView fsView = new HoodieTableFileSystemView(metaClient, + metaClient.getActiveTimeline().getCommitTimeline().filterCompletedInstants(), + fs.listStatus(new Path(duplicatedPartitionPath))); + List<String> filteredStatuses = fsView.getLatestBaseFiles().map(f -> f.getPath()).collect(Collectors.toList()); + assertEquals("There should be 3 files.", 3, filteredStatuses.size()); + + // Before deduplicate, all files contain 210 records + String[] files = filteredStatuses.toArray(new String[filteredStatuses.size()]); + Dataset df = sqlContext.read().parquet(files); + assertEquals(210, df.count()); + + String partitionPath = HoodieTestDataGenerator.DEFAULT_FIRST_PARTITION_PATH; + String cmdStr = "repair deduplicate --duplicatedPartitionPath " + partitionPath + + " --repairedOutputPath " + repairedOutputPath + " --sparkMaster local"; + CommandResult cr = getShell().executeCommand(cmdStr); + assertTrue(cr.isSuccess()); + assertEquals(RepairsCommand.DEDUPLICATE_RETURN_PREFIX + repairedOutputPath, cr.getResult().toString()); + + // After deduplicate, there are 200 records + FileStatus[] fileStatus = fs.listStatus(new Path(repairedOutputPath)); + files = Arrays.stream(fileStatus).map(status -> status.getPath().toString()).toArray(String[]::new); + Dataset result = sqlContext.read().parquet(files); + assertEquals(200, result.count()); + } + + /** + * Test case for real run deduplicate. + */ + @Test + public void testDeduplicateWithReal() throws IOException { + // get fs and check number of latest files + HoodieTableFileSystemView fsView = new HoodieTableFileSystemView(metaClient, + metaClient.getActiveTimeline().getCommitTimeline().filterCompletedInstants(), + fs.listStatus(new Path(duplicatedPartitionPath))); + List<String> filteredStatuses = fsView.getLatestBaseFiles().map(f -> f.getPath()).collect(Collectors.toList()); Review comment: ditto ---------------------------------------------------------------- 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]
