[TRAFODION-2306] Trafodion customization using its own configuration
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/5569b681 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/5569b681 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/5569b681 Branch: refs/heads/master Commit: 5569b681228bf80b90a95bc5094098e186e99268 Parents: 5106c8c Author: selvaganesang <selva.govindara...@esgyn.com> Authored: Mon Oct 24 01:41:07 2016 +0000 Committer: selvaganesang <selva.govindara...@esgyn.com> Committed: Mon Oct 24 01:41:07 2016 +0000 ---------------------------------------------------------------------- core/sql/src/main/java/org/trafodion/sql/HBaseClient.java | 3 ++- .../src/main/java/org/trafodion/sql/TrafConfiguration.java | 9 +++++---- 2 files changed, 7 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5569b681/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java ---------------------------------------------------------------------- diff --git a/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java b/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java index 47fc716..84122a4 100644 --- a/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java +++ b/core/sql/src/main/java/org/trafodion/sql/HBaseClient.java @@ -176,7 +176,7 @@ public class HBaseClient { return true; } - private void addCoprocessor(HTableDescriptor desc) { + private void addCoprocessor(HTableDescriptor desc) throws IOException { String coprocessorClasses = config.get("hbase.coprocessor.region.classes"); if (coprocessorClasses != null) desc.addCoprocessor(coprocessorClasses); @@ -186,6 +186,7 @@ public class HBaseClient { boolean isMVCC) throws IOException, MasterNotRunningException { if (logger.isDebugEnabled()) logger.debug("HBaseClient.create(" + tblName + ") called, and MVCC is " + isMVCC + "."); + HTableDescriptor desc = new HTableDescriptor(tblName); addCoprocessor(desc); for (int i = 0; i < colFamNameList.length ; i++) { String colFam = (String)colFamNameList[i]; http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/5569b681/core/sql/src/main/java/org/trafodion/sql/TrafConfiguration.java ---------------------------------------------------------------------- diff --git a/core/sql/src/main/java/org/trafodion/sql/TrafConfiguration.java b/core/sql/src/main/java/org/trafodion/sql/TrafConfiguration.java index b71333c..4f3e842 100644 --- a/core/sql/src/main/java/org/trafodion/sql/TrafConfiguration.java +++ b/core/sql/src/main/java/org/trafodion/sql/TrafConfiguration.java @@ -20,6 +20,8 @@ package org.trafodion.sql; import org.apache.log4j.Logger; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hbase.HBaseConfiguration; +import org.apache.hadoop.fs.Path; + /** * Adds Trafodion configuration files to a Configuration @@ -29,10 +31,9 @@ public class TrafConfiguration extends HBaseConfiguration { static Logger logger = Logger.getLogger(TrafConfiguration.class.getName()); public static Configuration addTrafResources(Configuration conf) { - logger.trace("Calling TrafConfiguration.addTrafResources"); - String trafSiteXml = System.getenv("MY_SQROOT") + "/etc/traf-site.xml"; - conf.addResource(trafSiteXml); - + String trafSiteXml = new String(System.getenv("MY_SQROOT") + "/etc/traf-site.xml"); + Path fileRes = new Path(trafSiteXml); + conf.addResource(fileRes); return conf; }