From commits-return-14026-archive-asf-public=cust-asf.ponee.io@hudi.apache.org Mon Mar 23 03:09:30 2020 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [207.244.88.153]) by mx-eu-01.ponee.io (Postfix) with SMTP id 8C156180645 for ; Mon, 23 Mar 2020 04:09:30 +0100 (CET) Received: (qmail 37259 invoked by uid 500); 23 Mar 2020 03:09:29 -0000 Mailing-List: contact commits-help@hudi.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@hudi.apache.org Delivered-To: mailing list commits@hudi.apache.org Received: (qmail 37239 invoked by uid 99); 23 Mar 2020 03:09:29 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 23 Mar 2020 03:09:29 +0000 From: GitBox To: commits@hudi.apache.org Subject: [GitHub] [incubator-hudi] yanghua commented on a change in pull request #1424: [HUDI-697]Add unit test for ArchivedCommitsCommand Message-ID: <158493296896.28569.10686773486207129286.gitbox@gitbox.apache.org> References: In-Reply-To: Date: Mon, 23 Mar 2020 03:09:28 -0000 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit yanghua commented on a change in pull request #1424: [HUDI-697]Add unit test for ArchivedCommitsCommand URL: https://github.com/apache/incubator-hudi/pull/1424#discussion_r396192858 ########## File path: hudi-cli/src/test/java/org/apache/hudi/cli/commands/TestArchivedCommitsCommand.java ########## @@ -0,0 +1,194 @@ +/* + * 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.hudi.cli.AbstractShellIntegrationTest; +import org.apache.hudi.cli.HoodieCLI; +import org.apache.hudi.cli.HoodiePrintHelper; +import org.apache.hudi.cli.TableHeader; +import org.apache.hudi.cli.common.HoodieTestCommitMetadataGenerator; +import org.apache.hudi.cli.common.HoodieTestCommitUtilities; +import org.apache.hudi.common.model.HoodieCommitMetadata; +import org.apache.hudi.common.table.HoodieTableMetaClient; +import org.apache.hudi.common.table.HoodieTimeline; +import org.apache.hudi.common.table.timeline.HoodieInstant; +import org.apache.hudi.config.HoodieCompactionConfig; +import org.apache.hudi.config.HoodieWriteConfig; +import org.apache.hudi.table.HoodieCommitArchiveLog; + +import org.junit.After; +import org.junit.Before; +import org.junit.Test; +import org.springframework.shell.core.CommandResult; + +import java.io.File; +import java.io.IOException; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; + +/** + * Test Cases for {@link ArchivedCommitsCommand}. + */ +public class TestArchivedCommitsCommand extends AbstractShellIntegrationTest { + + private String tablePath; + + @Before + public void init() throws IOException { + initDFS(); + jsc.hadoopConfiguration().addResource(dfs.getConf()); + HoodieCLI.conf = dfs.getConf(); + + // Create table and connect + String tableName = "test_table"; + tablePath = basePath + File.separator + tableName; + new TableCommand().createTable( + tablePath, tableName, + "COPY_ON_WRITE", "", 1, "org.apache.hudi.common.model.HoodieAvroPayload"); + + metaClient = HoodieCLI.getTableMetaClient(); + + // Generate archive + HoodieWriteConfig cfg = HoodieWriteConfig.newBuilder().withPath(tablePath) + .withSchema(HoodieTestCommitMetadataGenerator.TRIP_EXAMPLE_SCHEMA).withParallelism(2, 2) + .withCompactionConfig(HoodieCompactionConfig.newBuilder().retainCommits(1).archiveCommitsWith(2, 3).build()) + .forTable("test-trip-table").build(); + + // Create six commits + for (int i = 100; i < 106; i++) { + String timestamp = String.valueOf(i); + // Requested Compaction + HoodieTestCommitMetadataGenerator.createCompactionAuxiliaryMetadata(tablePath, + new HoodieInstant(HoodieInstant.State.REQUESTED, HoodieTimeline.COMPACTION_ACTION, timestamp), dfs.getConf()); + // Inflight Compaction + HoodieTestCommitMetadataGenerator.createCompactionAuxiliaryMetadata(tablePath, + new HoodieInstant(HoodieInstant.State.INFLIGHT, HoodieTimeline.COMPACTION_ACTION, timestamp), dfs.getConf()); + HoodieTestCommitMetadataGenerator.createCommitFileWithMetadata(tablePath, timestamp, dfs.getConf()); + } + + metaClient = HoodieTableMetaClient.reload(metaClient); + // reload the timeline and get all the commits before archive + HoodieTimeline timeline = metaClient.getActiveTimeline().reload().getAllCommitsTimeline().filterCompletedInstants(); + assertEquals("Loaded 6 commits and the count should match", 6, timeline.countInstants()); Review comment: IMO, we'd better to use assertion in a method that marks with `@Test` annotation. WDYT? ---------------------------------------------------------------- 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: users@infra.apache.org With regards, Apache Git Services