You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by sa...@apache.org on 2017/09/06 16:04:26 UTC
[4/8] incubator-trafodion git commit: Merge remote branch
'origin/master' into traf_misc
Merge remote branch 'origin/master' into traf_misc
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/47cd6a98
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/47cd6a98
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/47cd6a98
Branch: refs/heads/master
Commit: 47cd6a98b7506ba2779c261a17d3029ee9491301
Parents: 001eb51 d7f7d65
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Mon Sep 4 07:10:29 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Mon Sep 4 07:10:29 2017 +0000
----------------------------------------------------------------------
core/conn/odb/src/odb.c | 22 +-
.../odbc/src/odbc/nsksrvrcore/sqlinterface.cpp | 25 +-
.../odbc/odbcclient/unixcli/cli/cconnect.cpp | 10 +-
core/sql/arkcmp/CmpStatement.cpp | 10 -
core/sql/common/CharType.cpp | 73 ++--
core/sql/common/CharType.h | 42 ++-
core/sql/common/DTICommonType.h | 10 +-
core/sql/common/DateTimeType.cpp | 51 ++-
core/sql/common/DatetimeType.h | 59 ++--
core/sql/common/IntervalType.cpp | 8 +-
core/sql/common/IntervalType.h | 24 +-
core/sql/common/MiscType.cpp | 47 ++-
core/sql/common/MiscType.h | 24 +-
core/sql/common/NAString.cpp | 1 -
core/sql/common/NAType.cpp | 44 +--
core/sql/common/NAType.h | 7 +-
core/sql/common/NumericType.cpp | 110 +++---
core/sql/common/NumericType.h | 126 +++----
core/sql/export/FBString.h | 2 +-
core/sql/export/NAStringDef.h | 4 +-
core/sql/generator/GenExpGenerator.cpp | 30 +-
core/sql/generator/GenFastTransport.cpp | 4 +-
core/sql/generator/GenItemFunc.cpp | 4 +-
core/sql/generator/GenKey.cpp | 6 +-
core/sql/generator/GenPreCode.cpp | 53 ++-
core/sql/generator/GenProbeCache.cpp | 4 +-
core/sql/generator/GenRelDCL.cpp | 4 +-
core/sql/generator/GenRelEnforcer.cpp | 4 +-
core/sql/generator/GenRelExeUtil.cpp | 2 +-
core/sql/generator/GenRelGrby.cpp | 2 +-
core/sql/generator/GenRelJoin.cpp | 4 +-
core/sql/generator/GenRelMisc.cpp | 8 +-
core/sql/generator/GenRelScan.cpp | 12 +-
core/sql/generator/GenRelSet.cpp | 4 +-
core/sql/generator/GenRelUpdate.cpp | 2 +-
core/sql/generator/GenSequenceFunction.cpp | 10 +-
core/sql/generator/GenStoredProc.cpp | 2 +-
core/sql/generator/Generator.cpp | 1 +
core/sql/generator/LmExpr.cpp | 4 +-
core/sql/langman/LmLangManager.cpp | 6 +-
core/sql/optimizer/BindItemExpr.cpp | 88 ++---
core/sql/optimizer/BindRelExpr.cpp | 54 ++-
core/sql/optimizer/BindWA.cpp | 2 +-
core/sql/optimizer/ItemExpr.cpp | 26 +-
core/sql/optimizer/ItemSample.cpp | 4 +-
core/sql/optimizer/ItmBitMuxFunction.cpp | 2 +-
core/sql/optimizer/MVInfo.cpp | 4 +-
core/sql/optimizer/MavRelRootBuilder.cpp | 4 +-
core/sql/optimizer/NAColumn.cpp | 129 +++----
core/sql/optimizer/NARoutine.cpp | 2 +-
core/sql/optimizer/NATable.cpp | 130 +++----
core/sql/optimizer/NormItemExpr.cpp | 10 +-
core/sql/optimizer/OptRange.cpp | 39 +--
core/sql/optimizer/PartFunc.cpp | 53 ++-
core/sql/optimizer/QRDescGenerator.cpp | 20 +-
core/sql/optimizer/QRDescriptorExtentions.cpp | 2 +-
core/sql/optimizer/RelCache.cpp | 4 +-
core/sql/optimizer/RelStoredProc.cpp | 2 +-
core/sql/optimizer/SynthType.cpp | 349 +++++++++----------
core/sql/optimizer/UdfDllInteraction.cpp | 61 ++--
core/sql/optimizer/ValueDesc.cpp | 37 +-
core/sql/optimizer/mdam.cpp | 2 +-
core/sql/parser/SqlParserAux.cpp | 34 +-
core/sql/parser/StmtDDLCreate.cpp | 10 +-
core/sql/parser/sqlparser.y | 322 ++++++++---------
core/sql/qmscommon/Range.cpp | 18 +-
core/sql/regress/charsets/TEST014 | 5 +
core/sql/regress/seabase/EXPECTED002 | 273 +++++++++++----
core/sql/regress/seabase/TEST002 | 12 +
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 91 +----
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 19 +-
.../java/org/trafodion/sql/HBaseClient.java | 2 +
core/sql/ustat/hs_cli.cpp | 40 ++-
win-odbc64/odbcclient/drvr35/sqltocconv.cpp | 5 +-
74 files changed, 1352 insertions(+), 1368 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/47cd6a98/core/sql/generator/GenRelGrby.cpp
----------------------------------------------------------------------