You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tajo.apache.org by ji...@apache.org on 2015/01/28 04:55:26 UTC
[3/4] tajo git commit: TAJO-1319: Tajo can't find HBase configuration
file. (jaehwa)
TAJO-1319: Tajo can't find HBase configuration file. (jaehwa)
Closes #361
Project: http://git-wip-us.apache.org/repos/asf/tajo/repo
Commit: http://git-wip-us.apache.org/repos/asf/tajo/commit/c429c971
Tree: http://git-wip-us.apache.org/repos/asf/tajo/tree/c429c971
Diff: http://git-wip-us.apache.org/repos/asf/tajo/diff/c429c971
Branch: refs/heads/index_support
Commit: c429c9710ff0c5791a17419d29a5fc7fdea60e4d
Parents: d7ee6cd
Author: JaeHwa Jung <bl...@apache.org>
Authored: Tue Jan 27 22:24:08 2015 +0900
Committer: JaeHwa Jung <bl...@apache.org>
Committed: Tue Jan 27 22:24:08 2015 +0900
----------------------------------------------------------------------
CHANGES | 2 +
.../java/org/apache/tajo/conf/TajoConf.java | 2 +-
.../tajo/engine/query/TestHBaseTable.java | 135 +------------------
tajo-dist/src/main/bin/tajo | 54 ++++----
.../tajo/storage/hbase/HBaseStorageManager.java | 13 +-
5 files changed, 39 insertions(+), 167 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tajo/blob/c429c971/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index ceacf97..453e163 100644
--- a/CHANGES
+++ b/CHANGES
@@ -171,6 +171,8 @@ Release 0.10.0 - unreleased
BUG FIXES
+ TAJO-1319: Tajo can't find HBase configuration file. (jaehwa)
+
TAJO-1312: Stage causes Invalid event error: SQ_SHUFFLE_REPORT
at KILLED. (jinho)
http://git-wip-us.apache.org/repos/asf/tajo/blob/c429c971/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
----------------------------------------------------------------------
diff --git a/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java b/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
index 195743a..1bb96bc 100644
--- a/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
+++ b/tajo-common/src/main/java/org/apache/tajo/conf/TajoConf.java
@@ -53,7 +53,7 @@ public class TajoConf extends Configuration {
Configuration.addDefaultResource("storage-site.xml");
Configuration.addDefaultResource("tajo-default.xml");
Configuration.addDefaultResource("tajo-site.xml");
-
+
for (ConfVars confVars: ConfVars.values()) {
vars.put(confVars.keyname(), confVars);
}
http://git-wip-us.apache.org/repos/asf/tajo/blob/c429c971/tajo-core/src/test/java/org/apache/tajo/engine/query/TestHBaseTable.java
----------------------------------------------------------------------
diff --git a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestHBaseTable.java b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestHBaseTable.java
index 741a807..7ca766f 100644
--- a/tajo-core/src/test/java/org/apache/tajo/engine/query/TestHBaseTable.java
+++ b/tajo-core/src/test/java/org/apache/tajo/engine/query/TestHBaseTable.java
@@ -61,10 +61,16 @@ import static org.junit.Assert.assertEquals;
public class TestHBaseTable extends QueryTestCaseBase {
private static final Log LOG = LogFactory.getLog(TestHBaseTable.class);
+ private static String hostName,zkPort;
+
@BeforeClass
public static void beforeClass() {
try {
testingCluster.getHBaseUtil().startHBaseCluster();
+ hostName = InetAddress.getLocalHost().getHostName();
+ zkPort = testingCluster.getHBaseUtil().getConf().get(HConstants.ZOOKEEPER_CLIENT_PORT);
+ assertNotNull(hostName);
+ assertNotNull(zkPort);
} catch (Exception e) {
e.printStackTrace();
}
@@ -99,44 +105,10 @@ public class TestHBaseTable extends QueryTestCaseBase {
} catch (Exception e) {
assertTrue(e.getMessage().indexOf("'columns' property is required") >= 0);
}
-
- try {
- executeString("CREATE TABLE hbase_mapped_table1 (col1 text, col2 text) " +
- "USING hbase " +
- "WITH ('table'='hbase_table', 'columns'='col1:,col2:')").close();
-
- fail("hbase table must have 'hbase.zookeeper.quorum' meta");
- } catch (Exception e) {
- assertTrue(e.getMessage().indexOf("HBase mapped table") >= 0);
- }
- }
-
-
- @Test
- public void testVerifyCreateHBaseTableWithHBaseConfiguration() throws Exception {
- String hostName = InetAddress.getLocalHost().getHostName();
- String zkPort = testingCluster.getHBaseUtil().getConf().get(HConstants.ZOOKEEPER_CLIENT_PORT);
- assertNotNull(zkPort);
-
- try {
- testingCluster.getHBaseUtil().getConf().set(HConstants.ZOOKEEPER_QUORUM, hostName);
-
- executeString("CREATE TABLE hbase_mapped_table3 (col1 text, col2 text) " +
- "USING hbase " +
- "WITH ('table'='hbase_mapped_table3', 'columns'='col1:,col2:')").close();
-
- testingCluster.getHBaseUtil().getConf().set(HConstants.ZOOKEEPER_QUORUM, null);
- } catch (Exception e) {
- assertFalse(e.getMessage().indexOf("HBase mapped table") >= 0);
- }
}
@Test
public void testCreateHBaseTable() throws Exception {
- String hostName = InetAddress.getLocalHost().getHostName();
- String zkPort = testingCluster.getHBaseUtil().getConf().get(HConstants.ZOOKEEPER_CLIENT_PORT);
- assertNotNull(zkPort);
-
executeString("CREATE TABLE hbase_mapped_table1 (col1 text, col2 text, col3 text, col4 text) " +
"USING hbase WITH ('table'='hbase_table', 'columns'=':key,col2:a,col3:,col2:b', " +
"'" + HConstants.ZOOKEEPER_QUORUM + "'='" + hostName + "'," +
@@ -166,10 +138,6 @@ public class TestHBaseTable extends QueryTestCaseBase {
@Test
public void testCreateNotExistsExternalHBaseTable() throws Exception {
- String hostName = InetAddress.getLocalHost().getHostName();
- String zkPort = testingCluster.getHBaseUtil().getConf().get(HConstants.ZOOKEEPER_CLIENT_PORT);
- assertNotNull(zkPort);
-
try {
executeString("CREATE EXTERNAL TABLE external_hbase_mapped_table1 (col1 text, col2 text, col3 text, col4 text) " +
"USING hbase WITH ('table'='external_hbase_table', 'columns'=':key,col2:a,col3:,col2:b', " +
@@ -183,10 +151,6 @@ public class TestHBaseTable extends QueryTestCaseBase {
@Test
public void testCreateRowFieldWithNonText() throws Exception {
- String hostName = InetAddress.getLocalHost().getHostName();
- String zkPort = testingCluster.getHBaseUtil().getConf().get(HConstants.ZOOKEEPER_CLIENT_PORT);
- assertNotNull(zkPort);
-
try {
executeString("CREATE TABLE hbase_mapped_table2 (rk1 int4, rk2 text, col3 text, col4 text) " +
"USING hbase WITH ('table'='hbase_table', 'columns'='0:key#b,1:key,col3:,col2:b', " +
@@ -207,10 +171,6 @@ public class TestHBaseTable extends QueryTestCaseBase {
hTableDesc.addFamily(new HColumnDescriptor("col3"));
testingCluster.getHBaseUtil().createTable(hTableDesc);
- String hostName = InetAddress.getLocalHost().getHostName();
- String zkPort = testingCluster.getHBaseUtil().getConf().get(HConstants.ZOOKEEPER_CLIENT_PORT);
- assertNotNull(zkPort);
-
executeString("CREATE EXTERNAL TABLE external_hbase_mapped_table (rk text, col1 text, col2 text, col3 text) " +
"USING hbase WITH ('table'='external_hbase_table_not_purge', 'columns'=':key,col1:a,col2:,col3:b', " +
"'" + HConstants.ZOOKEEPER_QUORUM + "'='" + hostName + "'," +
@@ -238,10 +198,6 @@ public class TestHBaseTable extends QueryTestCaseBase {
hTableDesc.addFamily(new HColumnDescriptor("col3"));
testingCluster.getHBaseUtil().createTable(hTableDesc);
- String hostName = InetAddress.getLocalHost().getHostName();
- String zkPort = testingCluster.getHBaseUtil().getConf().get(HConstants.ZOOKEEPER_CLIENT_PORT);
- assertNotNull(zkPort);
-
executeString("CREATE EXTERNAL TABLE external_hbase_mapped_table (rk text, col1 text, col2 text, col3 text) " +
"USING hbase WITH ('table'='external_hbase_table', 'columns'=':key,col1:a,col2:,col3:b', " +
"'" + HConstants.ZOOKEEPER_QUORUM + "'='" + hostName + "'," +
@@ -281,10 +237,6 @@ public class TestHBaseTable extends QueryTestCaseBase {
hTableDesc.addFamily(new HColumnDescriptor("col3"));
testingCluster.getHBaseUtil().createTable(hTableDesc);
- String hostName = InetAddress.getLocalHost().getHostName();
- String zkPort = testingCluster.getHBaseUtil().getConf().get(HConstants.ZOOKEEPER_CLIENT_PORT);
- assertNotNull(zkPort);
-
executeString("CREATE EXTERNAL TABLE external_hbase_mapped_table (rk int8, col1 text, col2 text, col3 int4)\n " +
"USING hbase WITH ('table'='external_hbase_table', 'columns'=':key#b,col1:a,col2:,col3:b#b', \n" +
"'" + HConstants.ZOOKEEPER_QUORUM + "'='" + hostName + "', \n" +
@@ -337,10 +289,6 @@ public class TestHBaseTable extends QueryTestCaseBase {
hTableDesc.addFamily(new HColumnDescriptor("col3"));
testingCluster.getHBaseUtil().createTable(hTableDesc);
- String hostName = InetAddress.getLocalHost().getHostName();
- String zkPort = testingCluster.getHBaseUtil().getConf().get(HConstants.ZOOKEEPER_CLIENT_PORT);
- assertNotNull(zkPort);
-
executeString("CREATE EXTERNAL TABLE external_hbase_mapped_table (rk1 text, col2_key text, col2_value text, col3 text) " +
"USING hbase WITH ('table'='external_hbase_table', 'columns'=':key,col2:key:,col2:value:,col3:', " +
"'hbase.rowkey.delimiter'='_', " +
@@ -378,10 +326,6 @@ public class TestHBaseTable extends QueryTestCaseBase {
hTableDesc.addFamily(new HColumnDescriptor("col3"));
testingCluster.getHBaseUtil().createTable(hTableDesc);
- String hostName = InetAddress.getLocalHost().getHostName();
- String zkPort = testingCluster.getHBaseUtil().getConf().get(HConstants.ZOOKEEPER_CLIENT_PORT);
- assertNotNull(zkPort);
-
executeString("CREATE EXTERNAL TABLE external_hbase_mapped_table (rk1 text, rk2 text, col3 text) " +
"USING hbase WITH ('table'='external_hbase_table', 'columns'='0:key,1:key,col3:a', " +
"'hbase.rowkey.delimiter'='_', " +
@@ -412,10 +356,6 @@ public class TestHBaseTable extends QueryTestCaseBase {
@Test
public void testIndexPredication() throws Exception {
- String hostName = InetAddress.getLocalHost().getHostName();
- String zkPort = testingCluster.getHBaseUtil().getConf().get(HConstants.ZOOKEEPER_CLIENT_PORT);
- assertNotNull(zkPort);
-
executeString("CREATE TABLE hbase_mapped_table (rk text, col1 text, col2 text, col3 text) " +
"USING hbase WITH ('table'='hbase_table', 'columns'=':key,col1:a,col2:,col3:b', " +
"'hbase.split.rowkeys'='010,040,060,080', " +
@@ -464,10 +404,6 @@ public class TestHBaseTable extends QueryTestCaseBase {
@Test
public void testCompositeRowIndexPredication() throws Exception {
- String hostName = InetAddress.getLocalHost().getHostName();
- String zkPort = testingCluster.getHBaseUtil().getConf().get(HConstants.ZOOKEEPER_CLIENT_PORT);
- assertNotNull(zkPort);
-
executeString("CREATE TABLE hbase_mapped_table (rk text, rk2 text, col1 text, col2 text, col3 text) " +
"USING hbase WITH ('table'='hbase_table', 'columns'='0:key,1:key,col1:a,col2:,col3:b', " +
"'hbase.split.rowkeys'='010,040,060,080', " +
@@ -475,7 +411,6 @@ public class TestHBaseTable extends QueryTestCaseBase {
"'" + HConstants.ZOOKEEPER_QUORUM + "'='" + hostName + "'," +
"'" + HConstants.ZOOKEEPER_CLIENT_PORT + "'='" + zkPort + "')").close();
-
assertTableExists("hbase_mapped_table");
HBaseAdmin hAdmin = new HBaseAdmin(testingCluster.getHBaseUtil().getConf());
hAdmin.tableExists("hbase_table");
@@ -623,17 +558,12 @@ public class TestHBaseTable extends QueryTestCaseBase {
@Test
public void testNonForwardQuery() throws Exception {
- String hostName = InetAddress.getLocalHost().getHostName();
- String zkPort = testingCluster.getHBaseUtil().getConf().get(HConstants.ZOOKEEPER_CLIENT_PORT);
- assertNotNull(zkPort);
-
executeString("CREATE TABLE hbase_mapped_table (rk text, col1 text, col2 text, col3 int) " +
"USING hbase WITH ('table'='hbase_table', 'columns'=':key,col1:a,col2:,col3:#b', " +
"'hbase.split.rowkeys'='010,040,060,080', " +
"'" + HConstants.ZOOKEEPER_QUORUM + "'='" + hostName + "'," +
"'" + HConstants.ZOOKEEPER_CLIENT_PORT + "'='" + zkPort + "')").close();
-
assertTableExists("hbase_mapped_table");
HBaseAdmin hAdmin = new HBaseAdmin(testingCluster.getHBaseUtil().getConf());
HTable htable = null;
@@ -668,17 +598,12 @@ public class TestHBaseTable extends QueryTestCaseBase {
@Test
public void testJoin() throws Exception {
- String hostName = InetAddress.getLocalHost().getHostName();
- String zkPort = testingCluster.getHBaseUtil().getConf().get(HConstants.ZOOKEEPER_CLIENT_PORT);
- assertNotNull(zkPort);
-
executeString("CREATE TABLE hbase_mapped_table (rk text, col1 text, col2 text, col3 int8) " +
"USING hbase WITH ('table'='hbase_table', 'columns'=':key,col1:a,col2:,col3:b#b', " +
"'hbase.split.rowkeys'='010,040,060,080', " +
"'" + HConstants.ZOOKEEPER_QUORUM + "'='" + hostName + "'," +
"'" + HConstants.ZOOKEEPER_CLIENT_PORT + "'='" + zkPort + "')").close();
-
assertTableExists("hbase_mapped_table");
HBaseAdmin hAdmin = new HBaseAdmin(testingCluster.getHBaseUtil().getConf());
HTable htable = null;
@@ -715,10 +640,6 @@ public class TestHBaseTable extends QueryTestCaseBase {
@Test
public void testInsertInto() throws Exception {
- String hostName = InetAddress.getLocalHost().getHostName();
- String zkPort = testingCluster.getHBaseUtil().getConf().get(HConstants.ZOOKEEPER_CLIENT_PORT);
- assertNotNull(zkPort);
-
executeString("CREATE TABLE hbase_mapped_table (rk text, col1 text, col2 text, col3 int4) " +
"USING hbase WITH ('table'='hbase_table', 'columns'=':key,col1:a,col2:,col3:b#b', " +
"'" + HConstants.ZOOKEEPER_QUORUM + "'='" + hostName + "'," +
@@ -761,10 +682,6 @@ public class TestHBaseTable extends QueryTestCaseBase {
@Test
public void testInsertIntoMultiRegion() throws Exception {
- String hostName = InetAddress.getLocalHost().getHostName();
- String zkPort = testingCluster.getHBaseUtil().getConf().get(HConstants.ZOOKEEPER_CLIENT_PORT);
- assertNotNull(zkPort);
-
executeString("CREATE TABLE hbase_mapped_table (rk text, col1 text) " +
"USING hbase WITH ('table'='hbase_table', 'columns'=':key,col1:a', " +
"'hbase.split.rowkeys'='010,040,060,080', " +
@@ -823,10 +740,6 @@ public class TestHBaseTable extends QueryTestCaseBase {
@Test
public void testInsertIntoMultiRegion2() throws Exception {
- String hostName = InetAddress.getLocalHost().getHostName();
- String zkPort = testingCluster.getHBaseUtil().getConf().get(HConstants.ZOOKEEPER_CLIENT_PORT);
- assertNotNull(zkPort);
-
executeString("CREATE TABLE hbase_mapped_table (rk text, col1 text) " +
"USING hbase WITH ('table'='hbase_table', 'columns'=':key,col1:a', " +
"'hbase.split.rowkeys'='1,2,3,4,5,6,7,8,9', " +
@@ -884,10 +797,6 @@ public class TestHBaseTable extends QueryTestCaseBase {
@Test
public void testInsertIntoMultiRegionWithSplitFile() throws Exception {
- String hostName = InetAddress.getLocalHost().getHostName();
- String zkPort = testingCluster.getHBaseUtil().getConf().get(HConstants.ZOOKEEPER_CLIENT_PORT);
- assertNotNull(zkPort);
-
String splitFilePath = currentDatasetPath + "/splits.data";
executeString("CREATE TABLE hbase_mapped_table (rk text, col1 text) " +
@@ -948,10 +857,6 @@ public class TestHBaseTable extends QueryTestCaseBase {
@Test
public void testInsertIntoMultiRegionMultiRowFields() throws Exception {
- String hostName = InetAddress.getLocalHost().getHostName();
- String zkPort = testingCluster.getHBaseUtil().getConf().get(HConstants.ZOOKEEPER_CLIENT_PORT);
- assertNotNull(zkPort);
-
executeString("CREATE TABLE hbase_mapped_table (rk1 text, rk2 text, col1 text) " +
"USING hbase WITH ('table'='hbase_table', 'columns'='0:key,1:key,col1:a', " +
"'hbase.split.rowkeys'='001,002,003,004,005,006,007,008,009', " +
@@ -1012,10 +917,6 @@ public class TestHBaseTable extends QueryTestCaseBase {
@Test
public void testInsertIntoBinaryMultiRegion() throws Exception {
- String hostName = InetAddress.getLocalHost().getHostName();
- String zkPort = testingCluster.getHBaseUtil().getConf().get(HConstants.ZOOKEEPER_CLIENT_PORT);
- assertNotNull(zkPort);
-
executeString("CREATE TABLE hbase_mapped_table (rk int4, col1 text) " +
"USING hbase WITH ('table'='hbase_table', 'columns'=':key#b,col1:a', " +
"'hbase.split.rowkeys'='1,2,3,4,5,6,7,8,9', " +
@@ -1073,10 +974,6 @@ public class TestHBaseTable extends QueryTestCaseBase {
@Test
public void testInsertIntoColumnKeyValue() throws Exception {
- String hostName = InetAddress.getLocalHost().getHostName();
- String zkPort = testingCluster.getHBaseUtil().getConf().get(HConstants.ZOOKEEPER_CLIENT_PORT);
- assertNotNull(zkPort);
-
executeString("CREATE TABLE hbase_mapped_table (rk text, col2_key text, col2_value text, col3 text) " +
"USING hbase WITH ('table'='hbase_table', 'columns'=':key,col2:key:,col2:value:,col3:', " +
"'hbase.rowkey.delimiter'='_', " +
@@ -1168,10 +1065,6 @@ public class TestHBaseTable extends QueryTestCaseBase {
@Test
public void testInsertIntoDifferentType() throws Exception {
- String hostName = InetAddress.getLocalHost().getHostName();
- String zkPort = testingCluster.getHBaseUtil().getConf().get(HConstants.ZOOKEEPER_CLIENT_PORT);
- assertNotNull(zkPort);
-
executeString("CREATE TABLE hbase_mapped_table (rk text, col1 text) " +
"USING hbase WITH ('table'='hbase_table', 'columns'=':key,col1:a', " +
"'hbase.split.rowkeys'='1,2,3,4,5,6,7,8,9', " +
@@ -1209,10 +1102,6 @@ public class TestHBaseTable extends QueryTestCaseBase {
@Test
public void testInsertIntoRowField() throws Exception {
- String hostName = InetAddress.getLocalHost().getHostName();
- String zkPort = testingCluster.getHBaseUtil().getConf().get(HConstants.ZOOKEEPER_CLIENT_PORT);
- assertNotNull(zkPort);
-
executeString("CREATE TABLE hbase_mapped_table (rk1 text, rk2 text, col1 text, col2 text, col3 text) " +
"USING hbase WITH ('table'='hbase_table', 'columns'='0:key,1:key,col1:a,col2:,col3:b', " +
"'hbase.rowkey.delimiter'='_', " +
@@ -1257,10 +1146,6 @@ public class TestHBaseTable extends QueryTestCaseBase {
@Test
public void testCATS() throws Exception {
- String hostName = InetAddress.getLocalHost().getHostName();
- String zkPort = testingCluster.getHBaseUtil().getConf().get(HConstants.ZOOKEEPER_CLIENT_PORT);
- assertNotNull(zkPort);
-
// create test table
KeyValueSet tableOptions = new KeyValueSet();
tableOptions.set(StorageConstants.CSVFILE_DELIMITER, StorageConstants.DEFAULT_FIELD_DELIMITER);
@@ -1319,10 +1204,6 @@ public class TestHBaseTable extends QueryTestCaseBase {
@Test
public void testInsertIntoUsingPut() throws Exception {
- String hostName = InetAddress.getLocalHost().getHostName();
- String zkPort = testingCluster.getHBaseUtil().getConf().get(HConstants.ZOOKEEPER_CLIENT_PORT);
- assertNotNull(zkPort);
-
executeString("CREATE TABLE hbase_mapped_table (rk text, col1 text, col2 text, col3 int4) " +
"USING hbase WITH ('table'='hbase_table', 'columns'=':key,col1:a,col2:,col3:b#b', " +
"'" + HConstants.ZOOKEEPER_QUORUM + "'='" + hostName + "'," +
@@ -1372,10 +1253,6 @@ public class TestHBaseTable extends QueryTestCaseBase {
@Test
public void testInsertIntoLocation() throws Exception {
- String hostName = InetAddress.getLocalHost().getHostName();
- String zkPort = testingCluster.getHBaseUtil().getConf().get(HConstants.ZOOKEEPER_CLIENT_PORT);
- assertNotNull(zkPort);
-
executeString("CREATE TABLE hbase_mapped_table (rk text, col1 text, col2 text) " +
"USING hbase WITH ('table'='hbase_table', 'columns'=':key,col1:a,col2:', " +
"'hbase.split.rowkeys'='010,040,060,080', " +
http://git-wip-us.apache.org/repos/asf/tajo/blob/c429c971/tajo-dist/src/main/bin/tajo
----------------------------------------------------------------------
diff --git a/tajo-dist/src/main/bin/tajo b/tajo-dist/src/main/bin/tajo
index f10f393..cc611d5 100755
--- a/tajo-dist/src/main/bin/tajo
+++ b/tajo-dist/src/main/bin/tajo
@@ -226,16 +226,37 @@ HDFS_LIBRARY_PATH="${HADOOP_HOME}/lib/native/"
##############################################################################
##############################################################################
-# Set HBase CLASSPATH
+# HBase Configuration Start
##############################################################################
-if [ "$HBASE_HOME" != "" ]; then
- for f in ${HBASE_HOME}/lib/hbase-*.jar; do
+
+HBASE_CONF=$HBASE_HOME/conf
+
+if [ -d ${HBASE_CONF} ]; then
+ CLASSPATH=${HBASE_CONF}:${CLASSPATH}
+fi
+
+HBASE_LIB=$HBASE_HOME/lib
+
+if [ -d ${HBASE_LIB} ]; then
+
+ for f in ${HBASE_LIB}/hbase-client-*.jar; do
CLASSPATH=${CLASSPATH}:$f;
done
- for f in ${HBASE_HOME}/lib/htrace-*.jar; do
+
+ for f in ${HBASE_LIB}/hbase-common-*.jar; do
+ CLASSPATH=${CLASSPATH}:$f;
+ done
+
+ for f in ${HBASE_LIB}/hbase-protocol-*.jar; do
+ CLASSPATH=${CLASSPATH}:$f;
+ done
+
+ for f in ${HBASE_LIB}/htrace-core-*.jar; do
CLASSPATH=${CLASSPATH}:$f;
done
+
fi
+
##############################################################################
# HBase Configuration End
##############################################################################
@@ -289,31 +310,6 @@ fi
##############################################################################
-# Find and Set HBase CLASSPATH
-##############################################################################
-
-HBASE_CONF=$HBASE_HOME/conf/hbase-site.xml
-
-if [ -d ${HBASE_CONF} ]; then
- CLASSPATH=${HBASE_CONF}:${CLASSPATH}
-fi
-
-
-HBASE_LIB=$HBASE_HOME/lib
-
-if [ -d ${HBASE_LIB} ]; then
-
- for f in ${HBASE_LIB}/hbase-common-*.jar; do
- CLASSPATH=${CLASSPATH}:$f;
- done
-fi
-
-##############################################################################
-# Find and Set HBase CLASSPATH
-##############################################################################
-
-
-##############################################################################
# Find and Set Tajo CLASSPATH
##############################################################################
http://git-wip-us.apache.org/repos/asf/tajo/blob/c429c971/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseStorageManager.java
----------------------------------------------------------------------
diff --git a/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseStorageManager.java b/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseStorageManager.java
index c51e31c..59d1b48 100644
--- a/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseStorageManager.java
+++ b/tajo-storage/tajo-storage-hbase/src/main/java/org/apache/tajo/storage/hbase/HBaseStorageManager.java
@@ -299,12 +299,12 @@ public class HBaseStorageManager extends StorageManager {
* @throws java.io.IOException
*/
public static Configuration getHBaseConfiguration(Configuration conf, TableMeta tableMeta) throws IOException {
- boolean hasZkQuorum = tableMeta.containsOption(HBaseStorageConstants.META_ZK_QUORUM_KEY);
- String zkQuorum = null;
- if (hasZkQuorum) {
+ Configuration hbaseConf = (conf == null) ? HBaseConfiguration.create() : HBaseConfiguration.create(conf);
+
+ String zkQuorum = hbaseConf.get(HConstants.ZOOKEEPER_QUORUM);
+ if (tableMeta.containsOption(HBaseStorageConstants.META_ZK_QUORUM_KEY)) {
zkQuorum = tableMeta.getOption(HBaseStorageConstants.META_ZK_QUORUM_KEY, "");
- } else {
- zkQuorum = conf.get(HBaseStorageConstants.META_ZK_QUORUM_KEY, "");
+ hbaseConf.set(HConstants.ZOOKEEPER_QUORUM, zkQuorum);
}
if (zkQuorum == null || zkQuorum.trim().isEmpty()) {
@@ -312,9 +312,6 @@ public class HBaseStorageManager extends StorageManager {
HBaseStorageConstants.META_ZK_QUORUM_KEY + "' attribute.");
}
- Configuration hbaseConf = (conf == null) ? HBaseConfiguration.create() : HBaseConfiguration.create(conf);
- hbaseConf.set(HConstants.ZOOKEEPER_QUORUM, zkQuorum);
-
for (Map.Entry<String, String> eachOption: tableMeta.getOptions().getAllKeyValus().entrySet()) {
String key = eachOption.getKey();
if (key.startsWith(HConstants.ZK_CFG_PROPERTY_PREFIX)) {