You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by an...@apache.org on 2016/05/31 22:53:37 UTC
[2/8] incubator-trafodion git commit: Merge remote branch
'origin/master' into ansharma_hivets_br
Merge remote branch 'origin/master' into ansharma_hivets_br
Conflicts:
core/sql/sqlcomp/DefaultConstants.h
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/cb6a75c6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/cb6a75c6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/cb6a75c6
Branch: refs/heads/master
Commit: cb6a75c63f7cfa0ed211dfe22f733ab0fedd4383
Parents: f472822 d02fe47
Author: Anoop Sharma <an...@esgyn.com>
Authored: Mon May 23 15:33:29 2016 +0000
Committer: Anoop Sharma <an...@esgyn.com>
Committed: Mon May 23 15:33:29 2016 +0000
----------------------------------------------------------------------
core/sql/cli/Context.cpp | 26 ++++++++++++----
core/sql/cli/Context.h | 1 +
core/sql/cli/ExSqlComp.cpp | 5 +++-
core/sql/cli/ExSqlComp.h | 2 ++
core/sql/cli/SessionDefaults.cpp | 9 ++++++
core/sql/cli/SessionDefaults.h | 12 +++++++-
core/sql/cli/Statement.cpp | 2 +-
core/sql/executor/ex_control.cpp | 12 ++++++++
core/sql/optimizer/BindRelExpr.cpp | 44 +++++++++++++++++++++++++++-
core/sql/optimizer/RelFastTransport.cpp | 4 +--
core/sql/optimizer/RelFastTransport.h | 14 ++++-----
core/sql/regress/executor/EXPECTED020 | 1 +
core/sql/regress/hive/EXPECTED003 | 26 ++++++++++++++++
core/sql/regress/hive/TEST003 | 11 +++++++
core/sql/sqlcomp/DefaultConstants.h | 2 ++
core/sql/sqlcomp/nadefaults.cpp | 2 ++
16 files changed, 155 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cb6a75c6/core/sql/cli/SessionDefaults.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cb6a75c6/core/sql/regress/executor/EXPECTED020
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cb6a75c6/core/sql/sqlcomp/DefaultConstants.h
----------------------------------------------------------------------
diff --cc core/sql/sqlcomp/DefaultConstants.h
index a48f1c8,8faee51..2cd6ef6
--- a/core/sql/sqlcomp/DefaultConstants.h
+++ b/core/sql/sqlcomp/DefaultConstants.h
@@@ -3817,10 -3817,7 +3817,12 @@@ enum DefaultConstant
// // 2 : todo
HIVE_SCAN_SPECIAL_MODE,
+ // if set, data modification check is done at runtime before running
+ // a query.
+ HIVE_DATA_MOD_CHECK,
+
+ COMPILER_IDLE_TIMEOUT,
++
// This enum constant must be the LAST one in the list; it's a count,
// not an Attribute (it's not IN DefaultDefaults; it's the SIZE of it)!
__NUM_DEFAULT_ATTRIBUTES
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/cb6a75c6/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------