TAJO-425: RAWFILE_SYNC_INTERVAL has not default value. (jinho)
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/62003111 Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/62003111 Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/62003111 Branch: refs/heads/window_function Commit: 620031113edb3a9dab4132530f936f1244d134ae Parents: 2295cde Author: jinossy <[email protected]> Authored: Wed Apr 30 10:28:26 2014 +0900 Committer: jinossy <[email protected]> Committed: Wed Apr 30 10:28:26 2014 +0900 ---------------------------------------------------------------------- CHANGES | 2 ++ .../src/main/java/org/apache/tajo/conf/TajoConf.java | 2 +- .../src/test/java/org/apache/tajo/storage/TestRowFile.java | 3 +-- .../src/main/java/org/apache/tajo/storage/RowFile.java | 9 ++++----- 4 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/tajo/blob/62003111/CHANGES ---------------------------------------------------------------------- diff --git a/CHANGES b/CHANGES index 4e043c2..4d4e101 100644 --- a/CHANGES +++ b/CHANGES @@ -8,6 +8,8 @@ Release 0.9.0 - unreleased IMPROVEMENT + TAJO-425: RAWFILE_SYNC_INTERVAL has not default value. (jinho) + TAJO-617: Rename BIN/tajo_dump BIN/tajo-dump. (jinho) TAJO-789: Improve shuffle URI. (jinho) http://git-wip-us.apache.org/repos/asf/tajo/blob/62003111/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java ---------------------------------------------------------------------- diff --git a/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java b/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java index b7a799d..6580525 100644 --- a/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java +++ b/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java @@ -147,7 +147,7 @@ public class TajoConf extends Configuration { ////////////////////////////////// // Storage Configuration ////////////////////////////////// - RAWFILE_SYNC_INTERVAL("rawfile.sync.interval", null), + ROWFILE_SYNC_INTERVAL("rowfile.sync.interval", 100), MINIMUM_SPLIT_SIZE("tajo.min.split.size", (long) 1), // for RCFile HIVEUSEEXPLICITRCFILEHEADER("tajo.exec.rcfile.use.explicit.header", true), http://git-wip-us.apache.org/repos/asf/tajo/blob/62003111/tajo-core/src/test/java/org/apache/tajo/storage/TestRowFile.java ---------------------------------------------------------------------- diff --git a/tajo-core/src/test/java/org/apache/tajo/storage/TestRowFile.java b/tajo-core/src/test/java/org/apache/tajo/storage/TestRowFile.java index 99d89c0..f2784e5 100644 --- a/tajo-core/src/test/java/org/apache/tajo/storage/TestRowFile.java +++ b/tajo-core/src/test/java/org/apache/tajo/storage/TestRowFile.java @@ -54,7 +54,6 @@ public class TestRowFile { public void setup() throws Exception { cluster = TpchTestBase.getInstance().getTestingCluster(); conf = cluster.getConfiguration(); - conf.setInt(ConfVars.RAWFILE_SYNC_INTERVAL.varname, 100); } @After @@ -84,7 +83,7 @@ public class TestRowFile { appender.enableStats(); appender.init(); - int tupleNum = 100; + int tupleNum = 200; Tuple tuple; Datum stringDatum = DatumFactory.createText("abcdefghijklmnopqrstuvwxyz"); Set<Integer> idSet = Sets.newHashSet(); http://git-wip-us.apache.org/repos/asf/tajo/blob/62003111/tajo-storage/src/main/java/org/apache/tajo/storage/RowFile.java ---------------------------------------------------------------------- diff --git a/tajo-storage/src/main/java/org/apache/tajo/storage/RowFile.java b/tajo-storage/src/main/java/org/apache/tajo/storage/RowFile.java index 30c321c..2068260 100644 --- a/tajo-storage/src/main/java/org/apache/tajo/storage/RowFile.java +++ b/tajo-storage/src/main/java/org/apache/tajo/storage/RowFile.java @@ -71,9 +71,8 @@ public class RowFile { throws IOException { super(conf, schema, meta, fragment); - SYNC_INTERVAL = - conf.getInt(ConfVars.RAWFILE_SYNC_INTERVAL.varname, - SYNC_SIZE * 100); + SYNC_INTERVAL = conf.getInt(ConfVars.ROWFILE_SYNC_INTERVAL.varname, + ConfVars.ROWFILE_SYNC_INTERVAL.defaultIntVal) * SYNC_SIZE; nullFlags = new BitArray(schema.size()); tupleHeaderSize = nullFlags.bytesLength() + (2 * Short.SIZE / 8); @@ -321,8 +320,8 @@ public class RowFile { } public void init() throws IOException { - SYNC_INTERVAL = conf.getInt(ConfVars.RAWFILE_SYNC_INTERVAL.varname, 100); - + SYNC_INTERVAL = conf.getInt(ConfVars.ROWFILE_SYNC_INTERVAL.varname, + ConfVars.ROWFILE_SYNC_INTERVAL.defaultIntVal); fs = path.getFileSystem(conf); if (!fs.exists(path.getParent())) {
