You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@trafodion.apache.org by am...@apache.org on 2016/08/19 19:04:05 UTC

[3/9] incubator-trafodion git commit: Merge branch 'master' of github.com:apache/incubator-trafodion into TRAFODION-2034

Merge branch 'master' of github.com:apache/incubator-trafodion into TRAFODION-2034


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

Branch: refs/heads/master
Commit: 62f70aa92ee434b7e9ec1aad619cfdce51d81e41
Parents: fa389f8 37901fb
Author: Amanda Moran <am...@apache.com>
Authored: Thu Aug 4 22:53:43 2016 +0000
Committer: Amanda Moran <am...@apache.com>
Committed: Thu Aug 4 22:53:43 2016 +0000

----------------------------------------------------------------------
 .rat-excludes                                   |    1 +
 README.md                                       |   58 +
 .../hbase/client/ClientScanner98.java.tmpl      |   24 +-
 .../client/TrafParallelClientScanner.java.tmpl  |    8 +-
 .../CommitUnsuccessfulException.java            |    3 +-
 .../HBaseBackedTransactionLogger.java           |   44 +-
 .../OutOfOrderProtocolException.java            |    3 +-
 .../hbase/client/transactional/RMInterface.java |   26 +-
 .../transactional/SsccTransactionalTable.java   |   30 +-
 .../SsccUpdateConflictException.java            |    3 +-
 .../hbase/client/transactional/TmDDL.java       |   26 +-
 .../transactional/TransactionManager.java       |  342 ++-
 .../TransactionalAggregationClient.java         |   19 +-
 .../transactional/TransactionalTable.java       |   35 +-
 .../transactional/TransactionalTableClient.java |    3 +-
 .../transactional/UnsuccessfulDDLException.java |    3 +-
 .../trafodion/dtm/HBaseAuditControlPoint.java   |   23 +-
 .../java/org/trafodion/dtm/HBaseTxClient.java   |   41 +-
 .../java/org/trafodion/dtm/TmAuditTlog.java     |   52 +-
 .../main/java/org/trafodion/dtm/TrafInfo.java   |   13 +-
 core/sqf/src/seatrans/tm/macros.gmk             |    2 +-
 core/sql/arkcmp/CmpStoredProc.cpp               |   96 +-
 core/sql/arkcmp/CmpStoredProc.h                 |   21 +-
 core/sql/bin/SqlciErrors.txt                    |    3 +-
 core/sql/common/CmpCommon.h                     |    1 +
 core/sql/common/ComSmallDefs.h                  |    3 +-
 core/sql/common/OperTypeEnum.h                  |    2 +
 core/sql/executor/ExExeUtilLoad.cpp             |   12 -
 core/sql/executor/HBaseClient_JNI.cpp           |   44 -
 core/sql/executor/HBaseClient_JNI.h             |    5 +-
 core/sql/executor/SequenceFileReader.cpp        |   26 -
 core/sql/executor/SequenceFileReader.h          |    2 -
 core/sql/generator/GenExplain.cpp               |   99 +-
 core/sql/generator/GenPreCode.cpp               |    4 +-
 core/sql/generator/GenRelExeUtil.cpp            |   43 +-
 core/sql/generator/GenRelMisc.cpp               |  129 +-
 core/sql/generator/GenRelScan.cpp               |   41 +-
 core/sql/generator/GenUdr.cpp                   |    4 +-
 core/sql/generator/Generator.cpp                |  782 ++++---
 core/sql/generator/Generator.h                  |   78 +-
 core/sql/nskgmake/sqlcat/Makefile               |    1 +
 core/sql/optimizer/BindItemExpr.cpp             |    7 +-
 core/sql/optimizer/BindRI.cpp                   |   28 +-
 core/sql/optimizer/BindRelExpr.cpp              |  112 +-
 core/sql/optimizer/BindWA.h                     |    6 +-
 core/sql/optimizer/EncodedKeyValue.cpp          |   77 +-
 core/sql/optimizer/EncodedKeyValue.h            |   21 +-
 core/sql/optimizer/ItemConstr.h                 |    5 +-
 core/sql/optimizer/NAColumn.cpp                 |  192 +-
 core/sql/optimizer/NAColumn.h                   |    4 +-
 core/sql/optimizer/NAFileSet.cpp                |    2 +-
 core/sql/optimizer/NAFileSet.h                  |   10 +-
 core/sql/optimizer/NARoutine.cpp                |   66 +-
 core/sql/optimizer/NARoutine.h                  |    2 +-
 core/sql/optimizer/NATable.cpp                  | 2067 +++++++++---------
 core/sql/optimizer/NATable.h                    |   14 +-
 core/sql/optimizer/RelExeUtil.cpp               |   24 +-
 core/sql/optimizer/RelExeUtil.h                 |   20 +-
 core/sql/optimizer/RelMisc.h                    |    2 +-
 core/sql/optimizer/RelRoutine.cpp               |   15 +-
 core/sql/optimizer/RelRoutine.h                 |   28 +-
 core/sql/optimizer/RelScan.h                    |   10 +-
 core/sql/optimizer/RelStoredProc.cpp            |    2 +-
 core/sql/optimizer/ValueDesc.cpp                |    7 +-
 core/sql/parser/AllStmtDDL.h                    |    1 +
 core/sql/parser/AllStmtDDLAlterTable.h          |    1 +
 core/sql/parser/BindStmtDDL.cpp                 |   31 +
 core/sql/parser/ElemDDLNode.cpp                 |   12 +
 core/sql/parser/ElemDDLNode.h                   |    4 +
 core/sql/parser/StmtDDLAlter.cpp                |   91 +
 core/sql/parser/StmtDDLAlterSchema.h            |  177 ++
 core/sql/parser/StmtDDLAlterTableStoredDesc.h   |  102 +
 core/sql/parser/sqlparser.y                     |   91 +-
 core/sql/regress/compGeneral/EXPECTED001.SB     |  105 +-
 core/sql/regress/compGeneral/TEST001            |   51 +-
 core/sql/regress/executor/EXPECTED013.SB        |    2 +
 core/sql/regress/executor/TEST122               |    6 +
 core/sql/regress/fullstack2/EXPECTED062         |    6 +
 core/sql/regress/fullstack2/EXPECTED062.RELEASE |    6 +
 core/sql/regress/hive/EXPECTED018               |  187 +-
 core/sql/regress/hive/TEST018                   |    3 +
 core/sql/regress/privs1/DIFF133.KNOWN           |   39 +-
 core/sql/regress/seabase/EXPECTED031            |  270 ++-
 core/sql/regress/seabase/TEST031                |   48 +-
 core/sql/regress/tools/sbdefs                   |    2 +
 core/sql/sqlcat/ReadTableDef.cpp                |  404 ----
 core/sql/sqlcat/ReadTableDef.h                  |   17 -
 core/sql/sqlcat/TrafDDLdesc.cpp                 |  619 ++++++
 core/sql/sqlcat/TrafDDLdesc.h                   | 1124 ++++++++++
 core/sql/sqlcat/desc.h                          |  473 +---
 core/sql/sqlcat/readRealArk.cpp                 |  146 +-
 core/sql/sqlcat/readRealArk.h                   |    1 -
 core/sql/sqlcomp/CmpDDLCatErrorCodes.h          |    1 +
 core/sql/sqlcomp/CmpDescribe.cpp                |   23 +-
 core/sql/sqlcomp/CmpSeabaseDDL.h                |   95 +-
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        |  314 ++-
 core/sql/sqlcomp/CmpSeabaseDDLincludes.h        |    2 +-
 core/sql/sqlcomp/CmpSeabaseDDLindex.cpp         |   40 +-
 core/sql/sqlcomp/CmpSeabaseDDLmd.h              |    7 +-
 core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp       |    1 -
 core/sql/sqlcomp/CmpSeabaseDDLschema.cpp        |  246 +++
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp         |  759 +++++--
 core/sql/sqlcomp/CmpSeabaseDDLview.cpp          |   12 +-
 core/sql/sqlcomp/DefaultConstants.h             |    6 +
 core/sql/sqlcomp/nadefaults.cpp                 |   10 +-
 .../java/org/trafodion/sql/HBaseClient.java     |  126 +-
 .../java/org/trafodion/sql/HBulkLoadClient.java |   62 +-
 .../java/org/trafodion/sql/HTableClient.java    |   36 +-
 .../org/trafodion/sql/SequenceFileWriter.java   |   40 +-
 .../java/org/trafodion/sql/TrafRegionStats.java |   16 +-
 docs/src/site/markdown/index.md                 |   14 +-
 .../site/resources/images/carousel/meetup.png   |  Bin 0 -> 81640 bytes
 112 files changed, 6596 insertions(+), 4109 deletions(-)
----------------------------------------------------------------------