Merge branch 'master' into trafodion-1794

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

Branch: refs/heads/master
Commit: 77c69498277aab406993b80a39819156d28693e2
Parents: 7bab838 b6b9f43
Author: Roberta Marton <rmarton@edev07.esgyn.local>
Authored: Mon Sep 19 17:16:47 2016 +0000
Committer: Roberta Marton <rmarton@edev07.esgyn.local>
Committed: Mon Sep 19 17:16:47 2016 +0000

----------------------------------------------------------------------
 core/sqf/conf/log4j.hdfs.config                 |     2 +
 core/sqf/sqenvcom.sh                            |     3 +-
 .../hbase/client/transactional/RMInterface.java |    52 +
 .../transactional/SsccTransactionalTable.java   |   153 +-
 .../transactional/TransactionalTable.java       |   164 +
 .../transactional/TransactionalTableClient.java |    42 +-
 .../transactional/SsccRegionEndpoint.java.tmpl  |   178 +
 .../transactional/TrxRegionEndpoint.java.tmpl   |   386 +-
 .../generated/SsccRegionProtos.java             | 12629 ++++++++++++-----
 .../generated/TrxRegionProtos.java              | 11787 ++++++++++-----
 .../transactional/SsccTransactionState.java     |    15 +-
 .../transactional/TransactionState.java         |    16 +-
 .../transactional/TrxTransactionState.java.tmpl |    16 +-
 .../src/main/protobuf/SsccRegion.proto          |    59 +
 .../hbase-trx/src/main/protobuf/TrxRegion.proto |    54 +-
 core/sql/SqlCompilerDebugger/TDBTreeView.cpp    |    10 +-
 core/sql/bin/SqlciErrors.txt                    |     4 +
 core/sql/common/ComSmallDefs.h                  |     1 +
 core/sql/common/NumericType.cpp                 |     6 +
 core/sql/common/NumericType.h                   |     2 +
 core/sql/common/OperTypeEnum.h                  |     9 +
 core/sql/common/str.cpp                         |   310 +-
 core/sql/common/str.h                           |    10 +
 core/sql/executor/ExSequence.cpp                |    17 +-
 core/sql/executor/ExSequence.h                  |     4 +-
 core/sql/exp/ExpAtp.cpp                         |     1 -
 core/sql/exp/ExpPackDefs.cpp                    |    14 +
 core/sql/exp/ExpSequenceFunction.cpp            |    18 +-
 core/sql/exp/ExpSequenceFunction.h              |     2 +
 core/sql/exp/ExpSqlTupp.h                       |     3 +-
 core/sql/exp/exp_clause.cpp                     |    21 +
 core/sql/exp/exp_clause.h                       |    19 +-
 core/sql/exp/exp_conv.cpp                       |    13 +-
 core/sql/exp/exp_function.cpp                   |   366 +
 core/sql/exp/exp_function.h                     |    93 +
 core/sql/exp/exp_math_func.cpp                  |    12 +
 core/sql/generator/GenExplain.cpp               |     4 +-
 core/sql/generator/GenItemFunc.cpp              |    27 +
 core/sql/generator/GenRelScan.cpp               |     2 +
 core/sql/generator/GenRelSequence.cpp           |    54 +-
 core/sql/generator/GenSequenceFunction.cpp      |   102 +
 core/sql/langman/LmRoutineJavaObj.cpp           |     1 +
 core/sql/optimizer/BindItemExpr.cpp             |    22 +-
 core/sql/optimizer/BindRelExpr.cpp              |     5 +-
 core/sql/optimizer/BindWA.h                     |     5 +
 core/sql/optimizer/ItemExpr.cpp                 |    87 +
 core/sql/optimizer/ItemFunc.h                   |    88 +-
 core/sql/optimizer/NormItemExpr.cpp             |    32 +
 core/sql/optimizer/RelScan.h                    |     5 +
 core/sql/optimizer/RelSequence.cpp              |     8 +
 core/sql/optimizer/RelSequence.h                |     4 +
 core/sql/optimizer/SynthType.cpp                |   237 +
 core/sql/optimizer/ValueDesc.cpp                |    40 +
 core/sql/optimizer/ValueDesc.h                  |    16 +-
 core/sql/parser/ParKeyWords.cpp                 |     7 +
 core/sql/parser/sqlparser.y                     |   116 +-
 core/sql/regress/charsets/EXPECTED310           |     4 +-
 core/sql/regress/charsets/EXPECTED311           |     4 +-
 core/sql/regress/charsets/TEST310               |     4 +-
 core/sql/regress/charsets/TEST311               |     4 +-
 core/sql/regress/compGeneral/EXPECTED006.SB     |   508 +
 core/sql/regress/compGeneral/EXPECTED023        |    88 +-
 core/sql/regress/compGeneral/TEST006            |   157 +-
 core/sql/regress/compGeneral/TEST011            |     1 +
 core/sql/regress/compGeneral/TEST023            |    25 +-
 core/sql/regress/core/EXPECTED037.SB            |     7 +-
 core/sql/regress/executor/EXPECTED015.SB        |    16 +
 core/sql/regress/executor/TEST015               |     4 +
 core/sql/regress/seabase/EXPECTED003            |    42 +
 core/sql/regress/seabase/EXPECTED032            |    50 +-
 core/sql/regress/seabase/TEST003                |     3 +
 core/sql/regress/seabase/TEST032                |     8 +
 core/sql/regress/tools/sbdefs                   |     1 -
 core/sql/sqlcomp/CmpSeabaseDDL.h                |     1 +
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        |     8 +
 core/sql/sqlcomp/CmpSeabaseDDLschema.cpp        |    12 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp         |     2 +-
 core/sql/sqlcomp/DefaultConstants.h             |     2 -
 core/sql/sqlcomp/nadefaults.cpp                 |    20 +-
 .../java/org/trafodion/sql/HTableClient.java    |   107 +-
 core/sql/ustat/hs_cli.cpp                       |    43 +-
 core/sql/ustat/hs_const.h                       |     1 +
 core/sql/ustat/hs_globals.cpp                   |     2 +-
 .../src/asciidoc/_chapters/about.adoc           |     4 +-
 .../src/asciidoc/_chapters/sort_msgs.adoc       |   211 +-
 .../asciidoc/_chapters/update_stats_msgs.adoc   |   482 +
 docs/messages_guide/src/asciidoc/index.adoc     |     1 +
 docs/shared/revisions.txt                       |     1 +
 .../src/asciidoc/_chapters/about.adoc           |    15 +-
 .../src/asciidoc/_chapters/sql_statements.adoc  |     4 +
 .../src/asciidoc/_chapters/sql_utilities.adoc   |    86 +-
 91 files changed, 22089 insertions(+), 7192 deletions(-)
----------------------------------------------------------------------


Reply via email to