[
https://issues.apache.org/jira/browse/HADOOP-17021?focusedWorklogId=489709&page=com.atlassian.jira.plugin.system.issuetabpanels:worklog-tabpanel#worklog-489709
]
ASF GitHub Bot logged work on HADOOP-17021:
-------------------------------------------
Author: ASF GitHub Bot
Created on: 23/Sep/20 17:37
Start Date: 23/Sep/20 17:37
Worklog Time Spent: 10m
Work Description: steveloughran commented on a change in pull request
#1993:
URL: https://github.com/apache/hadoop/pull/1993#discussion_r493770216
##########
File path:
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestFsShellConcat.java
##########
@@ -0,0 +1,166 @@
+/**
+ * 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.hadoop.fs.shell;
+
+import org.junit.Before;
Review comment:
move the non java. imports to a block below java. and above the
org.apache block
##########
File path:
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Concat.java
##########
@@ -0,0 +1,90 @@
+/**
+ * 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.hadoop.fs.shell;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.PathIOException;
+
+import java.io.FileNotFoundException;
Review comment:
stick the java import block at the top. thanks
##########
File path:
hadoop-common-project/hadoop-common/src/test/java/org/apache/hadoop/fs/shell/TestFsShellConcat.java
##########
@@ -0,0 +1,166 @@
+/**
+ * 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.hadoop.fs.shell;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.mockito.Mockito;
+import org.assertj.core.api.Assertions;
+import java.io.ByteArrayOutputStream;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.net.URI;
+import java.util.Random;
+
+import org.apache.hadoop.conf.Configuration;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.FsShell;
+import org.apache.hadoop.fs.LocalFileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.io.IOUtils;
+import org.apache.hadoop.test.GenericTestUtils;
+import org.apache.hadoop.fs.contract.ContractTestUtils;
+import org.apache.hadoop.test.AbstractHadoopTestBase;
+
+import static org.mockito.ArgumentMatchers.any;
+import static org.junit.Assert.assertEquals;
+
+/**
+ * Test Concat.
+ */
+public class TestFsShellConcat extends AbstractHadoopTestBase {
+
+ private static Configuration conf;
+ private static FsShell shell;
+ private static LocalFileSystem lfs;
+ private static Path testRootDir;
+ private static Path dstPath;
+
+ @Before
+ public void before() throws IOException {
+ conf = new Configuration();
+ shell = new FsShell(conf);
+ lfs = FileSystem.getLocal(conf);
+ testRootDir = lfs.makeQualified(new Path(GenericTestUtils.getTempPath(
+ "testFsShellCopy")));
+
+ lfs.delete(testRootDir, true);
+ lfs.mkdirs(testRootDir);
+ lfs.setWorkingDirectory(testRootDir);
+ dstPath = new Path(testRootDir, "dstFile");
+ lfs.create(dstPath).close();
+
+ Random random = new Random();
+ for (int i = 0; i < 10; i++) {
+ OutputStream out =
+ lfs.create(new Path(testRootDir, String.format("file-%02d", i)));
+ out.write(random.nextInt());
+ out.close();
+ }
+ }
+
+ @Test
+ public void testConcat() throws Exception {
+ // Read concatenated files to build the expected file content.
+ ByteArrayOutputStream out = new ByteArrayOutputStream();
+ for (int i = 0; i < 10; i++) {
+ try (InputStream in = lfs
+ .open(new Path(testRootDir, String.format("file-%02d", i)))) {
+ IOUtils.copyBytes(in, out, 1024);
+ }
+ }
+ byte[] expectContent = out.toByteArray();
+
+ // Do concat.
+ FileSystem mockFs = Mockito.mock(FileSystem.class);
+ Mockito.doAnswer(invocation -> {
+ Object[] args = invocation.getArguments();
+ Path target = (Path)args[0];
+ Path[] src = (Path[]) args[1];
+ mockConcat(target, src);
+ return null;
+ }).when(mockFs).concat(any(Path.class), any(Path[].class));
+ Concat.setTstFs(mockFs);
+ shellRun(0, "-concat", dstPath.toString(), testRootDir+"/file-*");
+
+ // Verify concat result.
+ ContractTestUtils
+ .assertPathExists(lfs, "The target file doesn't exist.", dstPath);
+ assertEquals(1, lfs.listStatus(testRootDir).length);
Review comment:
consider AssertJ assertions here, as they will include the list contents
in the error
##########
File path:
hadoop-common-project/hadoop-common/src/main/java/org/apache/hadoop/fs/shell/Concat.java
##########
@@ -0,0 +1,90 @@
+/**
+ * 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.hadoop.fs.shell;
+
+import com.google.common.annotations.VisibleForTesting;
+import org.apache.hadoop.classification.InterfaceAudience;
+import org.apache.hadoop.classification.InterfaceStability;
+import org.apache.hadoop.fs.FileSystem;
+import org.apache.hadoop.fs.Path;
+import org.apache.hadoop.fs.PathIOException;
+
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.util.LinkedList;
+
+/**
+ * Concat the given files.
+ */
+@InterfaceAudience.Private
+@InterfaceStability.Unstable
+public class Concat extends FsCommand {
+ public static void registerCommands(CommandFactory factory) {
+ factory.addClass(Concat.class, "-concat");
+ }
+
+ public static final String NAME = "concat";
+ public static final String USAGE = "<target path> <src path> <src path> ...";
+ public static final String DESCRIPTION = "Concatenate existing source files"
+ + " into the target file. Target file and source files should be in the"
+ + " same directory.";
+ private static FileSystem tstFs; // test only.
Review comment:
`tstFs` needs some vowels. How about `testFs`?
----------------------------------------------------------------
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:
us...@infra.apache.org
Issue Time Tracking
-------------------
Worklog Id: (was: 489709)
Time Spent: 2h 20m (was: 2h 10m)
> Add concat fs command
> ---------------------
>
> Key: HADOOP-17021
> URL: https://issues.apache.org/jira/browse/HADOOP-17021
> Project: Hadoop Common
> Issue Type: Improvement
> Reporter: Jinglun
> Assignee: Jinglun
> Priority: Minor
> Labels: pull-request-available
> Attachments: HADOOP-17021.001.patch
>
> Time Spent: 2h 20m
> Remaining Estimate: 0h
>
> We should add one concat fs command for ease of use. It concatenates existing
> source files into the target file using FileSystem.concat().
--
This message was sent by Atlassian Jira
(v8.3.4#803005)
---------------------------------------------------------------------
To unsubscribe, e-mail: common-issues-unsubscr...@hadoop.apache.org
For additional commands, e-mail: common-issues-h...@hadoop.apache.org
