You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by se...@apache.org on 2016/03/01 19:09:20 UTC
[5/5] incubator-trafodion git commit: Merge [TRAFODION-1700]
[TRAFODION-1847] PR #340
Merge [TRAFODION-1700] [TRAFODION-1847] PR #340
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/d2c464c8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d2c464c8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d2c464c8
Branch: refs/heads/master
Commit: d2c464c8d0e5118fd5c8e4a6abef312cad31dca7
Parents: f7cf2b8 3d91634
Author: selvaganesang <se...@apache.org>
Authored: Tue Mar 1 18:05:10 2016 +0000
Committer: selvaganesang <se...@apache.org>
Committed: Tue Mar 1 18:06:28 2016 +0000
----------------------------------------------------------------------
core/sql/comexe/ComTdbHbaseAccess.cpp | 3 +
core/sql/comexe/ComTdbHbaseAccess.h | 4 +-
core/sql/executor/ExHbaseAccess.cpp | 22 ++-
core/sql/executor/ExHbaseAccess.h | 1 +
core/sql/executor/ExHbaseIUD.cpp | 11 +-
core/sql/generator/GenPreCode.cpp | 13 --
core/sql/generator/GenRelUpdate.cpp | 112 ++++++------
core/sql/optimizer/BindRelExpr.cpp | 86 +++++++--
core/sql/optimizer/ItemOther.h | 7 +
core/sql/optimizer/RelExpr.cpp | 2 +-
core/sql/optimizer/RelUpdate.h | 2 +
core/sql/regress/charsets/DIFF012.KNOWN.SB | 2 +
core/sql/regress/core/EXPECTED056.SB | 6 +
core/sql/regress/core/TEST029 | 2 +-
core/sql/regress/core/TEST056 | 2 +
core/sql/regress/seabase/EXPECTED020 | 233 ++++++++++++++++++++++++
core/sql/regress/seabase/TEST020 | 54 ++++++
core/sql/sqlcomp/DefaultConstants.h | 4 +
core/sql/sqlcomp/nadefaults.cpp | 1 +
19 files changed, 476 insertions(+), 91 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d2c464c8/core/sql/regress/core/EXPECTED056.SB
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/d2c464c8/core/sql/sqlcomp/DefaultConstants.h
----------------------------------------------------------------------
diff --cc core/sql/sqlcomp/DefaultConstants.h
index 3a14da0,14b7ee5..20fefca
--- a/core/sql/sqlcomp/DefaultConstants.h
+++ b/core/sql/sqlcomp/DefaultConstants.h
@@@ -3796,10 -3796,9 +3796,14 @@@ enum DefaultConstant
// real charset in the HIVE table
HIVE_FILE_CHARSET,
+ // By default only alter of varchar col length is supported.
+ // If this cqd is on, then other alters (name, datatype) are also supported.
+ TRAF_ALTER_COL_ATTRS,
+
+ // if ON, upsert into the table will use the default value for the omitted columns
+ // with default value
+ TRAF_UPSERT_WITH_INSERT_DEFAULT_SEMANTICS,
++
// 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/d2c464c8/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------