rename & update code
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/e1af6b9b Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/e1af6b9b Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/e1af6b9b Branch: refs/heads/master Commit: e1af6b9b94b237ab98c8e40677ada757a9b76f18 Parents: d8b594f Author: mashengchen <[email protected]> Authored: Tue Jan 12 05:38:26 2016 +0000 Committer: mashengchen <[email protected]> Committed: Tue Jan 12 05:38:26 2016 +0000 ---------------------------------------------------------------------- core/sqf/sql/scripts/sqgen | 4 +++- .../sqf/sql/scripts/traf_coprocessor.properties | 24 ++++++++++++++++++++ .../org/trafodion/sql/CoprocessorUtils.java | 2 +- 3 files changed, 28 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e1af6b9b/core/sqf/sql/scripts/sqgen ---------------------------------------------------------------------- diff --git a/core/sqf/sql/scripts/sqgen b/core/sqf/sql/scripts/sqgen index 39aeec2..6dd170c 100755 --- a/core/sqf/sql/scripts/sqgen +++ b/core/sqf/sql/scripts/sqgen @@ -187,7 +187,9 @@ else fi ./gensqstatem2lenv > $SQETC_DIR/sqstatem2l.env -cp ./trafcoprocess.properties $SQETC_DIR/ + +cp ./traf_coprocessor.properties $SQETC_DIR/ + # Create configuration database tables rm -f sqconfig.db sqlite3 -init createConfigDb sqconfig.db <<eof http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e1af6b9b/core/sqf/sql/scripts/traf_coprocessor.properties ---------------------------------------------------------------------- diff --git a/core/sqf/sql/scripts/traf_coprocessor.properties b/core/sqf/sql/scripts/traf_coprocessor.properties new file mode 100644 index 0000000..04d04e2 --- /dev/null +++ b/core/sqf/sql/scripts/traf_coprocessor.properties @@ -0,0 +1,24 @@ +# +# @@@ START COPYRIGHT @@@ +# +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# +# @@@ END COPYRIGHT @@@ +# + +coprocessors=org.apache.hadoop.hbase.coprocessor.transactional.TrxRegionObserver,org.apache.hadoop.hbase.coprocessor.transactional.TrxRegionEndpoint,org.apache.hadoop.hbase.coprocessor.transactional.SsccRegionEndpoint,org.apache.hadoop.hbase.coprocessor.AggregateImplementation http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/e1af6b9b/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java ---------------------------------------------------------------------- diff --git a/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java b/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java index e8cd7da..a50aff4 100644 --- a/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java +++ b/core/sql/src/main/java/org/trafodion/sql/CoprocessorUtils.java @@ -40,7 +40,7 @@ public class CoprocessorUtils { private static void init() { Configuration config = null; try { - String path = System.getenv("MY_SQROOT") + "/etc/trafcoprocess.properties"; + String path = System.getenv("MY_SQROOT") + "/etc/traf_coprocessor.properties"; config = new PropertiesConfiguration(path); } catch (Exception e) { logger.error("error when finding trafcoprocess.properties");
