You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by su...@apache.org on 2015/10/22 01:56:51 UTC
[5/6] incubator-trafodion git commit: Merge branch 'master' of
github.com:apache/incubator-trafodion into jira_34
Merge branch 'master' of github.com:apache/incubator-trafodion into jira_34
Conflicts:
core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/815fc9bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/815fc9bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/815fc9bb
Branch: refs/heads/master
Commit: 815fc9bb4a861a3917b2dd912c67da6ffdc3eb8f
Parents: 65d0f1c aa86b53
Author: Oliver Bucaojit <ol...@esgyn.com>
Authored: Tue Oct 20 04:55:57 2015 +0000
Committer: Oliver Bucaojit <ol...@esgyn.com>
Committed: Tue Oct 20 04:55:57 2015 +0000
----------------------------------------------------------------------
.../transactional/TrxRegionEndpoint.java | 36 +++++++-------------
core/sql/generator/GenPreCode.cpp | 2 +-
core/sql/generator/GenRelUpdate.cpp | 3 ++
core/sql/optimizer/RelExpr.cpp | 13 ++++---
core/sql/optimizer/RelUpdate.h | 8 +++--
core/sql/regress/compGeneral/EXPECTED013.SB | 2 +-
core/sql/regress/compGeneral/FILTER042 | 11 +++---
core/sql/regress/compGeneral/TEST042 | 2 ++
core/sql/regress/executor/EXPECTED122 | 4 +--
install/installer/traf_config_check | 18 ++++++----
10 files changed, 53 insertions(+), 46 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/815fc9bb/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java
----------------------------------------------------------------------
diff --cc core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java
index 2e64c12,2d740c8..16153c3
--- a/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java
+++ b/core/sqf/src/seatrans/hbase-trx/src/main/java/org/apache/hadoop/hbase/coprocessor/transactional/TrxRegionEndpoint.java
@@@ -384,7 -368,7 +385,8 @@@ CoprocessorService, Coprocessor
private static float memoryPercentage = 0;
private static boolean memoryThrottle = false;
private static boolean suppressOutOfOrderProtocolException = DEFAULT_SUPPRESS_OOP;
+ private Configuration config;
+ private static boolean checkRowBelongs = true;
// Transaction state defines
private static final int COMMIT_OK = 1;
@@@ -2923,16 -2894,16 +2925,16 @@@
HConstants.HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD,
HConstants.HBASE_REGIONSERVER_LEASE_PERIOD_KEY,
HConstants.DEFAULT_HBASE_CLIENT_SCANNER_TIMEOUT_PERIOD);
- this.scannerThreadWakeFrequency = conf.getInt(HConstants.THREAD_WAKE_FREQUENCY, 10 * 1000);
+ this.scannerThreadWakeFrequency = config.getInt(HConstants.THREAD_WAKE_FREQUENCY, 10 * 1000);
- this.cleanTimer = conf.getInt(SLEEP_CONF, DEFAULT_SLEEP);
- this.memoryUsageThreshold = conf.getInt(MEMORY_THRESHOLD, DEFAULT_MEMORY_THRESHOLD);
- this.memoryUsagePerformGC = conf.getBoolean(MEMORY_PERFORM_GC, DEFAULT_MEMORY_PERFORM_GC);
- this.memoryUsageWarnOnly = conf.getBoolean(MEMORY_WARN_ONLY, DEFAULT_MEMORY_WARN_ONLY);
- this.memoryUsageTimer = conf.getInt(MEMORY_CONF, DEFAULT_MEMORY_SLEEP);
- this.checkRowBelongs = conf.getBoolean(CHECK_ROW, true);
+ this.cleanTimer = config.getInt(SLEEP_CONF, DEFAULT_SLEEP);
+ this.memoryUsageThreshold = config.getInt(MEMORY_THRESHOLD, DEFAULT_MEMORY_THRESHOLD);
+ this.memoryUsagePerformGC = config.getBoolean(MEMORY_PERFORM_GC, DEFAULT_MEMORY_PERFORM_GC);
+ this.memoryUsageWarnOnly = config.getBoolean(MEMORY_WARN_ONLY, DEFAULT_MEMORY_WARN_ONLY);
+ this.memoryUsageTimer = config.getInt(MEMORY_CONF, DEFAULT_MEMORY_SLEEP);
- this.memoryUsageTimer = config.getInt(MEMORY_CONF, DEFAULT_MEMORY_SLEEP);
++ this.checkRowBelongs = config.getBoolean(CHECK_ROW, true);
- this.suppressOutOfOrderProtocolException = conf.getBoolean(SUPPRESS_OOP, DEFAULT_SUPPRESS_OOP);
+ this.suppressOutOfOrderProtocolException = config.getBoolean(SUPPRESS_OOP, DEFAULT_SUPPRESS_OOP);
if (this.transactionLeases == null)
this.transactionLeases = new Leases(LEASE_CHECK_FREQUENCY);