You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hbase.apache.org by ji...@apache.org on 2008/03/06 06:09:34 UTC
svn commit: r634168 - in /hadoop/hbase/trunk: ./ lib/ src/test/
src/test/org/apache/hadoop/hbase/
Author: jimk
Date: Wed Mar 5 21:09:33 2008
New Revision: 634168
URL: http://svn.apache.org/viewvc?rev=634168&view=rev
Log:
HBASE-492 hbase TRUNK does not build against hadoop TRUNK
Added:
hadoop/hbase/trunk/lib/hadoop-0.17.0-dev.2008-03-04_15-19-00-core.jar (with props)
hadoop/hbase/trunk/lib/hadoop-0.17.0-dev.2008-03-04_15-19-00-test.jar (with props)
Removed:
hadoop/hbase/trunk/lib/hadoop-0.17.0-dev.2008-02-07_12-01-58-core.jar
hadoop/hbase/trunk/lib/hadoop-0.17.0-dev.2008-02-07_12-01-58-test.jar
Modified:
hadoop/hbase/trunk/CHANGES.txt
hadoop/hbase/trunk/src/test/hbase-site.xml
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/MultiRegionTable.java
hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/PerformanceEvaluation.java
Modified: hadoop/hbase/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/CHANGES.txt?rev=634168&r1=634167&r2=634168&view=diff
==============================================================================
--- hadoop/hbase/trunk/CHANGES.txt (original)
+++ hadoop/hbase/trunk/CHANGES.txt Wed Mar 5 21:09:33 2008
@@ -29,6 +29,7 @@
HBASE-473 When a table is deleted, master sends multiple close messages to
the region server
HBASE-490 Doubly-assigned .META.; master uses one and clients another
+ HBASE-492 hbase TRUNK does not build against hadoop TRUNK
IMPROVEMENTS
HBASE-415 Rewrite leases to use DelayedBlockingQueue instead of polling
Added: hadoop/hbase/trunk/lib/hadoop-0.17.0-dev.2008-03-04_15-19-00-core.jar
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/lib/hadoop-0.17.0-dev.2008-03-04_15-19-00-core.jar?rev=634168&view=auto
==============================================================================
Binary file - no diff available.
Propchange: hadoop/hbase/trunk/lib/hadoop-0.17.0-dev.2008-03-04_15-19-00-core.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: hadoop/hbase/trunk/lib/hadoop-0.17.0-dev.2008-03-04_15-19-00-test.jar
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/lib/hadoop-0.17.0-dev.2008-03-04_15-19-00-test.jar?rev=634168&view=auto
==============================================================================
Binary file - no diff available.
Propchange: hadoop/hbase/trunk/lib/hadoop-0.17.0-dev.2008-03-04_15-19-00-test.jar
------------------------------------------------------------------------------
svn:executable = *
Propchange: hadoop/hbase/trunk/lib/hadoop-0.17.0-dev.2008-03-04_15-19-00-test.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: hadoop/hbase/trunk/src/test/hbase-site.xml
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/hbase-site.xml?rev=634168&r1=634167&r2=634168&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/test/hbase-site.xml (original)
+++ hadoop/hbase/trunk/src/test/hbase-site.xml Wed Mar 5 21:09:33 2008
@@ -107,4 +107,8 @@
Keep the maximum filesize small so we split more often in tests.
</description>
</property>
+ <property>
+ <name>hadoop.log.dir</name>
+ <value>${user.dir}/logs</value>
+ </property>
</configuration>
Modified: hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/MultiRegionTable.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/MultiRegionTable.java?rev=634168&r1=634167&r2=634168&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/MultiRegionTable.java (original)
+++ hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/MultiRegionTable.java Wed Mar 5 21:09:33 2008
@@ -42,6 +42,15 @@
public class MultiRegionTable extends HBaseTestCase {
static final Log LOG = LogFactory.getLog(MultiRegionTable.class.getName());
+ /** {@inheritDoc} */
+ @Override
+ public void setUp() throws Exception {
+ // These are needed for the new and improved Map/Reduce framework
+ System.setProperty("hadoop.log.dir", conf.get("hadoop.log.dir"));
+ conf.set("mapred.output.dir", conf.get("hadoop.tmp.dir"));
+ super.setUp();
+ }
+
/**
* Make a multi-region table. Presumption is that table already exists and
* that there is only one regionserver. Makes it multi-region by filling with
@@ -187,7 +196,7 @@
if (splitB == null) {
LOG.info("splitB was already null. Assuming it was previously compacted.");
} else {
- LOG.info("Daughter splitB: " + splitA.getRegionName());
+ LOG.info("Daughter splitB: " + splitB.getRegionName());
// Call second split.
compact(cluster, splitB);
Modified: hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/PerformanceEvaluation.java
URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/PerformanceEvaluation.java?rev=634168&r1=634167&r2=634168&view=diff
==============================================================================
--- hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/PerformanceEvaluation.java (original)
+++ hadoop/hbase/trunk/src/test/org/apache/hadoop/hbase/PerformanceEvaluation.java Wed Mar 5 21:09:33 2008
@@ -161,8 +161,8 @@
}
/** {@inheritDoc} */
- public void map(@SuppressWarnings("unused") final WritableComparable key,
- final Writable value, final OutputCollector output,
+ public void map(@SuppressWarnings("unused") final Object key,
+ final Object value, final OutputCollector output,
final Reporter reporter)
throws IOException {
Matcher m = LINE_PATTERN.matcher(((Text)value).toString());
Re: svn commit: r634168 - in /hadoop/hbase/trunk: ./ lib/ src/test/
src/test/org/apache/hadoop/hbase/
Posted by stack <st...@duboce.net>.
OK. I see this in the build.xml:
<sysproperty key="user.dir" value="${build.test}/data"/>
St.Ack
Jim Kellerman wrote:
> In the test suite user.dir resolves to the root of your workspace +
> "/build/test/data". On Windows for example, my workspace is:
> C:\workspace\HBase-test so user.dir resolves to:
> [junit] user.dir=C:\workspace\HBase-test\build\test/data
>
>
> ---
> Jim Kellerman, Senior Engineer; Powerset
>
>
>
>> -----Original Message-----
>> From: stack [mailto:stack@duboce.net]
>> Sent: Wednesday, March 05, 2008 9:24 PM
>> To: hbase-dev@hadoop.apache.org
>> Subject: Re: svn commit: r634168 - in /hadoop/hbase/trunk: ./
>> lib/ src/test/ src/test/org/apache/hadoop/hbase/
>>
>> jimk@apache.org wrote:
>>
>>> ...
>>> URL:
>>>
>>>
>> http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/hbase-site.xm
>>
>>> l?rev=634168&r1=634167&r2=634168&view=diff
>>>
>>>
>> ======================================================================
>>
>>> ========
>>> --- hadoop/hbase/trunk/src/test/hbase-site.xml (original)
>>> +++ hadoop/hbase/trunk/src/test/hbase-site.xml Wed Mar 5 21:09:33
>>> +++ 2008
>>> @@ -107,4 +107,8 @@
>>> Keep the maximum filesize small so we split more often
>>>
>> in tests.
>>
>>> </description>
>>> </property>
>>> + <property>
>>> + <name>hadoop.log.dir</name>
>>> + <value>${user.dir}/logs</value>
>>> + </property>
>>> </configuration>
>>>
>>>
>>>
>> Does the above user.dir have a value and get interpolated?
>> Is this the java system property user.dir? Isn't the default
>> your homedir -- e.g.
>> ~/jimk -- and logs are put into your home dir? Or does test
>> suite set this to a different value?
>>
>> St.Ack
>>
>>
>> No virus found in this incoming message.
>> Checked by AVG Free Edition.
>> Version: 7.5.516 / Virus Database: 269.21.4/1313 - Release
>> Date: 3/5/2008 9:50 AM
>>
>>
>>
>
> No virus found in this outgoing message.
> Checked by AVG Free Edition.
> Version: 7.5.516 / Virus Database: 269.21.4/1313 - Release Date: 3/5/2008 9:50 AM
>
>
RE: svn commit: r634168 - in /hadoop/hbase/trunk: ./ lib/ src/test/
src/test/org/apache/hadoop/hbase/
Posted by Jim Kellerman <ji...@powerset.com>.
In the test suite user.dir resolves to the root of your workspace +
"/build/test/data". On Windows for example, my workspace is:
C:\workspace\HBase-test so user.dir resolves to:
[junit] user.dir=C:\workspace\HBase-test\build\test/data
---
Jim Kellerman, Senior Engineer; Powerset
> -----Original Message-----
> From: stack [mailto:stack@duboce.net]
> Sent: Wednesday, March 05, 2008 9:24 PM
> To: hbase-dev@hadoop.apache.org
> Subject: Re: svn commit: r634168 - in /hadoop/hbase/trunk: ./
> lib/ src/test/ src/test/org/apache/hadoop/hbase/
>
> jimk@apache.org wrote:
> > ...
> > URL:
> >
> http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/hbase-site.xm
> > l?rev=634168&r1=634167&r2=634168&view=diff
> >
> ======================================================================
> > ========
> > --- hadoop/hbase/trunk/src/test/hbase-site.xml (original)
> > +++ hadoop/hbase/trunk/src/test/hbase-site.xml Wed Mar 5 21:09:33
> > +++ 2008
> > @@ -107,4 +107,8 @@
> > Keep the maximum filesize small so we split more often
> in tests.
> > </description>
> > </property>
> > + <property>
> > + <name>hadoop.log.dir</name>
> > + <value>${user.dir}/logs</value>
> > + </property>
> > </configuration>
> >
> >
>
> Does the above user.dir have a value and get interpolated?
> Is this the java system property user.dir? Isn't the default
> your homedir -- e.g.
> ~/jimk -- and logs are put into your home dir? Or does test
> suite set this to a different value?
>
> St.Ack
>
>
> No virus found in this incoming message.
> Checked by AVG Free Edition.
> Version: 7.5.516 / Virus Database: 269.21.4/1313 - Release
> Date: 3/5/2008 9:50 AM
>
>
No virus found in this outgoing message.
Checked by AVG Free Edition.
Version: 7.5.516 / Virus Database: 269.21.4/1313 - Release Date: 3/5/2008 9:50 AM
Re: svn commit: r634168 - in /hadoop/hbase/trunk: ./ lib/ src/test/
src/test/org/apache/hadoop/hbase/
Posted by stack <st...@duboce.net>.
jimk@apache.org wrote:
> ...
> URL: http://svn.apache.org/viewvc/hadoop/hbase/trunk/src/test/hbase-site.xml?rev=634168&r1=634167&r2=634168&view=diff
> ==============================================================================
> --- hadoop/hbase/trunk/src/test/hbase-site.xml (original)
> +++ hadoop/hbase/trunk/src/test/hbase-site.xml Wed Mar 5 21:09:33 2008
> @@ -107,4 +107,8 @@
> Keep the maximum filesize small so we split more often in tests.
> </description>
> </property>
> + <property>
> + <name>hadoop.log.dir</name>
> + <value>${user.dir}/logs</value>
> + </property>
> </configuration>
>
>
Does the above user.dir have a value and get interpolated? Is this the
java system property user.dir? Isn't the default your homedir -- e.g.
~/jimk -- and logs are put into your home dir? Or does test suite set
this to a different value?
St.Ack