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

[2/5] incubator-trafodion git commit: Merge branch 'master' of github.com:apache/incubator-trafodion into jira1863

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


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

Branch: refs/heads/master
Commit: b929e6e20f66a5ce9f27f16ee90f4598519784bf
Parents: e9b02c2 e24ea17
Author: Eric Owhadi <er...@esgyn.com>
Authored: Fri Mar 4 14:50:36 2016 +0000
Committer: Eric Owhadi <er...@esgyn.com>
Committed: Fri Mar 4 14:50:36 2016 +0000

----------------------------------------------------------------------
 .../transactional/TransactionManager.java       |  22 +-
 .../transactional/TransactionalScanner.java     |  14 +-
 .../java/org/trafodion/dtm/HBaseTxClient.java   |  14 +-
 core/sql/arkcmp/CmpContext.cpp                  |  12 +-
 core/sql/arkcmp/CmpContext.h                    |  18 +
 core/sql/arkcmp/CmpStatement.cpp                |  19 +-
 core/sql/arkcmp/CmpStatement.h                  |   1 +
 core/sql/bin/SqlciErrors.txt                    |   1 +
 core/sql/cli/Context.cpp                        | 106 +++-
 core/sql/cli/Context.h                          |  13 +-
 core/sql/cli/ExSqlComp.cpp                      |   5 +
 core/sql/cli/Statement.cpp                      |  36 +-
 core/sql/comexe/CmpMessage.h                    |  23 +
 core/sql/common/ComSmallDefs.h                  |   9 +
 core/sql/common/DateTimeType.cpp                |   3 +-
 core/sql/executor/ExExeUtil.h                   |   1 +
 core/sql/executor/ExExeUtilGet.cpp              |  55 +-
 core/sql/executor/ExStats.cpp                   |  13 +-
 core/sql/executor/HBaseClient_JNI.cpp           |  16 +-
 core/sql/executor/HBaseClient_JNI.h             |   4 +-
 core/sql/executor/ex_ddl.cpp                    |   2 +
 core/sql/executor/ex_transaction.cpp            | 278 ++++------
 core/sql/executor/ex_transaction.h              |   2 +-
 core/sql/exp/ExpHbaseInterface.cpp              |  26 +-
 core/sql/exp/ExpHbaseInterface.h                |   4 +-
 core/sql/generator/GenRelExeUtil.cpp            |  31 +-
 core/sql/generator/GenRelMisc.cpp               |  13 +-
 core/sql/optimizer/NARoutine.cpp                |   2 +-
 core/sql/optimizer/NARoutineDB.h                |   5 +-
 core/sql/optimizer/NATable.cpp                  |  51 +-
 core/sql/optimizer/NATable.h                    |  10 +-
 core/sql/optimizer/RelExeUtil.cpp               | 155 +++---
 core/sql/optimizer/RelExeUtil.h                 |  30 +-
 core/sql/parser/SqlParserAux.cpp                |   2 +-
 core/sql/parser/StmtDDLAlter.cpp                |  11 +
 core/sql/parser/StmtDDLNode.cpp                 |  14 +
 core/sql/parser/StmtDDLNode.h                   |  15 +-
 core/sql/regress/core/DIFF116.KNOWN.SB          |  21 +
 core/sql/regress/core/EXPECTED056.SB            |  17 +-
 core/sql/regress/core/EXPECTED116               | 542 +++++++++++--------
 core/sql/regress/core/TEST056                   |   5 +-
 core/sql/regress/core/TEST116                   | 123 +++--
 core/sql/regress/executor/EXPECTED013.SB        |   1 +
 core/sql/regress/executor/EXPECTED140           |  40 +-
 core/sql/regress/fullstack2/EXPECTED062         |   3 +
 core/sql/regress/fullstack2/EXPECTED062.RELEASE |   3 +
 core/sql/regress/seabase/EXPECTED010            | 460 +++++++++-------
 core/sql/regress/seabase/EXPECTED011            |  13 +-
 core/sql/regress/seabase/EXPECTED016            |  35 +-
 core/sql/regress/tools/runregr_catman1.ksh      |   3 +-
 core/sql/regress/tools/runregr_charsets.ksh     |   3 +-
 core/sql/regress/tools/runregr_compGeneral.ksh  |   3 +-
 core/sql/regress/tools/runregr_core.ksh         |   3 +-
 core/sql/regress/tools/runregr_executor.ksh     |   3 +-
 core/sql/regress/tools/runregr_fullstack2.ksh   |   3 +-
 core/sql/regress/tools/runregr_hive.ksh         |   4 +-
 core/sql/regress/tools/runregr_privs1.ksh       |   3 +-
 core/sql/regress/tools/runregr_privs2.ksh       |   3 +-
 core/sql/regress/tools/runregr_qat.ksh          |   3 +-
 core/sql/regress/tools/runregr_seabase.ksh      |   4 +-
 core/sql/regress/tools/runregr_udr.ksh          |   9 +-
 core/sql/regress/tools/sbdefs                   |   1 +
 core/sql/sqlcomp/CmpDescribe.cpp                |   6 +-
 core/sql/sqlcomp/CmpSeabaseDDL.h                |  42 +-
 core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp       |  42 +-
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        | 283 +++++++---
 core/sql/sqlcomp/CmpSeabaseDDLindex.cpp         |  98 +++-
 core/sql/sqlcomp/CmpSeabaseDDLrepos.cpp         |   2 +-
 core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp       |   8 +-
 core/sql/sqlcomp/CmpSeabaseDDLschema.cpp        |  22 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp         | 470 +++++++++-------
 core/sql/sqlcomp/CmpSeabaseDDLupgrade.cpp       |  14 +-
 core/sql/sqlcomp/CmpSeabaseDDLupgrade.h         |   6 +-
 core/sql/sqlcomp/CmpSeabaseDDLview.cpp          |  30 +-
 .../java/org/trafodion/sql/HBaseClient.java     |  37 +-
 core/sql/ustat/hs_globals.cpp                   |  20 -
 .../src/asciidoc/_chapters/about.adoc           |   1 +
 .../src/asciidoc/_chapters/odb.adoc             |  14 +-
 .../src/asciidoc/_chapters/about.adoc           |   1 +
 docs/cqd_reference/pom.xml                      | 291 ++++++++++
 .../src/asciidoc/_chapters/about.adoc           | 179 ++++++
 .../src/asciidoc/_chapters/histograms.adoc      | 215 ++++++++
 .../src/asciidoc/_chapters/introduction.adoc    | 111 ++++
 .../_chapters/operational_controls.adoc         | 110 ++++
 .../src/asciidoc/_chapters/query_plans.adoc     | 515 ++++++++++++++++++
 .../asciidoc/_chapters/runtime_controls.adoc    |  83 +++
 .../src/asciidoc/_chapters/schema_controls.adoc |  49 ++
 .../src/asciidoc/_chapters/transactions.adoc    |  94 ++++
 .../src/asciidoc/_chapters/update_stats.adoc    |  92 ++++
 docs/cqd_reference/src/asciidoc/index.adoc      |  69 +++
 docs/load_transform/pom.xml                     | 289 ++++++++++
 .../src/asciidoc/_chapters/about.adoc           | 186 +++++++
 .../src/asciidoc/_chapters/bulk_load.adoc       | 291 ++++++++++
 .../src/asciidoc/_chapters/bulk_unload.adoc     |  73 +++
 .../src/asciidoc/_chapters/introduction.adoc    | 117 ++++
 .../src/asciidoc/_chapters/monitor.adoc         |  77 +++
 .../src/asciidoc/_chapters/tables_indexes.adoc  | 208 +++++++
 .../src/asciidoc/_chapters/trickle_load.adoc    | 496 +++++++++++++++++
 .../src/asciidoc/_chapters/troubleshoot.adoc    | 159 ++++++
 docs/load_transform/src/asciidoc/index.adoc     |  68 +++
 .../src/asciidoc/_chapters/about.adoc           |   3 +
 docs/odb_user/src/asciidoc/_chapters/about.adoc |   3 +
 docs/odb_user/src/asciidoc/_chapters/load.adoc  |  48 +-
 .../src/asciidoc/_chapters/about.adoc           |   2 +
 .../src/asciidoc/_chapters/about.adoc           |   2 +
 .../src/asciidoc/_chapters/cqds.adoc            |  20 -
 .../src/asciidoc/_chapters/sql_statements.adoc  |   8 +-
 .../src/asciidoc/_chapters/sql_utilities.adoc   | 117 +++-
 docs/src/site/markdown/download.md              |  18 +-
 docs/src/site/markdown/index.md                 |  12 +-
 docs/src/site/markdown/logo.md                  |  56 ++
 docs/src/site/resources/css/site.css            |  18 +-
 .../site/resources/images/carousel/scale.png    | Bin 93783 -> 127571 bytes
 .../site/resources/images/carousel/stack.png    | Bin 102472 -> 170554 bytes
 .../resources/images/logos/pb-Trafodion.png     | Bin 0 -> 49089 bytes
 .../resources/images/logos/pb-trafodion.jpg     | Bin 0 -> 80904 bytes
 .../images/logos/trafodion-dragon-large.jpg     | Bin 0 -> 50000 bytes
 .../images/logos/trafodion-dragon-large.png     | Bin 0 -> 20595 bytes
 .../resources/images/logos/trafodion-dragon.png | Bin 0 -> 12786 bytes
 .../resources/images/logos/trafodion-logo.jpg   | Bin 18953 -> 58953 bytes
 docs/src/site/site.xml                          |  20 +-
 121 files changed, 6190 insertions(+), 1349 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b929e6e2/core/sql/regress/core/TEST056
----------------------------------------------------------------------