You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ap...@apache.org on 2015/02/14 04:19:40 UTC
[1/4] hbase git commit: HBASE-13010 HFileOutputFormat2 partitioner's
path is hard-coded as '/tmp'
Repository: hbase
Updated Branches:
refs/heads/0.98 78380e166 -> 24168266c
refs/heads/branch-1 9114edece -> 432b2197f
refs/heads/branch-1.0 0280d7193 -> bd6fbea2c
refs/heads/master c96df5e24 -> f286797fb
HBASE-13010 HFileOutputFormat2 partitioner's path is hard-coded as '/tmp'
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/f286797f
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/f286797f
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/f286797f
Branch: refs/heads/master
Commit: f286797fbf063a929b0dc841c6071edb8eae2dd6
Parents: c96df5e
Author: Aditya Kishore <ad...@mapr.com>
Authored: Fri Feb 13 18:35:33 2015 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Feb 13 18:35:33 2015 -0800
----------------------------------------------------------------------
.../apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/f286797f/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
index f69f21f..f2d5c6f 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
@@ -584,17 +584,17 @@ public class HFileOutputFormat2
*/
static void configurePartitioner(Job job, List<ImmutableBytesWritable> splitPoints)
throws IOException {
-
+ Configuration conf = job.getConfiguration();
// create the partitions file
- FileSystem fs = FileSystem.get(job.getConfiguration());
- Path partitionsPath = new Path("/tmp", "partitions_" + UUID.randomUUID());
+ FileSystem fs = FileSystem.get(conf);
+ Path partitionsPath = new Path(conf.get("hadoop.tmp.dir"), "partitions_" + UUID.randomUUID());
fs.makeQualified(partitionsPath);
- writePartitions(job.getConfiguration(), partitionsPath, splitPoints);
+ writePartitions(conf, partitionsPath, splitPoints);
fs.deleteOnExit(partitionsPath);
// configure job to use it
job.setPartitionerClass(TotalOrderPartitioner.class);
- TotalOrderPartitioner.setPartitionFile(job.getConfiguration(), partitionsPath);
+ TotalOrderPartitioner.setPartitionFile(conf, partitionsPath);
}
/**
[3/4] hbase git commit: HBASE-13010 HFileOutputFormat2 partitioner's
path is hard-coded as '/tmp'
Posted by ap...@apache.org.
HBASE-13010 HFileOutputFormat2 partitioner's path is hard-coded as '/tmp'
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/bd6fbea2
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/bd6fbea2
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/bd6fbea2
Branch: refs/heads/branch-1.0
Commit: bd6fbea2cec0ab6e052e2d1b64ea47f7716c5a77
Parents: 0280d71
Author: Aditya Kishore <ad...@mapr.com>
Authored: Fri Feb 13 18:35:33 2015 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Feb 13 18:53:33 2015 -0800
----------------------------------------------------------------------
.../apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/bd6fbea2/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
index 2b4e82d..fd160e4 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
@@ -565,17 +565,17 @@ public class HFileOutputFormat2
*/
static void configurePartitioner(Job job, List<ImmutableBytesWritable> splitPoints)
throws IOException {
-
+ Configuration conf = job.getConfiguration();
// create the partitions file
- FileSystem fs = FileSystem.get(job.getConfiguration());
- Path partitionsPath = new Path("/tmp", "partitions_" + UUID.randomUUID());
+ FileSystem fs = FileSystem.get(conf);
+ Path partitionsPath = new Path(conf.get("hadoop.tmp.dir"), "partitions_" + UUID.randomUUID());
fs.makeQualified(partitionsPath);
- writePartitions(job.getConfiguration(), partitionsPath, splitPoints);
+ writePartitions(conf, partitionsPath, splitPoints);
fs.deleteOnExit(partitionsPath);
// configure job to use it
job.setPartitionerClass(TotalOrderPartitioner.class);
- TotalOrderPartitioner.setPartitionFile(job.getConfiguration(), partitionsPath);
+ TotalOrderPartitioner.setPartitionFile(conf, partitionsPath);
}
/**
[2/4] hbase git commit: HBASE-13010 HFileOutputFormat2 partitioner's
path is hard-coded as '/tmp'
Posted by ap...@apache.org.
HBASE-13010 HFileOutputFormat2 partitioner's path is hard-coded as '/tmp'
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/432b2197
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/432b2197
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/432b2197
Branch: refs/heads/branch-1
Commit: 432b2197fdee4f1615d6ef651b1102faf16a48a5
Parents: 9114ede
Author: Aditya Kishore <ad...@mapr.com>
Authored: Fri Feb 13 18:35:33 2015 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Feb 13 18:53:26 2015 -0800
----------------------------------------------------------------------
.../apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/432b2197/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
index 6572684..465be56 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
@@ -585,17 +585,17 @@ public class HFileOutputFormat2
*/
static void configurePartitioner(Job job, List<ImmutableBytesWritable> splitPoints)
throws IOException {
-
+ Configuration conf = job.getConfiguration();
// create the partitions file
- FileSystem fs = FileSystem.get(job.getConfiguration());
- Path partitionsPath = new Path("/tmp", "partitions_" + UUID.randomUUID());
+ FileSystem fs = FileSystem.get(conf);
+ Path partitionsPath = new Path(conf.get("hadoop.tmp.dir"), "partitions_" + UUID.randomUUID());
fs.makeQualified(partitionsPath);
- writePartitions(job.getConfiguration(), partitionsPath, splitPoints);
+ writePartitions(conf, partitionsPath, splitPoints);
fs.deleteOnExit(partitionsPath);
// configure job to use it
job.setPartitionerClass(TotalOrderPartitioner.class);
- TotalOrderPartitioner.setPartitionFile(job.getConfiguration(), partitionsPath);
+ TotalOrderPartitioner.setPartitionFile(conf, partitionsPath);
}
/**
[4/4] hbase git commit: HBASE-13010 HFileOutputFormat2 partitioner's
path is hard-coded as '/tmp'
Posted by ap...@apache.org.
HBASE-13010 HFileOutputFormat2 partitioner's path is hard-coded as '/tmp'
Signed-off-by: Andrew Purtell <ap...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/24168266
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/24168266
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/24168266
Branch: refs/heads/0.98
Commit: 24168266c82c681aaff6c25d32ab4be8f9c70458
Parents: 78380e1
Author: Aditya Kishore <ad...@mapr.com>
Authored: Fri Feb 13 18:35:33 2015 -0800
Committer: Andrew Purtell <ap...@apache.org>
Committed: Fri Feb 13 18:53:37 2015 -0800
----------------------------------------------------------------------
.../apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/24168266/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
index b930f12..d1fe5e0 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/HFileOutputFormat2.java
@@ -539,17 +539,17 @@ public class HFileOutputFormat2
*/
static void configurePartitioner(Job job, List<ImmutableBytesWritable> splitPoints)
throws IOException {
-
+ Configuration conf = job.getConfiguration();
// create the partitions file
- FileSystem fs = FileSystem.get(job.getConfiguration());
- Path partitionsPath = new Path("/tmp", "partitions_" + UUID.randomUUID());
+ FileSystem fs = FileSystem.get(conf);
+ Path partitionsPath = new Path(conf.get("hadoop.tmp.dir"), "partitions_" + UUID.randomUUID());
fs.makeQualified(partitionsPath);
- writePartitions(job.getConfiguration(), partitionsPath, splitPoints);
+ writePartitions(conf, partitionsPath, splitPoints);
fs.deleteOnExit(partitionsPath);
// configure job to use it
job.setPartitionerClass(TotalOrderPartitioner.class);
- TotalOrderPartitioner.setPartitionFile(job.getConfiguration(), partitionsPath);
+ TotalOrderPartitioner.setPartitionFile(conf, partitionsPath);
}
/**