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/05/31 03:23:56 UTC
[2/4] incubator-trafodion git commit: Merge remote branch
'origin/master' into lob_inssel_work
Merge remote branch 'origin/master' into lob_inssel_work
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/14c02c18
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/14c02c18
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/14c02c18
Branch: refs/heads/master
Commit: 14c02c1832b18812dcf88a54819e510866771745
Parents: 9a1ccf0 514679f
Author: Sandhya Sundaresan <sa...@apache.org>
Authored: Tue May 23 20:00:07 2017 +0000
Committer: Sandhya Sundaresan <sa...@apache.org>
Committed: Tue May 23 20:00:07 2017 +0000
----------------------------------------------------------------------
NOTICE | 2 +-
core/conn/jdbcT4/pom.xml | 93 +
.../native/ResStatisticsStatement.cpp | 72 +-
.../jdbc_type2/native/ResStatisticsStatement.h | 9 +
.../odbc/nsksrvrcore/ResStatisticsStatement.cpp | 88 +-
.../odbc/nsksrvrcore/ResStatisticsStatement.h | 7 +
.../java/org/trafodion/ci/ConsoleReader.java | 148 +-
.../src/main/java/org/trafodion/ci/FCQuery.java | 12 +-
.../java/org/trafodion/ci/ParseArguments.java | 19 +-
.../java/org/trafodion/ci/QueryWrapper.java | 22 +-
.../src/main/java/org/trafodion/ci/Session.java | 2 +-
.../java/org/trafodion/ci/SessionInterface.java | 2 +-
.../java/org/trafodion/ci/UserInterface.java | 7 +-
core/conn/trafci/utils/trafci.cmd-tmpl | 14 +-
core/conn/trafci/utils/trafci.sh-tmpl | 42 +-
.../odbc/odbcclient/unixcli/cli/sqltocconv.cpp | 4 +
core/sqf/build-scripts/build.branch | 4 +-
.../run_full_trafodion_backup.sh | 2 +-
core/sqf/sqenvcom.sh | 32 +-
.../sql/scripts/install_hadoop_regr_test_env | 109 +-
core/sqf/sql/scripts/install_local_hadoop | 15 +-
core/sqf/src/seabed/src/ms.cpp | 2 +
core/sqf/src/seatrans/.gitignore | 1 +
.../NonPendingTransactionException.java | 47 +
.../hbase/client/transactional/RMInterface.java | 296 +-
.../hbase/client/transactional/TmDDL.java | 28 +-
.../hbase/client/transactional/TransState.java | 6 +-
.../transactional/TransactionManager.java | 355 +-
.../TransactionRegionLocation.java | 137 +-
.../client/transactional/TransactionState.java | 157 +-
.../TransactionalAggregationClient.java | 83 +-
.../TransactionalScanner.java.tmpl | 30 +-
.../transactional/TransactionalTable.java | 162 +-
.../transactional/SplitBalanceHelper.java | 3 +-
.../transactional/TrxRegionEndpoint.java.tmpl | 3439 +++++----
.../transactional/TrxRegionObserver.java.tmpl | 34 +-
.../generated/SsccRegionProtos.java | 42 +-
.../generated/TrxRegionProtos.java | 6849 ++++++++++--------
.../transactional/SsccTransactionState.java | 4 +-
.../transactional/TransactionState.java | 108 +-
.../TransactionalRegionScannerHolder.java | 63 -
.../TransactionalRegionScannerHolder.java.tmpl | 79 +
.../transactional/TrxTransactionState.java.tmpl | 337 +-
.../hbase-trx/src/main/protobuf/TrxRegion.proto | 175 +-
.../trafodion/dtm/HBaseAuditControlPoint.java | 431 +-
.../java/org/trafodion/dtm/HBaseTxClient.java | 344 +-
.../java/org/trafodion/dtm/TmAuditTlog.java | 1712 +++--
core/sql/arkcmp/CmpStatement.cpp | 2 +-
core/sql/bin/SqlciErrors.txt | 2 +-
core/sql/cli/CliExtern.cpp | 23 +-
core/sql/cli/sqlcli.h | 2 +
core/sql/comexe/ComTdbExeUtil.h | 1 +
core/sql/comexe/ComTdbHashGrby.h | 2 +
core/sql/common/ComMisc.cpp | 42 +
core/sql/common/ComMisc.h | 20 +
core/sql/common/ComObjectName.h | 18 +
core/sql/common/ComSmallDefs.h | 3 +
core/sql/common/OperTypeEnum.h | 2 +-
core/sql/executor/ExExeUtil.h | 8 +-
core/sql/executor/ExExeUtilGet.cpp | 34 +
core/sql/executor/ExExeUtilGetStats.cpp | 450 +-
core/sql/executor/ExStats.cpp | 311 +-
core/sql/executor/ExStats.h | 30 +-
core/sql/executor/ex_ddl.cpp | 9 +-
core/sql/executor/ex_hash_grby.cpp | 21 +-
core/sql/executor/ex_hash_grby.h | 11 +
core/sql/executor/ex_hashj.cpp | 26 +-
core/sql/executor/ex_hashj.h | 18 +-
core/sql/executor/ex_sort.cpp | 321 +-
core/sql/executor/ex_sort.h | 46 +-
core/sql/exp/exp_datetime.h | 6 +-
core/sql/generator/GenExplain.cpp | 5 +
core/sql/generator/GenPreCode.cpp | 1 -
core/sql/generator/GenRelExeUtil.cpp | 21 +-
core/sql/generator/GenRelScan.cpp | 17 +-
core/sql/optimizer/BindRelExpr.cpp | 65 +-
core/sql/optimizer/NATable.cpp | 24 +-
core/sql/optimizer/ObjectNames.cpp | 7 +-
core/sql/optimizer/ObjectNames.h | 6 +-
core/sql/optimizer/OptimizerSimulator.cpp | 2 +-
core/sql/optimizer/RelExeUtil.cpp | 16 +-
core/sql/optimizer/RelExeUtil.h | 7 +-
core/sql/optimizer/RelRoutine.cpp | 12 +
core/sql/parser/AllStmtDDL.h | 1 -
core/sql/parser/BindStmtDDL.cpp | 73 +-
core/sql/parser/ElemDDLNode.cpp | 10 +-
core/sql/parser/ElemDDLNode.h | 6 +-
core/sql/parser/ParKeyWords.cpp | 2 -
core/sql/parser/StmtDDLCleanupObjects.h | 1 +
core/sql/parser/StmtDDLGrant.h | 9 +
core/sql/parser/StmtDDLMisc.cpp | 1 +
core/sql/parser/StmtDDLNode.cpp | 198 +-
core/sql/parser/StmtDDLPublish.h | 269 -
core/sql/parser/StmtDDLRegOrUnregHive.cpp | 46 +-
core/sql/parser/StmtDDLRegOrUnregHive.h | 53 +-
core/sql/parser/StmtDDLRevoke.h | 9 +
core/sql/parser/sqlparser.y | 157 +-
core/sql/regress/core/EXPECTEDRTS | 1903 ++---
core/sql/regress/core/FILTERRTS | 18 +-
core/sql/regress/executor/EXPECTED130 | 220 +-
core/sql/regress/executor/EXPECTED140 | 63 +-
core/sql/regress/executor/TEST130 | 90 +-
core/sql/regress/hive/EXPECTED003 | 6 +-
core/sql/regress/hive/EXPECTED005 | 104 +-
core/sql/regress/hive/EXPECTED007 | 28 +-
core/sql/regress/hive/EXPECTED009 | 103 +-
core/sql/regress/hive/EXPECTED018 | 717 +-
core/sql/regress/hive/FILTER005 | 4 +-
core/sql/regress/hive/FILTER007 | 1 +
core/sql/regress/hive/FILTER009 | 1 +
core/sql/regress/hive/TEST003 | 52 +-
.../hive/TEST003_create_hive_tables.hive | 24 +-
core/sql/regress/hive/TEST005 | 48 +-
core/sql/regress/hive/TEST005_a.hive.sql | 16 +-
core/sql/regress/hive/TEST007 | 2 +-
core/sql/regress/hive/TEST009 | 26 +-
core/sql/regress/hive/TEST009_a.hive.sql | 4 +-
core/sql/regress/hive/TEST009_b.hive.sql | 2 +-
core/sql/regress/hive/TEST018 | 148 +-
.../hive/TEST018_create_hive_tables.hive | 14 +-
core/sql/regress/seabase/EXPECTED022 | 505 +-
core/sql/regress/seabase/EXPECTED024 | 6 +-
core/sql/regress/seabase/EXPECTED030 | 4 +-
core/sql/regress/seabase/EXPECTED031 | 23 +-
core/sql/regress/seabase/FILTER022 | 39 +
core/sql/regress/seabase/TEST022 | 94 +-
core/sql/regress/seabase/TEST024 | 2 -
core/sql/regress/seabase/TEST030 | 4 +-
core/sql/regress/udr/EXPECTED001 | 19 +-
core/sql/regress/udr/TEST001 | 7 +-
core/sql/sort/Qsort.cpp | 9 +-
core/sql/sort/Qsort.h | 3 +-
core/sql/sort/SortAlgo.cpp | 3 +-
core/sql/sort/SortAlgo.h | 3 +-
core/sql/sort/SortTopN.cpp | 9 +-
core/sql/sort/SortTopN.h | 3 +-
core/sql/sort/SortUtil.cpp | 106 +-
core/sql/sort/SortUtil.h | 6 +-
core/sql/sort/TourTree.cpp | 8 +-
core/sql/sort/TourTree.h | 1 +
core/sql/sqlci/sqlci_lex.ll | 2 -
core/sql/sqlci/sqlci_yacc.y | 4 -
core/sql/sqlcomp/CmpDescribe.cpp | 55 +-
core/sql/sqlcomp/CmpMain.cpp | 47 +-
core/sql/sqlcomp/CmpMain.h | 12 +-
core/sql/sqlcomp/CmpSeabaseDDL.h | 24 +-
core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp | 41 +
core/sql/sqlcomp/CmpSeabaseDDLcleanup.h | 5 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 84 +-
core/sql/sqlcomp/CmpSeabaseDDLmd.h | 4 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 381 +-
core/sql/sqlcomp/CmpSeabaseDDLview.cpp | 38 +-
core/sql/sqlcomp/PrivMgrComponentPrivileges.cpp | 9 +
core/sql/sqlcomp/nadefaults.cpp | 14 +-
.../java/org/trafodion/sql/HBaseClient.java | 3 +-
.../java/org/trafodion/sql/HTableClient.java | 47 +-
core/sql/ustat/hs_globals.cpp | 44 +-
core/sql/ustat/hs_la.cpp | 38 +-
.../src/asciidoc/_chapters/ambari_install.adoc | 51 +-
docs/provisioning_guide/src/images/amb1.PNG | Bin 0 -> 46318 bytes
docs/provisioning_guide/src/images/amb2.PNG | Bin 0 -> 12063 bytes
docs/provisioning_guide/src/images/amb3.PNG | Bin 0 -> 13764 bytes
docs/provisioning_guide/src/images/amb4.PNG | Bin 0 -> 44413 bytes
docs/provisioning_guide/src/images/amb5.PNG | Bin 0 -> 10552 bytes
.../src/asciidoc/_chapters/introduction.adoc | 21 +-
.../src/asciidoc/_chapters/olap_functions.adoc | 2 +-
.../sql_functions_and_expressions.adoc | 4 +-
.../src/asciidoc/_chapters/sql_statements.adoc | 2 +-
.../src/asciidoc/_chapters/sql_utilities.adoc | 333 +-
docs/src/site/markdown/documentation.md | 23 +-
docs/src/site/markdown/download.md | 48 +-
docs/src/site/markdown/index.md | 4 +-
docs/src/site/markdown/release-notes-2-1-0.md | 164 +
docs/src/site/markdown/release-notes.md | 1 +
install/ambari-installer/Makefile | 11 +-
.../2.1/configuration/traf-cluster-env.xml | 1 +
.../2.1/configuration/trafodion-env.xml | 4 +
.../TRAFODION/2.1/package/scripts/params.py | 2 +
.../2.1/package/scripts/trafodionmaster.py | 3 +-
install/python-installer/db_install.py | 11 +-
install/python-installer/scripts/traf_check.py | 5 +
win-odbc64/odbcclient/drvr35/sqltocconv.cpp | 6 +
182 files changed, 14187 insertions(+), 9864 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/14c02c18/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------