trafodion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sure...@apache.org
Subject [2/3] incubator-trafodion git commit: Merge branch 'master' into jira_bugs2
Date Wed, 26 Aug 2015 14:34:05 GMT
Merge branch 'master' into jira_bugs2

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/c467b2d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/c467b2d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/c467b2d8

Branch: refs/heads/master
Commit: c467b2d8a87e2d39b60cb5ce4a03f66d9da79df6
Parents: a6ec56a 7dece12
Author: Suresh Subbiah <sureshs@apache.org>
Authored: Tue Aug 25 15:27:36 2015 +0000
Committer: Suresh Subbiah <sureshs@apache.org>
Committed: Tue Aug 25 15:27:36 2015 +0000

----------------------------------------------------------------------
 .../sqf/export/limited-support-tools/LSO/README |  139 +--
 .../LSO/active_queries.sql                      |   17 +
 .../export/limited-support-tools/LSO/offender   |    8 +-
 core/sqf/sqenvcom.sh                            |   53 +-
 core/sql/bin/SqlciErrors.txt                    |   14 +-
 core/sql/cli/SessionDefaults.cpp                |    3 -
 core/sql/cli/SessionDefaults.h                  |    9 -
 core/sql/cli/Statement.cpp                      |    7 +-
 core/sql/cli/sqlcli.h                           |    3 +-
 core/sql/comexe/ComTdb.h                        |    5 +-
 core/sql/common/CharType.cpp                    |  266 ++---
 core/sql/common/CharType.h                      |    7 +
 core/sql/common/ComMisc.cpp                     |   14 +
 core/sql/common/ComMisc.h                       |    5 +
 core/sql/common/ComObjectName.h                 |   47 +
 core/sql/common/ComSmallDefs.cpp                |    4 +-
 core/sql/common/ComSmallDefs.h                  |   30 +-
 core/sql/common/IntervalType.cpp                |    2 +-
 core/sql/common/NAType.h                        |    7 +
 core/sql/common/OperTypeEnum.h                  |    2 -
 core/sql/common/csconvert.cpp                   |   21 +
 core/sql/common/csconvert.h                     |   14 +-
 core/sql/executor/ExExplain.cpp                 |    9 +
 core/sql/executor/ExStats.cpp                   |   52 +
 core/sql/executor/ex_control.cpp                |    7 -
 core/sql/generator/Generator.cpp                |    2 +
 core/sql/optimizer/BindItemExpr.cpp             |   14 +-
 core/sql/optimizer/BindRelExpr.cpp              |   20 +-
 core/sql/optimizer/EncodedKeyValue.cpp          |    1 +
 core/sql/optimizer/ItemCache.cpp                |    1 -
 core/sql/optimizer/ItemColRef.h                 |   10 -
 core/sql/optimizer/ItemExpr.cpp                 |  113 +-
 core/sql/optimizer/NATable.cpp                  |  396 +++++--
 core/sql/optimizer/NATable.h                    |   20 +-
 core/sql/optimizer/ObjectNames.h                |   29 +-
 core/sql/optimizer/QRDescGenerator.cpp          |    4 +-
 core/sql/optimizer/RelExeUtil.cpp               |   47 +-
 core/sql/parser/AllElemDDL.h                    |    1 -
 core/sql/parser/ElemDDLIndexPopulateOption.h    |    6 +-
 core/sql/parser/ElemDDLNode.cpp                 |   20 +-
 core/sql/parser/ElemDDLNode.h                   |    6 -
 core/sql/parser/ElemDDLPartition.cpp            |   54 -
 core/sql/parser/ElemDDLPartitionSystem.h        |   69 --
 core/sql/parser/ParAll.cpp                      |    1 -
 core/sql/parser/SqlParserAux.cpp                |   83 ++
 core/sql/parser/SqlParserAux.h                  |   65 ++
 core/sql/parser/StmtDDLCreate.cpp               |  145 +--
 core/sql/parser/StmtDDLCreateIndex.h            |   46 -
 core/sql/parser/StmtDDLCreateTable.h            |   89 +-
 core/sql/parser/StmtDDLNode.h                   |   11 +-
 core/sql/parser/sqlparser.y                     |  410 +++----
 core/sql/regress/catman1/EXPECTED135            |    8 +-
 core/sql/regress/charsets/DIFF002.KNOWN.SB      |   14 -
 core/sql/regress/charsets/DIFF002.KNOWN.SB.OS   |   14 -
 core/sql/regress/charsets/EXPECTED002           |  260 +++++
 core/sql/regress/charsets/EXPECTED002.SB        |  254 -----
 core/sql/regress/charsets/EXPECTED003           |  217 ++++
 core/sql/regress/charsets/EXPECTED003.SB        |  217 ----
 core/sql/regress/charsets/EXPECTED012           |  205 ++++
 core/sql/regress/charsets/EXPECTED012.SB        |  205 ----
 core/sql/regress/compGeneral/DIFF042.KNOWN.SB   |   24 -
 core/sql/regress/compGeneral/EXPECTED042        |  134 +--
 core/sql/regress/compGeneral/EXPECTED071        |    8 +-
 core/sql/regress/compGeneral/EXPECTEDTOK2       |   46 +
 core/sql/regress/compGeneral/EXPECTEDTOK2.LINUX |   46 -
 core/sql/regress/compGeneral/TEST015            |   10 +-
 core/sql/regress/compGeneral/TEST042            |   16 +-
 core/sql/regress/core/TEST056                   |   10 +-
 core/sql/regress/executor/EXPECTED106           | 1074 +++++++++---------
 core/sql/regress/executor/TEST106               |  270 ++---
 core/sql/regress/hive/EXPECTED009               |  275 +++++
 core/sql/regress/hive/TEST009                   |  106 ++
 core/sql/regress/hive/TEST009_a.hive.sql        |   64 ++
 core/sql/sqlcat/desc.h                          |    1 +
 core/sql/sqlcomp/CmpDDLCatErrorCodes.h          |    4 +-
 core/sql/sqlcomp/CmpDescribe.cpp                |   27 +-
 core/sql/sqlcomp/CmpSeabaseDDL.h                |   46 +-
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        |  342 ++++--
 core/sql/sqlcomp/CmpSeabaseDDLindex.cpp         |   21 +-
 core/sql/sqlcomp/CmpSeabaseDDLmd.h              |   10 +
 core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp       |   46 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp         |  646 ++++++++---
 core/sql/sqlcomp/CmpSeabaseDDLupgrade.cpp       |    9 +-
 core/sql/sqlcomp/CmpSeabaseDDLutil.cpp          |    3 +-
 core/sql/sqlcomp/CmpSeabaseDDLview.cpp          |   53 +-
 core/sql/sqlcomp/DefaultConstants.h             |    1 +
 core/sql/sqlcomp/PrivMgrMD.cpp                  |    8 +-
 core/sql/sqlcomp/nadefaults.cpp                 |    8 +-
 .../installer/tools/traf_hortonworks_uninstall  |    2 +
 .../tools/traf_hortonworks_uninstall_suse       |    2 +
 install/installer/traf_add_user                 |    4 +
 install/installer/traf_cloudera_mods98          |   13 +-
 install/installer/traf_config_setup             |    9 +-
 install/installer/traf_getHadoopNodes           |   16 +
 install/installer/traf_hortonworks_mods98       |   22 +-
 install/installer/traf_setup                    |   27 +-
 install/installer/traf_start                    |   18 +-
 install/installer/trafodion_uninstaller         |   14 +-
 pom.xml                                         |   14 +-
 99 files changed, 4047 insertions(+), 3204 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c467b2d8/core/sql/optimizer/BindRelExpr.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c467b2d8/core/sql/optimizer/RelExeUtil.cpp
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c467b2d8/core/sql/sqlcomp/DefaultConstants.h
----------------------------------------------------------------------
diff --cc core/sql/sqlcomp/DefaultConstants.h
index 460051f,990fc5d..9d61b40
--- a/core/sql/sqlcomp/DefaultConstants.h
+++ b/core/sql/sqlcomp/DefaultConstants.h
@@@ -3754,7 -3754,7 +3754,8 @@@ enum DefaultConstant
    UDR_JVM_DEBUG_PORT,
    UDR_JVM_DEBUG_TIMEOUT,
  
 +  TRAF_LOAD_ALLOW_RISKY_INDEX_MAINTENANCE,
+   HBASE_RANGE_PARTITIONING_PARTIAL_COLS,
  
    // 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)!

http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/c467b2d8/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------


Mime
View raw message