Updated Branches: refs/heads/trunk af1c05d8c -> 8046f5f57
GIRAPH-836: Delay hive preparation until after the arguments are parsed (this allows functionality such as creating a table) (aching) Project: http://git-wip-us.apache.org/repos/asf/giraph/repo Commit: http://git-wip-us.apache.org/repos/asf/giraph/commit/8046f5f5 Tree: http://git-wip-us.apache.org/repos/asf/giraph/tree/8046f5f5 Diff: http://git-wip-us.apache.org/repos/asf/giraph/diff/8046f5f5 Branch: refs/heads/trunk Commit: 8046f5f5787ce41ca4ade0d297b47afeb6a7e51d Parents: af1c05d Author: Avery Ching <[email protected]> Authored: Sat Feb 1 06:59:00 2014 -0800 Committer: Avery Ching <[email protected]> Committed: Fri Feb 7 17:19:20 2014 -0800 ---------------------------------------------------------------------- CHANGELOG | 3 +++ .../java/org/apache/giraph/hive/HiveGiraphRunner.java | 14 ++++++++------ 2 files changed, 11 insertions(+), 6 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/giraph/blob/8046f5f5/CHANGELOG ---------------------------------------------------------------------- diff --git a/CHANGELOG b/CHANGELOG index fdc6384..3f2c047 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,6 +1,9 @@ Giraph Change Log Release 1.1.0 - unreleased + GIRAPH-836: Delay hive preparation until after the arguments are parsed (this allows + functionality such as creating a table) (aching) + GIRAPH-843: remove rexter from hadoop_facebook profile (pavanka via aching) GIRAPH-838: setup time & total time counter also include time spent waiting for machines http://git-wip-us.apache.org/repos/asf/giraph/blob/8046f5f5/giraph-hive/src/main/java/org/apache/giraph/hive/HiveGiraphRunner.java ---------------------------------------------------------------------- diff --git a/giraph-hive/src/main/java/org/apache/giraph/hive/HiveGiraphRunner.java b/giraph-hive/src/main/java/org/apache/giraph/hive/HiveGiraphRunner.java index 723a48b..603910b 100644 --- a/giraph-hive/src/main/java/org/apache/giraph/hive/HiveGiraphRunner.java +++ b/giraph-hive/src/main/java/org/apache/giraph/hive/HiveGiraphRunner.java @@ -526,6 +526,14 @@ public class HiveGiraphRunner implements Tool { String dbName = cmdln.getOptionValue("dbName", "default"); + workers = Integer.parseInt(workersStr); + + isVerbose = cmdln.hasOption("verbose"); + + // Processing more arguments should precede Hive preparation to + // allow metastore changes (i.e. creating tables that don't exist) + processMoreArguments(cmdln); + if (hasVertexInput()) { HIVE_VERTEX_INPUT.getDatabaseOpt().set(conf, dbName); prepareHiveVertexInputs(); @@ -543,12 +551,6 @@ public class HiveGiraphRunner implements Tool { LOG.warn("run: Warning - Output will be skipped!"); } - workers = Integer.parseInt(workersStr); - - isVerbose = cmdln.hasOption("verbose"); - - processMoreArguments(cmdln); - return cmdln; }
