Skip to content

HIVE-26712: HCatMapReduceTest writes test files in project base directory instead of build directory. #3738

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
abstractdog merged 1 commit into from
Nov 18, 2022
Merged

HIVE-26712: HCatMapReduceTest writes test files in project base directory instead of build directory. #3738

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion hcatalog/core/.gitignore
View file
Open in desktop

This file was deleted.

14 changes: 7 additions & 7 deletions hcatalog/core/src/test/java/org/apache/hive/hcatalog/mapreduce/HCatMapReduceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@

import com.google.common.collect.ImmutableSet;

import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collection;
Expand Down Expand Up @@ -87,6 +88,8 @@
@RunWith(Parameterized.class)
public abstract class HCatMapReduceTest extends HCatBaseTest {
private static final Logger LOG = LoggerFactory.getLogger(HCatMapReduceTest.class);
private static final Path TEST_TMP_DIR = new Path(System.getProperty("test.tmp.dir",
"target" + File.separator + "test" + File.separator + "tmp"));

protected static String dbName = Warehouse.DEFAULT_DATABASE_NAME;
protected static final String TABLE_NAME = "testHCatMapReduceTable";
Expand Down Expand Up @@ -310,16 +313,16 @@ Job runMRCreate(Map<String, String> partitionValues, List<HCatFieldSchema> parti

if (asSingleMapTask) {
// One input path would mean only one map task
Path path = new Path(fs.getWorkingDirectory(), "mapred/testHCatMapReduceInput");
Path path = new Path(TEST_TMP_DIR, "mapred/testHCatMapReduceInput");
createInputFile(path, writeCount);
TextInputFormat.setInputPaths(job, path);
} else {
// Create two input paths so that two map tasks get triggered. There could be other ways
// to trigger two map tasks.
Path path = new Path(fs.getWorkingDirectory(), "mapred/testHCatMapReduceInput");
Path path = new Path(TEST_TMP_DIR, "mapred/testHCatMapReduceInput");
createInputFile(path, writeCount / 2);

Path path2 = new Path(fs.getWorkingDirectory(), "mapred/testHCatMapReduceInput2");
Path path2 = new Path(TEST_TMP_DIR, "mapred/testHCatMapReduceInput2");
createInputFile(path2, (writeCount - writeCount / 2));

TextInputFormat.setInputPaths(job, path, path2);
Expand Down Expand Up @@ -400,7 +403,7 @@ List<HCatRecord> runMRRead(int readCount, String filter) throws Exception {

job.setNumReduceTasks(0);

Path path = new Path(fs.getWorkingDirectory(), "mapred/testHCatMapReduceOutput");
Path path = new Path(TEST_TMP_DIR, "mapred/testHCatMapReduceOutput");
if (fs.exists(path)) {
fs.delete(path, true);
}
Expand Down Expand Up @@ -428,6 +431,3 @@ protected HCatSchema getTableSchema() throws Exception {
}

}