Repository: incubator-apex-malhar Updated Branches: refs/heads/devel-3 a3278edd7 -> b98bae305
MLHR-1901 #resolve Project: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/commit/5fba6294 Tree: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/tree/5fba6294 Diff: http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/diff/5fba6294 Branch: refs/heads/devel-3 Commit: 5fba6294d09e33fada8a9dc17fe6dc906252b936 Parents: 08deae6 Author: Tushar R. Gosavi <[email protected]> Authored: Wed Dec 9 15:49:33 2015 +0530 Committer: Tushar R. Gosavi <[email protected]> Committed: Thu Dec 10 22:24:43 2015 +0530 ---------------------------------------------------------------------- .../java/org/apache/hadoop/io/file/tfile/DTFileTest.java | 10 ++++++---- .../java/org/apache/hadoop/io/file/tfile/TestDTFile.java | 2 +- .../apache/hadoop/io/file/tfile/TestDTFileByteArrays.java | 2 +- .../apache/hadoop/io/file/tfile/TestTFileComparator2.java | 2 +- .../apache/hadoop/io/file/tfile/TestTFileComparators.java | 2 +- .../org/apache/hadoop/io/file/tfile/TestTFileSeek.java | 2 +- .../hadoop/io/file/tfile/TestTFileSeqFileComparison.java | 2 +- .../org/apache/hadoop/io/file/tfile/TestTFileSplit.java | 2 +- .../org/apache/hadoop/io/file/tfile/TestTFileStreams.java | 2 +- .../hadoop/io/file/tfile/TestTFileUnsortedByteArrays.java | 2 +- 10 files changed, 15 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/5fba6294/library/src/test/java/org/apache/hadoop/io/file/tfile/DTFileTest.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/org/apache/hadoop/io/file/tfile/DTFileTest.java b/library/src/test/java/org/apache/hadoop/io/file/tfile/DTFileTest.java index 003d9eb..deac363 100644 --- a/library/src/test/java/org/apache/hadoop/io/file/tfile/DTFileTest.java +++ b/library/src/test/java/org/apache/hadoop/io/file/tfile/DTFileTest.java @@ -36,6 +36,9 @@ import java.util.Random; public class DTFileTest { + private static String ROOT = + System.getProperty("test.build.data", "target/tfile-test"); + private Configuration conf; private Path path; private FileSystem fs; @@ -70,7 +73,7 @@ public class DTFileTest conf.setInt("tfile.fs.input.buffer.size", tconf.fsInputBufferSize); conf.setInt("tfile.fs.output.buffer.size", tconf.fsOutputBufferSize); - path = new Path("tmp/dtfile"); + path = new Path(ROOT, "dtfile"); fs = path.getFileSystem(conf); timer = new NanoTimer(false); rng = new Random(); @@ -163,9 +166,8 @@ public class DTFileTest DTFile.Reader.Scanner scanner = reader.createScanner(); /* Read first key in the file */ - long numBlocks = CacheManager.getCacheSize(); scanner.lowerBound(key); - Assert.assertEquals("Cache contains some blocks ", numBlocks + 1, CacheManager.getCacheSize()); + Assert.assertTrue("Cache contains some blocks ", CacheManager.getCacheSize() > 0); /* Next key does not add a new block in cache, it reads directly from cache */ // close scanner, so that it does not use its own cache. @@ -174,7 +176,7 @@ public class DTFileTest bb.clear(); bb.putLong(ikey); - numBlocks = CacheManager.getCacheSize(); + long numBlocks = CacheManager.getCacheSize(); long hit = CacheManager.getCache().stats().hitCount(); scanner.lowerBound(key); Assert.assertEquals("Cache contains some blocks ", CacheManager.getCacheSize(), numBlocks); http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/5fba6294/library/src/test/java/org/apache/hadoop/io/file/tfile/TestDTFile.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/org/apache/hadoop/io/file/tfile/TestDTFile.java b/library/src/test/java/org/apache/hadoop/io/file/tfile/TestDTFile.java index 49fedeb..12857d7 100644 --- a/library/src/test/java/org/apache/hadoop/io/file/tfile/TestDTFile.java +++ b/library/src/test/java/org/apache/hadoop/io/file/tfile/TestDTFile.java @@ -40,7 +40,7 @@ import org.apache.hadoop.io.file.tfile.DTFile.Reader.Scanner; */ public class TestDTFile extends TestCase { private static String ROOT = - System.getProperty("test.build.data", "/tmp/tfile-test"); + System.getProperty("test.build.data", "target/tfile-test"); private FileSystem fs; private Configuration conf; private static final int minBlockSize = 512; http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/5fba6294/library/src/test/java/org/apache/hadoop/io/file/tfile/TestDTFileByteArrays.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/org/apache/hadoop/io/file/tfile/TestDTFileByteArrays.java b/library/src/test/java/org/apache/hadoop/io/file/tfile/TestDTFileByteArrays.java index a1fa5c8..071d752 100644 --- a/library/src/test/java/org/apache/hadoop/io/file/tfile/TestDTFileByteArrays.java +++ b/library/src/test/java/org/apache/hadoop/io/file/tfile/TestDTFileByteArrays.java @@ -47,7 +47,7 @@ import org.junit.Test; */ public class TestDTFileByteArrays { private static String ROOT = - System.getProperty("test.build.data", "/tmp/tfile-test"); + System.getProperty("test.build.data", "target/tfile-test"); private final static int BLOCK_SIZE = 512; private final static int BUF_SIZE = 64; private final static int K = 1024; http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/5fba6294/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileComparator2.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileComparator2.java b/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileComparator2.java index c313813..5129d3c 100644 --- a/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileComparator2.java +++ b/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileComparator2.java @@ -35,7 +35,7 @@ import static org.junit.Assert.*; public class TestTFileComparator2 { private static final String ROOT = System.getProperty("test.build.data", - "/tmp/tfile-test"); + "target/tfile-test"); private static final String name = "test-tfile-comparator2"; private final static int BLOCK_SIZE = 512; private static final String VALUE = "value"; http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/5fba6294/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileComparators.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileComparators.java b/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileComparators.java index 0a10468..d588484 100644 --- a/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileComparators.java +++ b/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileComparators.java @@ -37,7 +37,7 @@ import org.junit.Assert; */ public class TestTFileComparators extends TestCase { private static String ROOT = - System.getProperty("test.build.data", "/tmp/tfile-test"); + System.getProperty("test.build.data", "target/tfile-test"); private final static int BLOCK_SIZE = 512; private FileSystem fs; http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/5fba6294/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileSeek.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileSeek.java b/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileSeek.java index 9f6b3ce..6a3e086 100644 --- a/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileSeek.java +++ b/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileSeek.java @@ -243,7 +243,7 @@ public class TestTFileSeek extends TestCase { int fsOutputBufferSizeGz = 1; String rootDir = - System.getProperty("test.build.data", "/tmp/tfile-test"); + System.getProperty("test.build.data", "target/tfile-test"); String file = "TestTFileSeek"; String compress = "gz"; int minKeyLen = 10; http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/5fba6294/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileSeqFileComparison.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileSeqFileComparison.java b/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileSeqFileComparison.java index e513ccd..a68ae45 100644 --- a/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileSeqFileComparison.java +++ b/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileSeqFileComparison.java @@ -517,7 +517,7 @@ public class TestTFileSeqFileComparison extends TestCase { private static class MyOptions { String rootDir = System - .getProperty("test.build.data", "/tmp/tfile-test"); + .getProperty("test.build.data", "target/tfile-test"); String compress = "gz"; String format = "tfile"; int dictSize = 1000; http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/5fba6294/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileSplit.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileSplit.java b/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileSplit.java index aad563d..2d28ae7 100644 --- a/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileSplit.java +++ b/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileSplit.java @@ -35,7 +35,7 @@ import org.junit.Assert; public class TestTFileSplit extends TestCase { private static String ROOT = - System.getProperty("test.build.data", "/tmp/tfile-test"); + System.getProperty("test.build.data", "target/tfile-test"); private final static int BLOCK_SIZE = 64 * 1024; http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/5fba6294/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileStreams.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileStreams.java b/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileStreams.java index 2e0506c..860a1de 100644 --- a/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileStreams.java +++ b/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileStreams.java @@ -44,7 +44,7 @@ import org.junit.Assert; public class TestTFileStreams extends TestCase { private static String ROOT = - System.getProperty("test.build.data", "/tmp/tfile-test"); + System.getProperty("test.build.data", "target/tfile-test"); private final static int BLOCK_SIZE = 512; private final static int K = 1024; http://git-wip-us.apache.org/repos/asf/incubator-apex-malhar/blob/5fba6294/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileUnsortedByteArrays.java ---------------------------------------------------------------------- diff --git a/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileUnsortedByteArrays.java b/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileUnsortedByteArrays.java index a58f649..8c59dbd 100644 --- a/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileUnsortedByteArrays.java +++ b/library/src/test/java/org/apache/hadoop/io/file/tfile/TestTFileUnsortedByteArrays.java @@ -33,7 +33,7 @@ import org.junit.Assert; public class TestTFileUnsortedByteArrays extends TestCase { private static String ROOT = - System.getProperty("test.build.data", "/tmp/tfile-test"); + System.getProperty("test.build.data", "target/tfile-test"); private final static int BLOCK_SIZE = 512;
