Repository: hbase Updated Branches: refs/heads/master 27ba04865 -> beeb540f6
HBASE-11859: 'hadoop jar' references in documentation should mention hbase-server.jar, not hbase.jar Signed-off-by: Jonathan M Hsieh <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/hbase/repo Commit: http://git-wip-us.apache.org/repos/asf/hbase/commit/beeb540f Tree: http://git-wip-us.apache.org/repos/asf/hbase/tree/beeb540f Diff: http://git-wip-us.apache.org/repos/asf/hbase/diff/beeb540f Branch: refs/heads/master Commit: beeb540f69692ae683a40f73d0b63d644e6f09e2 Parents: 27ba048 Author: Stephen Veiss <[email protected]> Authored: Thu Aug 28 16:06:34 2014 -0700 Committer: Jonathan M Hsieh <[email protected]> Committed: Thu Aug 28 19:47:43 2014 -0700 ---------------------------------------------------------------------- src/main/docbkx/book.xml | 10 +++++----- src/main/docbkx/ops_mgt.xml | 4 ++-- src/main/docbkx/troubleshooting.xml | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/hbase/blob/beeb540f/src/main/docbkx/book.xml ---------------------------------------------------------------------- diff --git a/src/main/docbkx/book.xml b/src/main/docbkx/book.xml index 16c8445..3d8216b 100644 --- a/src/main/docbkx/book.xml +++ b/src/main/docbkx/book.xml @@ -971,7 +971,7 @@ htable.put(put); Be sure to use the correct version of the HBase JAR for your system. The backticks (<literal>`</literal> symbols) cause ths shell to execute the sub-commands, setting the CLASSPATH as part of the command. This example assumes you use a BASH-compatible shell. </para> - <screen language="bourne">$ <userinput>HADOOP_CLASSPATH=`${HBASE_HOME}/bin/hbase classpath` ${HADOOP_HOME}/bin/hadoop jar ${HBASE_HOME}/hbase-0.90.0.jar rowcounter usertable</userinput></screen> + <screen language="bourne">$ <userinput>HADOOP_CLASSPATH=`${HBASE_HOME}/bin/hbase classpath` ${HADOOP_HOME}/bin/hadoop jar ${HBASE_HOME}/hbase-server-VERSION.jar rowcounter usertable</userinput></screen> <para>When the command runs, internally, the HBase JAR finds the dependencies it needs for zookeeper, guava, and its other dependencies on the passed <envar>HADOOP_CLASSPATH</envar> and adds the JARs to the MapReduce job configuration. See the source at @@ -982,7 +982,7 @@ htable.put(put); <screen>java.lang.RuntimeException: java.lang.ClassNotFoundException: org.apache.hadoop.hbase.mapreduce.RowCounter$RowCounterMapper</screen> <para>If this occurs, try modifying the command as follows, so that it uses the HBase JARs from the <filename>target/</filename> directory within the build environment.</para> - <screen language="bourne">$ <userinput>HADOOP_CLASSPATH=${HBASE_HOME}/target/hbase-0.90.0-SNAPSHOT.jar:`${HBASE_HOME}/bin/hbase classpath` ${HADOOP_HOME}/bin/hadoop jar ${HBASE_HOME}/target/hbase-0.90.0-SNAPSHOT.jar rowcounter usertable</userinput></screen> + <screen language="bourne">$ <userinput>HADOOP_CLASSPATH=${HBASE_HOME}/hbase-server/target/hbase-server-VERSION-SNAPSHOT.jar:`${HBASE_HOME}/bin/hbase classpath` ${HADOOP_HOME}/bin/hadoop jar ${HBASE_HOME}/hbase-server/target/hbase-server-VERSION-SNAPSHOT.jar rowcounter usertable</userinput></screen> </note> <caution> <title>Notice to Mapreduce users of HBase 0.96.1 and above</title> @@ -1054,7 +1054,7 @@ $ <userinput>HADOOP_CLASSPATH=$(hbase mapredcp):/etc/hbase/conf hadoop jar MyApp <para>The HBase JAR also serves as a Driver for some bundled mapreduce jobs. To learn about the bundled MapReduce jobs, run the following command.</para> - <screen language="bourne">$ <userinput>${HADOOP_HOME}/bin/hadoop jar ${HBASE_HOME}/hbase-0.90.0-SNAPSHOT.jar</userinput> + <screen language="bourne">$ <userinput>${HADOOP_HOME}/bin/hadoop jar ${HBASE_HOME}/hbase-server-VERSION.jar</userinput> <computeroutput>An example program must be given as the first argument. Valid program names are: copytable: Export a table from local cluster to peer cluster @@ -1066,7 +1066,7 @@ Valid program names are: </screen> <para>Each of the valid program names are bundled MapReduce jobs. To run one of the jobs, model your command after the following example.</para> - <screen language="bourne">$ <userinput>${HADOOP_HOME}/bin/hadoop jar ${HBASE_HOME}/hbase-0.90.0-SNAPSHOT.jar rowcounter myTable</userinput></screen> + <screen language="bourne">$ <userinput>${HADOOP_HOME}/bin/hadoop jar ${HBASE_HOME}/hbase-server-VERSION.jar rowcounter myTable</userinput></screen> </section> <section> @@ -4252,7 +4252,7 @@ alter 'orders_table', CONFIGURATION => {'key' => 'value', ..., 'key' => 'value'} where <code>importtsv</code> or your MapReduce job put its results, and the table name to import into. For example: </para> - <screen language="bourne">$ hadoop jar hbase-VERSION.jar completebulkload [-c /path/to/hbase/config/hbase-site.xml] /user/todd/myoutput mytable</screen> + <screen language="bourne">$ hadoop jar hbase-server-VERSION.jar completebulkload [-c /path/to/hbase/config/hbase-site.xml] /user/todd/myoutput mytable</screen> <para> The <code>-c config-file</code> option can be used to specify a file containing the appropriate hbase parameters (e.g., hbase-site.xml) if http://git-wip-us.apache.org/repos/asf/hbase/blob/beeb540f/src/main/docbkx/ops_mgt.xml ---------------------------------------------------------------------- diff --git a/src/main/docbkx/ops_mgt.xml b/src/main/docbkx/ops_mgt.xml index 923872c..ffcf1ce 100644 --- a/src/main/docbkx/ops_mgt.xml +++ b/src/main/docbkx/ops_mgt.xml @@ -480,7 +480,7 @@ row10 c1 c2 </para> <para>For ImportTsv to use this imput file, the command line needs to look like this:</para> <screen language="bourne"> - HADOOP_CLASSPATH=`${HBASE_HOME}/bin/hbase classpath` ${HADOOP_HOME}/bin/hadoop jar ${HBASE_HOME}/hbase-VERSION.jar importtsv -Dimporttsv.columns=HBASE_ROW_KEY,d:c1,d:c2 -Dimporttsv.bulk.output=hdfs://storefileoutput datatsv hdfs://inputfile + HADOOP_CLASSPATH=`${HBASE_HOME}/bin/hbase classpath` ${HADOOP_HOME}/bin/hadoop jar ${HBASE_HOME}/hbase-server-VERSION.jar importtsv -Dimporttsv.columns=HBASE_ROW_KEY,d:c1,d:c2 -Dimporttsv.bulk.output=hdfs://storefileoutput datatsv hdfs://inputfile </screen> <para> ... and in this example the first column is the rowkey, which is why the HBASE_ROW_KEY is used. The second and third columns in the file will be imported as "d:c1" @@ -511,7 +511,7 @@ row10 c1 c2 <screen language="bourne">$ bin/hbase org.apache.hadoop.hbase.mapreduce.LoadIncrementalHFiles <hdfs://storefileoutput> <tablename> </screen> <para> .. and via the Driver..</para> - <screen language="bourne">HADOOP_CLASSPATH=`${HBASE_HOME}/bin/hbase classpath` ${HADOOP_HOME}/bin/hadoop jar ${HBASE_HOME}/hbase-VERSION.jar completebulkload <hdfs://storefileoutput> <tablename> + <screen language="bourne">HADOOP_CLASSPATH=`${HBASE_HOME}/bin/hbase classpath` ${HADOOP_HOME}/bin/hadoop jar ${HBASE_HOME}/hbase-server-VERSION.jar completebulkload <hdfs://storefileoutput> <tablename> </screen> <section xml:id="completebulkload.warning"> http://git-wip-us.apache.org/repos/asf/hbase/blob/beeb540f/src/main/docbkx/troubleshooting.xml ---------------------------------------------------------------------- diff --git a/src/main/docbkx/troubleshooting.xml b/src/main/docbkx/troubleshooting.xml index bdbe8d9..ec6c1cf 100644 --- a/src/main/docbkx/troubleshooting.xml +++ b/src/main/docbkx/troubleshooting.xml @@ -792,7 +792,7 @@ at org.apache.hadoop.mapred.LocalJobRunner$Job.run(LocalJobRunner.java:210) utility can be used to do this easily. For example (substitute VERSION with your HBase version):</para> <programlisting language="bourne"> - HADOOP_CLASSPATH=`hbase classpath` hadoop jar $HBASE_HOME/hbase-VERSION.jar rowcounter usertable + HADOOP_CLASSPATH=`hbase classpath` hadoop jar $HBASE_HOME/hbase-server-VERSION.jar rowcounter usertable </programlisting> <para>See <link xlink:href="http://hbase.apache.org/apidocs/org/apache/hadoop/hbase/mapreduce/package-summary.html#classpath";>
