trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ansha...@apache.org
Subject [3/6] incubator-trafodion git commit: Merge remote branch 'origin/master' into ansharma_rollup_br
Date Fri, 30 Sep 2016 00:15:20 GMT
Merge remote branch 'origin/master' into ansharma_rollup_br


Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/2a5b6325
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/2a5b6325
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/2a5b6325

Branch: refs/heads/master
Commit: 2a5b63252af09ea82b745ef581bd91ce4bad42c7
Parents: daeb4ae 71b1f8c
Author: Anoop Sharma <anoop.sharma@esgyn.com>
Authored: Wed Sep 28 01:43:49 2016 +0000
Committer: Anoop Sharma <anoop.sharma@esgyn.com>
Committed: Wed Sep 28 01:43:49 2016 +0000

----------------------------------------------------------------------
 core/sqf/sql/scripts/sqcheck                    |  27 ++-
 .../transactional/TrxRegionEndpoint.java.tmpl   | 112 +++++++-----
 .../transactional/TrxRegionObserver.java.tmpl   |  54 ++++--
 .../transactional/TransactionState.java         |  14 +-
 .../transactional/TrxTransactionState.java.tmpl |   4 +-
 core/sql/common/ExprNode.cpp                    |   5 +
 core/sql/optimizer/RelExpr.cpp                  |  37 ++++
 core/sql/optimizer/RelSet.h                     |   4 +
 core/sql/regress/compGeneral/EXPECTED023        |   2 +-
 core/sql/regress/hive/EXPECTED018               | 183 +++++++++----------
 core/sql/regress/privs1/EXPECTED132             | 100 +++++-----
 core/sql/regress/privs1/EXPECTED136             |   2 +
 core/sql/regress/privs2/EXPECTED129             |   7 +
 core/sql/regress/privs2/EXPECTED135             |   5 +
 core/sql/regress/privs2/EXPECTED138             |  22 +++
 core/sql/regress/privs2/EXPECTED139             |  10 +
 core/sql/regress/privs2/EXPECTED142             |   6 +
 core/sql/sqlcomp/nadefaults.cpp                 |   2 +-
 .../org/trafodion/dcs/server/ServerManager.java | 115 +++++++-----
 .../phoenix/end2end/MultiCfQueryExecTest.java   |   2 +-
 20 files changed, 468 insertions(+), 245 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/2a5b6325/core/sql/optimizer/RelExpr.cpp
----------------------------------------------------------------------


Mime
View raw message