Author: stack Date: Mon Oct 8 20:25:00 2007 New Revision: 583037 URL: http://svn.apache.org/viewvc?rev=583037&view=rev Log: HADOOP-2011 Make hbase daemon scripts take args in same order as hadoop daemon scripts Modified: lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemon.sh lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemons.sh lucene/hadoop/trunk/src/contrib/hbase/bin/start-hbase.sh lucene/hadoop/trunk/src/contrib/hbase/bin/stop-hbase.sh lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/generated/master/hql_jsp.java lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/mapred/IndexOutputFormat.java lucene/hadoop/trunk/src/contrib/hbase/src/webapps/master/hql.jsp Modified: lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt?rev=583037&r1=583036&r2=583037&view=diff ============================================================================== --- lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt (original) +++ lucene/hadoop/trunk/src/contrib/hbase/CHANGES.txt Mon Oct 8 20:25:00 2007 @@ -70,6 +70,8 @@ HADOOP-1937 When the master times out a region server's lease, it is too aggressive in reclaiming the server's log. HADOOP-2004 webapp hql formatting bugs + HADOOP_2011 Make hbase daemon scripts take args in same order as hadoop + daemon scripts IMPROVEMENTS HADOOP-1737 Make HColumnDescriptor data publically members settable Modified: lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemon.sh URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemon.sh?rev=583037&r1=583036&r2=583037&view=diff ============================================================================== --- lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemon.sh (original) +++ lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemon.sh Mon Oct 8 20:25:00 2007 @@ -34,7 +34,7 @@ # Modelled after $HADOOP_HOME/bin/hadoop-daemon.sh usage="Usage: hbase-daemon.sh [--config ]\ - [--hbaseconfig ] (start|stop)\ + [--hbaseconfig ] (start|stop) \ " # if no args specified, show usage @@ -49,10 +49,10 @@ . "$bin"/hbase-config.sh # get arguments -command=$1 +startStop=$1 shift -startStop=$1 +command=$1 shift hbase_rotate_log () Modified: lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemons.sh URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemons.sh?rev=583037&r1=583036&r2=583037&view=diff ============================================================================== --- lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemons.sh (original) +++ lucene/hadoop/trunk/src/contrib/hbase/bin/hbase-daemons.sh Mon Oct 8 20:25:00 2007 @@ -26,7 +26,7 @@ usage="Usage: hbase-daemons.sh [--hadoop ] [--config ] [--hbase ]\ [--hbaseconfig ] [--hosts regionserversfile]\ - command [start|stop] args..." + [start|stop] command args..." # if no args specified, show usage if [ $# -le 1 ]; then Modified: lucene/hadoop/trunk/src/contrib/hbase/bin/start-hbase.sh URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/bin/start-hbase.sh?rev=583037&r1=583036&r2=583037&view=diff ============================================================================== --- lucene/hadoop/trunk/src/contrib/hbase/bin/start-hbase.sh (original) +++ lucene/hadoop/trunk/src/contrib/hbase/bin/start-hbase.sh Mon Oct 8 20:25:00 2007 @@ -39,7 +39,7 @@ exit $errCode fi "$bin"/hbase-daemon.sh --config "${HADOOP_CONF_DIR}" \ - --hbaseconfig "${HBASE_CONF_DIR}" master start + --hbaseconfig "${HBASE_CONF_DIR}" start master "$bin"/hbase-daemons.sh --config "${HADOOP_CONF_DIR}" \ --hbaseconfig "${HBASE_CONF_DIR}" --hadoop "${HADOOP_HOME}" \ - --hosts "${HBASE_REGIONSERVERS}" regionserver start + --hosts "${HBASE_REGIONSERVERS}" start regionserver Modified: lucene/hadoop/trunk/src/contrib/hbase/bin/stop-hbase.sh URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/bin/stop-hbase.sh?rev=583037&r1=583036&r2=583037&view=diff ============================================================================== --- lucene/hadoop/trunk/src/contrib/hbase/bin/stop-hbase.sh (original) +++ lucene/hadoop/trunk/src/contrib/hbase/bin/stop-hbase.sh Mon Oct 8 20:25:00 2007 @@ -30,4 +30,4 @@ . "$bin"/hbase-config.sh "$bin"/hbase-daemon.sh --config "${HADOOP_CONF_DIR}" \ - --hbaseconfig "${HBASE_CONF_DIR}" master stop + --hbaseconfig "${HBASE_CONF_DIR}" stop master Modified: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/generated/master/hql_jsp.java URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/generated/master/hql_jsp.java?rev=583037&r1=583036&r2=583037&view=diff ============================================================================== --- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/generated/master/hql_jsp.java (original) +++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/generated/master/hql_jsp.java Mon Oct 8 20:25:00 2007 @@ -47,12 +47,12 @@ _jspx_out = out; out.write("\n \n\n\nHQL\n\n\n\n\n

HQL

\n

Home

\n"); - String query = request.getParameter("query"); + String query = request.getParameter("q"); if (query == null) { query = ""; } - out.write("\n
\n

\n \n \n

\n \n \n \n

\n
\n

Enter 'help;' -- thats 'help' plus a semi-colon -- for a list of HQL commands.\n Data Definition, SHELL, INSERTS, DELETES, and UPDATE commands are disabled in this interface\n

\n \n "); @@ -78,7 +78,7 @@ } } - out.write("\n\n"); + out.write("\n\n\n"); } catch (Throwable t) { if (!(t instanceof SkipPageException)){ out = _jspx_out; Modified: lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/mapred/IndexOutputFormat.java URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/mapred/IndexOutputFormat.java?rev=583037&r1=583036&r2=583037&view=diff ============================================================================== --- lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/mapred/IndexOutputFormat.java (original) +++ lucene/hadoop/trunk/src/contrib/hbase/src/java/org/apache/hadoop/hbase/mapred/IndexOutputFormat.java Mon Oct 8 20:25:00 2007 @@ -106,10 +106,6 @@ throws IOException { // unwrap and index doc Document doc = value.get(); - if (LOG.isDebugEnabled()) { - LOG.debug(" Indexing [" + doc + "]"); - } - writer.addDocument(doc); docCount++; progress.progress(); @@ -160,4 +156,4 @@ } }; } -} \ No newline at end of file +} Modified: lucene/hadoop/trunk/src/contrib/hbase/src/webapps/master/hql.jsp URL: http://svn.apache.org/viewvc/lucene/hadoop/trunk/src/contrib/hbase/src/webapps/master/hql.jsp?rev=583037&r1=583036&r2=583037&view=diff ============================================================================== --- lucene/hadoop/trunk/src/contrib/hbase/src/webapps/master/hql.jsp (original) +++ lucene/hadoop/trunk/src/contrib/hbase/src/webapps/master/hql.jsp Mon Oct 8 20:25:00 2007 @@ -18,15 +18,15 @@

HQL

Home

-<% String query = request.getParameter("query"); +<% String query = request.getParameter("q"); if (query == null) { query = ""; } %> -
+

- +

@@ -54,4 +54,4 @@ } %> - \ No newline at end of file +