You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by st...@apache.org on 2015/10/08 22:04:35 UTC
[1/2] hbase git commit: HBASE-14574 TableOutputFormat#getRecordWriter
javadoc misleads
Repository: hbase
Updated Branches:
refs/heads/master 7e30436e3 -> 4beefd8ce
HBASE-14574 TableOutputFormat#getRecordWriter javadoc misleads
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/12cc2005
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/12cc2005
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/12cc2005
Branch: refs/heads/master
Commit: 12cc2005c163216c508074dccb239b3fb8bcdc58
Parents: 7e30436
Author: stack <st...@apache.org>
Authored: Wed Oct 7 15:00:43 2015 -0700
Committer: stack <st...@apache.org>
Committed: Thu Oct 8 13:02:59 2015 -0700
----------------------------------------------------------------------
.../hadoop/hbase/mapred/TableOutputFormat.java | 15 +++++++++++++++
.../hadoop/hbase/mapreduce/TableOutputFormat.java | 5 +++++
2 files changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/12cc2005/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableOutputFormat.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableOutputFormat.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableOutputFormat.java
index 6e0d9e7..dd72939 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableOutputFormat.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapred/TableOutputFormat.java
@@ -71,6 +71,21 @@ public class TableOutputFormat extends FileOutputFormat<ImmutableBytesWritable,
}
}
+ /**
+ * Creates a new record writer.
+ *
+ * Be aware that the baseline javadoc gives the impression that there is a single
+ * {@link RecordWriter} per job but in HBase, it is more natural if we give you a new
+ * RecordWriter per call of this method. You must close the returned RecordWriter when done.
+ * Failure to do so will drop writes.
+ *
+ * @param ignored Ignored filesystem
+ * @param job Current JobConf
+ * @param name Name of the job
+ * @param progress
+ * @return The newly created writer instance.
+ * @throws IOException When creating the writer fails.
+ */
@Override
public RecordWriter getRecordWriter(FileSystem ignored, JobConf job, String name,
Progressable progress)
http://git-wip-us.apache.org/repos/asf/hbase/blob/12cc2005/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java
----------------------------------------------------------------------
diff --git a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java
index 6e4b470..7a13750 100644
--- a/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java
+++ b/hbase-server/src/main/java/org/apache/hadoop/hbase/mapreduce/TableOutputFormat.java
@@ -131,6 +131,11 @@ implements Configurable {
/**
* Creates a new record writer.
+ *
+ * Be aware that the baseline javadoc gives the impression that there is a single
+ * {@link RecordWriter} per job but in HBase, it is more natural if we give you a new
+ * RecordWriter per call of this method. You must close the returned RecordWriter when done.
+ * Failure to do so will drop writes.
*
* @param context The current task context.
* @return The newly created writer instance.
[2/2] hbase git commit: HBASE-14349 pre-commit zombie finder is
overly broad; ADDENDUM
Posted by st...@apache.org.
HBASE-14349 pre-commit zombie finder is overly broad; ADDENDUM
Project: http://git-wip-us.apache.org/repos/asf/hbase/repo
Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/4beefd8c
Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/4beefd8c
Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/4beefd8c
Branch: refs/heads/master
Commit: 4beefd8ce4eb9d0bd1b57ac48a9d9dc011690155
Parents: 12cc200
Author: stack <st...@apache.org>
Authored: Thu Oct 8 13:04:25 2015 -0700
Committer: stack <st...@apache.org>
Committed: Thu Oct 8 13:04:25 2015 -0700
----------------------------------------------------------------------
dev-support/test-patch.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/hbase/blob/4beefd8c/dev-support/test-patch.sh
----------------------------------------------------------------------
diff --git a/dev-support/test-patch.sh b/dev-support/test-patch.sh
index a781b80..69ebdb6 100755
--- a/dev-support/test-patch.sh
+++ b/dev-support/test-patch.sh
@@ -836,7 +836,7 @@ checkLineLengths () {
zombieCount() {
# HBase tests have been flagged with an innocuous '-Dhbase.test' just so they can
# be identified as hbase in a process listing.
- echo `jps -v | grep -e surefirebooter -e '-Dhbase.test' | wc -l`
+ echo `jps -v | grep surefirebooter | grep '-Dhbase.test' | wc -l`
}
###############################################################################
@@ -887,14 +887,14 @@ runTests () {
echo "************ BEGIN zombies jstack extract"
# HBase tests have been flagged with an innocuous '-Dhbase.test' just so they can
# be identified as hbase in a process listing.
- ZB_STACK=`jps -v | grep -e surefirebooter -e '-Dhbase.test' | cut -d ' ' -f 1 | xargs -n 1 jstack | grep ".test" | grep "\.java"`
- jps -v | grep -e surefirebooter -e '-Dhbase.test' | cut -d ' ' -f 1 | xargs -n 1 jstack
+ ZB_STACK=`jps -v | grep surefirebooter | grep '-Dhbase.test' | cut -d ' ' -f 1 | xargs -n 1 jstack | grep ".test" | grep "\.java"`
+ jps -v | grep surefirebooter | grep '-Dhbase.test' | cut -d ' ' -f 1 | xargs -n 1 jstack
echo "************ END zombies jstack extract"
JIRA_COMMENT="$JIRA_COMMENT
{color:red}-1 core zombie tests{color}. There are ${ZOMBIE_TESTS_COUNT} zombie test(s): ${ZB_STACK}"
BAD=1
- jps -v | grep -e surefirebooter -e '-Dhbase.test' | cut -d ' ' -f 1 | xargs kill -9
+ jps -v | grep surefirebooter | grep '-Dhbase.test' | cut -d ' ' -f 1 | xargs kill -9
else
echo "We're ok: there is no zombie test, but some tests took some time to stop"
fi