Author: stack
Date: Fri Sep 24 20:40:41 2010
New Revision: 1001062
URL: http://svn.apache.org/viewvc?rev=1001062&view=rev
Log:
HBASE-3036 avro tests failing up on hudson (pass locally) -- trying something,
passing Configuration to HBaseImpl
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/avro/AvroServer.java
hbase/trunk/src/main/java/org/apache/hadoop/hbase/avro/generated/AIOError.java
hbase/trunk/src/test/java/org/apache/hadoop/hbase/avro/TestAvroServer.java
Modified: hbase/trunk/src/main/java/org/apache/hadoop/hbase/avro/AvroServer.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/avro/AvroServer.java?rev=1001062&r1=1001061&r2=1001062&view=diff
==============================================================================
--- hbase/trunk/src/main/java/org/apache/hadoop/hbase/avro/AvroServer.java
(original)
+++ hbase/trunk/src/main/java/org/apache/hadoop/hbase/avro/AvroServer.java Fri
Sep 24 20:40:41 2010
@@ -125,7 +125,11 @@ public class AvroServer {
* @throws IOException
*/
HBaseImpl() throws IOException {
- conf = HBaseConfiguration.create();
+ this(HBaseConfiguration.create());
+ }
+
+ HBaseImpl(final Configuration c) throws IOException {
+ conf = c;
admin = new HBaseAdmin(conf);
htablePool = new HTablePool(conf, 10);
scannerMap = new HashMap<Integer, ResultScanner>();
Modified:
hbase/trunk/src/main/java/org/apache/hadoop/hbase/avro/generated/AIOError.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/main/java/org/apache/hadoop/hbase/avro/generated/AIOError.java?rev=1001062&r1=1001061&r2=1001062&view=diff
==============================================================================
---
hbase/trunk/src/main/java/org/apache/hadoop/hbase/avro/generated/AIOError.java
(original)
+++
hbase/trunk/src/main/java/org/apache/hadoop/hbase/avro/generated/AIOError.java
Fri Sep 24 20:40:41 2010
@@ -2,7 +2,8 @@ package org.apache.hadoop.hbase.avro.gen
@SuppressWarnings("all")
public class AIOError extends org.apache.avro.specific.SpecificExceptionBase
implements org.apache.avro.specific.SpecificRecord {
- public static final org.apache.avro.Schema SCHEMA$ =
org.apache.avro.Schema.parse("{\"type\":\"error\",\"name\":\"AIOError\",\"namespace\":\"org.apache.hadoop.hbase.avro.generated\",\"fields\":[{\"name\":\"message\",\"type\":\"string\"}]}");
+ public static final org.apache.avro.Schema SCHEMA$ =
+
org.apache.avro.Schema.parse("{\"type\":\"error\",\"name\":\"AIOError\",\"namespace\":\"org.apache.hadoop.hbase.avro.generated\",\"fields\":[{\"name\":\"message\",\"type\":\"string\"}]}");
public org.apache.avro.util.Utf8 message;
public org.apache.avro.Schema getSchema() { return SCHEMA$; }
public java.lang.Object get(int field$) {
Modified:
hbase/trunk/src/test/java/org/apache/hadoop/hbase/avro/TestAvroServer.java
URL:
http://svn.apache.org/viewvc/hbase/trunk/src/test/java/org/apache/hadoop/hbase/avro/TestAvroServer.java?rev=1001062&r1=1001061&r2=1001062&view=diff
==============================================================================
--- hbase/trunk/src/test/java/org/apache/hadoop/hbase/avro/TestAvroServer.java
(original)
+++ hbase/trunk/src/test/java/org/apache/hadoop/hbase/avro/TestAvroServer.java
Fri Sep 24 20:40:41 2010
@@ -96,7 +96,8 @@ public class TestAvroServer {
*/
@Test (timeout=300000)
public void testTableAdminAndMetadata() throws Exception {
- AvroServer.HBaseImpl impl = new AvroServer.HBaseImpl();
+ AvroServer.HBaseImpl impl =
+ new AvroServer.HBaseImpl(TEST_UTIL.getConfiguration());
assertEquals(impl.listTables().size(), 0);
@@ -140,7 +141,8 @@ public class TestAvroServer {
*/
@Test
public void testFamilyAdminAndMetadata() throws Exception {
- AvroServer.HBaseImpl impl = new AvroServer.HBaseImpl();
+ AvroServer.HBaseImpl impl =
+ new AvroServer.HBaseImpl(TEST_UTIL.getConfiguration());
ATableDescriptor tableA = new ATableDescriptor();
tableA.name = tableAname;
@@ -174,7 +176,8 @@ public class TestAvroServer {
*/
@Test
public void testDML() throws Exception {
- AvroServer.HBaseImpl impl = new AvroServer.HBaseImpl();
+ AvroServer.HBaseImpl impl =
+ new AvroServer.HBaseImpl(TEST_UTIL.getConfiguration());
ATableDescriptor tableA = new ATableDescriptor();
tableA.name = tableAname;