You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by db...@apache.org on 2015/08/18 17:18:43 UTC

[4/4] incubator-trafodion git commit: Merge [TRAFODION-1457] PR 60 HBase region keys decoding and TEXT

Merge [TRAFODION-1457] PR 60 HBase region keys decoding and TEXT


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

Branch: refs/heads/master
Commit: 5f9c7b31f3e0d72f5a7c3ef1855ee29f014a7c45
Parents: d081b7d 4e9bb03
Author: Dave Birdsall <db...@apache.org>
Authored: Tue Aug 18 15:17:31 2015 +0000
Committer: Dave Birdsall <db...@apache.org>
Committed: Tue Aug 18 15:17:31 2015 +0000

----------------------------------------------------------------------
 core/sql/bin/SqlciErrors.txt                    |   9 +-
 core/sql/common/CharType.cpp                    | 266 ++++++-------------
 core/sql/common/CharType.h                      |   7 +
 core/sql/common/ComSmallDefs.h                  |   7 +-
 core/sql/common/IntervalType.cpp                |   2 +-
 core/sql/common/NAType.h                        |   7 +
 core/sql/common/csconvert.cpp                   |  21 ++
 core/sql/common/csconvert.h                     |  14 +-
 core/sql/optimizer/BindItemExpr.cpp             |  14 +-
 core/sql/optimizer/EncodedKeyValue.cpp          |   1 +
 core/sql/optimizer/ItemCache.cpp                |   1 -
 core/sql/optimizer/ItemColRef.h                 |  10 -
 core/sql/optimizer/ItemExpr.cpp                 | 108 +-------
 core/sql/optimizer/NATable.cpp                  | 227 +++++++++++-----
 core/sql/optimizer/NATable.h                    |   1 -
 core/sql/optimizer/QRDescGenerator.cpp          |   4 +-
 core/sql/parser/ElemDDLNode.cpp                 |   2 +-
 core/sql/parser/StmtDDLCreate.cpp               |  10 +-
 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   |  38 +--
 core/sql/regress/compGeneral/EXPECTED042        | 105 ++++----
 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/sqlcomp/CmpDescribe.cpp                |   2 +-
 core/sql/sqlcomp/CmpSeabaseDDL.h                |  22 +-
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        | 216 +++++++++------
 core/sql/sqlcomp/CmpSeabaseDDLindex.cpp         |  10 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp         |  59 ++--
 core/sql/sqlcomp/CmpSeabaseDDLupgrade.cpp       |   9 +-
 core/sql/sqlcomp/CmpSeabaseDDLview.cpp          |  13 +-
 core/sql/sqlcomp/DefaultConstants.h             |   2 +
 core/sql/sqlcomp/nadefaults.cpp                 |   6 +
 42 files changed, 1349 insertions(+), 1358 deletions(-)
----------------------------------------------------------------------