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 2016/03/01 18:20:47 UTC

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

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


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

Branch: refs/heads/master
Commit: 4742258f885f11a33861e2f271ee76bbf8125129
Parents: 44865dc fa430a0
Author: Sean Broeder <sb...@edev03.esgyn.local>
Authored: Fri Feb 26 22:50:38 2016 +0000
Committer: Sean Broeder <sb...@edev03.esgyn.local>
Committed: Fri Feb 26 22:50:38 2016 +0000

----------------------------------------------------------------------
 .gitattributes                                  |    5 -
 .gitignore                                      |    3 +
 .rat-excludes                                   |    8 +-
 DISCLAIMER                                      |   12 +
 DISCLAIMER.txt                                  |   12 -
 LICENSE.txt                                     |  327 -
 Makefile                                        |   13 +-
 NOTICE                                          |    9 +
 NOTICE.txt                                      |    9 -
 RAT_README                                      |  192 +
 RAT_README.txt                                  |  192 -
 README                                          |   58 +
 README.txt                                      |   58 -
 core/bldenvchk.sh                               |    2 +-
 core/conn/Makefile                              |   12 +-
 core/conn/trafci/manualtests/README             |   50 +
 core/conn/trafci/manualtests/statcheck.sql      |   47 +
 .../src/org/trafodion/ci/DatabaseQuery.java     |    3 +-
 .../odbc/odbcclient/unixcli/makefile.lnx        |    2 +-
 .../odbc/odbcclient/unixcli/package/LICENSE     |    1 -
 .../odbc/odbcclient/unixcli/package/license.txt |   18 -
 .../odbc/odbcclient/unixcli/package/mklnxpkg.sh |    6 +-
 .../unixcli/package/trafodbclnx_install.sh      |   22 +-
 core/rest/.gitignore                            |    2 +
 core/rest/Makefile                              |   13 +-
 core/rest/src/assembly/all.xml                  |    8 +
 core/rest/src/main/asciidoc/_chapters/apis.adoc |   20 +
 .../java/org/trafodion/rest/ServerResource.java |  151 +-
 .../org/trafodion/rest/VersionResource.java     |   25 +-
 core/sqf/.gitignore                             |    3 +
 core/sqf/LocalSettingsTemplate.sh               |    4 +-
 core/sqf/Makefile                               |   18 +-
 core/sqf/export/lib/Parse/RecDescent.pm         | 6009 -----------
 core/sqf/monitor/linux/amqpmon.cxx              |  231 -
 core/sqf/monitor/linux/amqpmon.h                |   71 -
 core/sqf/sqenvcom.sh                            |   13 +-
 core/sqf/sql/scripts/dcscheck                   |   10 +-
 core/sqf/sql/scripts/dcsstart                   |    4 +-
 core/sqf/sql/scripts/genms                      |    2 +-
 core/sqf/sql/scripts/sqgen                      |   12 +-
 .../transactional/TransactionManager.java       |   50 +-
 core/sqf/src/seatrans/tm/hbasetmlib2/Makefile   |    4 +-
 core/sqf/src/tm/dtm.events.pb.cc                | 1185 ---
 core/sqf/src/tm/dtm.events.pb.h                 |  709 --
 core/sqf/src/tm/dtm.perf_stats.pb.cc            | 4081 --------
 core/sqf/src/tm/dtm.perf_stats.pb.h             | 2442 -----
 core/sql/SqlCompilerDebugger/mk.sh              |    3 +
 core/sql/bin/SqlciErrors.txt                    |    5 +-
 core/sql/cli/CliExpExchange.cpp                 |    2 +
 core/sql/common/DateTimeType.cpp                |   69 +-
 core/sql/common/DatetimeType.h                  |    8 +-
 core/sql/common/str.cpp                         |  152 +
 core/sql/common/str.h                           |    3 +
 core/sql/executor/ExExeUtilGet.cpp              |   32 +-
 core/sql/executor/ExSequence.cpp                |    2 +
 core/sql/executor/ExStats.cpp                   |   24 +-
 core/sql/executor/MdamPoint.cpp                 |  152 +-
 core/sql/executor/MdamPoint.h                   |    5 +-
 core/sql/exp/ExpAtp.cpp                         |   71 +
 core/sql/exp/ExpAtp.h                           |    9 +
 core/sql/exp/ExpCriDesc.cpp                     |   18 +
 core/sql/exp/ExpCriDesc.h                       |    3 +
 core/sql/exp/ExpSqlTupp.cpp                     |   12 +
 core/sql/exp/ExpSqlTupp.h                       |    4 +
 core/sql/exp/exp_clause_derived.h               |    8 +-
 core/sql/exp/exp_conv.cpp                       |   55 +-
 core/sql/exp/exp_datetime.cpp                   |  474 +-
 core/sql/exp/exp_datetime.h                     |   43 +-
 core/sql/exp/exp_function.cpp                   |   16 +-
 core/sql/exp/exp_tuple_desc.cpp                 |   22 +
 core/sql/exp/exp_tuple_desc.h                   |    3 +
 core/sql/nskgmake/SqlCompilerDebugger/Makefile  |   15 +-
 core/sql/optimizer/NodeMap.cpp                  |   15 +-
 core/sql/optimizer/RelExeUtil.cpp               |    7 +
 core/sql/parser/SqlParserAux.cpp                |   22 +-
 core/sql/parser/SqlParserAux.h                  |    1 +
 core/sql/parser/StmtDDLCreateRoutine.h          |    4 +
 core/sql/parser/StmtDDLDropRoutine.h            |    5 +
 core/sql/parser/sqlparser.y                     |   92 +-
 core/sql/parser/ulexer.h                        |   21 +
 core/sql/regress/core/EXPECTED116               |  301 +-
 core/sql/regress/core/EXPECTEDRTS               | 1227 +--
 core/sql/regress/core/FILTER116                 |   33 +
 core/sql/regress/core/TEST116                   |   55 +-
 core/sql/regress/executor/EXPECTED022.LINUX     | 8881 ----------------
 core/sql/regress/executor/EXPECTED022.SB        | 9467 ++++++++++++++++++
 core/sql/regress/executor/TEST022               |   50 +
 core/sql/regress/hive/EXPECTED009               |    6 +-
 core/sql/regress/privs1/EXPECTED132             |  263 +-
 core/sql/regress/privs1/EXPECTED133             |   12 +-
 core/sql/regress/privs1/EXPECTED141             |  Bin 92809 -> 113222 bytes
 core/sql/regress/privs1/TEST132                 |   60 +-
 core/sql/regress/privs2/EXPECTED138             |   84 +-
 core/sql/regress/privs2/EXPECTED140             |  324 +-
 core/sql/regress/privs2/TEST140                 |    2 +-
 core/sql/regress/seabase/EXPECTED002            |  146 +-
 core/sql/regress/seabase/EXPECTED012            |   53 +-
 core/sql/regress/seabase/EXPECTED013            |   40 +-
 core/sql/regress/seabase/EXPECTED026            |   34 +-
 core/sql/regress/seabase/FILTER002              |    1 +
 core/sql/regress/seabase/TEST012                |   18 +
 core/sql/regress/seabase/TEST013                |   20 +-
 core/sql/regress/tools/runregr_core.ksh         |    6 +-
 core/sql/regress/tools/runregr_privs1.ksh       |    2 +-
 core/sql/sqlci/Param.cpp                        |    8 +-
 core/sql/sqlci/SqlCmd.cpp                       |   37 +-
 core/sql/sqlcomp/CmpDDLCatErrorCodes.h          |    4 +-
 core/sql/sqlcomp/CmpSeabaseDDL.h                |    9 +
 core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp       |   33 +-
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        |   16 +-
 core/sql/sqlcomp/CmpSeabaseDDLindex.cpp         |    6 +-
 core/sql/sqlcomp/CmpSeabaseDDLmd.h              |   11 +
 core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp       |   10 +-
 core/sql/sqlcomp/CmpSeabaseDDLschema.cpp        |  521 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp         |    3 +
 core/sql/sqlcomp/DefaultConstants.h             |    5 +
 core/sql/sqlcomp/PrivMgrMD.cpp                  |   14 +-
 core/sql/sqlcomp/QCache.cpp                     |   30 +-
 core/sql/sqlcomp/nadefaults.cpp                 |    5 +-
 core/sql/sqlmxevents/logmxevent_sq.cpp          |    2 +-
 core/sql/ustat/hs_cli.cpp                       |  118 +-
 core/sql/ustat/hs_const.h                       |    1 +
 core/sql/ustat/hs_update.cpp                    |   12 +-
 dcs/.gitignore                                  |    2 +
 dcs/Makefile                                    |   14 +-
 dcs/bin/stop-dcs.sh                             |    5 +-
 dcs/src/assembly/all.xml                        |    4 +-
 .../dcs/master/listener/ConnectReply.java       |   60 +-
 .../org/trafodion/dcs/server/ServerManager.java |   15 +-
 docs/client_install/pom.xml                     |   10 +-
 .../src/asciidoc/_chapters/about.adoc           |    5 +-
 docs/client_install/src/asciidoc/index.adoc     |    5 +-
 docs/command_interface/pom.xml                  |   13 +-
 .../src/asciidoc/_chapters/about.adoc           |    2 +
 docs/command_interface/src/asciidoc/index.adoc  |    5 +-
 docs/install_guide/pom.xml                      |  226 -
 .../src/asciidoc/_chapters/about.adoc           |  131 -
 .../src/asciidoc/_chapters/requirements.adoc    |   96 -
 docs/install_guide/src/asciidoc/index.adoc      |   64 -
 docs/messages_guide/pom.xml                     |   23 +-
 .../src/asciidoc/_chapters/about.adoc           |    3 +-
 docs/messages_guide/src/asciidoc/index.adoc     |    5 +-
 docs/odb_user/pom.xml                           |   12 +-
 docs/odb_user/src/asciidoc/_chapters/about.adoc |    3 +-
 docs/odb_user/src/asciidoc/index.adoc           |    5 +-
 docs/provisioning_guide/pom.xml                 |  289 +
 .../src/asciidoc/_chapters/about.adoc           |  197 +
 .../src/asciidoc/_chapters/activate.adoc        |  147 +
 .../src/asciidoc/_chapters/enable_security.adoc |  491 +
 .../src/asciidoc/_chapters/introduction.adoc    |  466 +
 .../src/asciidoc/_chapters/prepare.adoc         |  356 +
 .../src/asciidoc/_chapters/recipe_install.adoc  |   29 +
 .../src/asciidoc/_chapters/recipe_upgrade.adoc  |   30 +
 .../src/asciidoc/_chapters/requirements.adoc    |  510 +
 .../src/asciidoc/_chapters/script_install.adoc  |  511 +
 .../src/asciidoc/_chapters/script_remove.adoc   |  118 +
 .../src/asciidoc/_chapters/script_upgrade.adoc  |  442 +
 docs/provisioning_guide/src/asciidoc/index.adoc |   74 +
 docs/shared/trafodion-logo.jpg                  |  Bin 0 -> 28850 bytes
 docs/shared/trafodion-manuals.css               |    2 +-
 docs/sql_reference/pom.xml                      |   14 +-
 .../src/asciidoc/_chapters/about.adoc           |    3 +-
 docs/sql_reference/src/asciidoc/index.adoc      |    5 +-
 docs/src/site/markdown/documentation.md         |   21 +-
 docs/src/site/markdown/download.md              |  156 +-
 .../site/markdown/enable-secure-trafodion.md    |  210 +-
 docs/src/site/markdown/index.md                 |    2 +-
 docs/src/site/markdown/install-preparation.md   |  138 -
 docs/src/site/markdown/install-troubleshoot.md  |   21 -
 docs/src/site/markdown/install.md               |  202 -
 docs/src/site/markdown/ldapcheck.md             |   28 +-
 docs/src/site/markdown/ldapconfigcheck.md       |   36 +-
 docs/src/site/markdown/port-assignment.md       |  134 -
 docs/src/site/markdown/quickstart.md            |   95 +-
 docs/src/site/markdown/uninstall.md             |  176 -
 .../site/resources/images/logos/egg-logo.gif    |  Bin 3296 -> 0 bytes
 .../site/resources/images/logos/egg-logo.png    |  Bin 0 -> 7241 bytes
 .../resources/images/logos/trafodion-logo.jpg   |  Bin 0 -> 18953 bytes
 docs/src/site/site.xml                          |  126 +-
 install/.gitignore                              |    2 +
 install/Makefile                                |   11 +-
 install/installer/traf_add_sudoAccess           |   42 +-
 install/installer/traf_cloudera_mods98          |   15 +
 install/installer/traf_config_check             |   16 +-
 install/installer/traf_config_setup             |   12 +
 install/installer/traf_hortonworks_mods98       |   13 +
 install/installer/traf_sqgen                    |    2 +-
 install/installer/trafodion_install             |    4 +-
 install/traf_tools_setup.sh                     |  210 +-
 licenses/Apache                                 |  203 +
 licenses/LICENSE-bsd2                           |   14 -
 licenses/LICENSE-bsd4                           |   31 -
 licenses/LICENSE-facebook                       |   14 -
 licenses/LICENSE-js                             |   18 -
 licenses/LICENSE-salesforce                     |   23 -
 licenses/Makefile                               |   46 +
 licenses/lic-clients-bin                        |  177 +
 licenses/lic-components-src                     |    9 +
 licenses/lic-dcs-bin                            |    9 +
 licenses/lic-dcs-src                            |   69 +
 licenses/lic-rest-bin                           |    9 +
 licenses/lic-server-bin                         |  120 +
 licenses/lic-server-src                         |   76 +
 licenses/lic-test-src                           |   43 +
 pom.xml                                         |   46 +-
 .../phoenix/end2end/AlterTableTest.java         |   22 +
 .../phoenix/end2end/ArithmeticQueryTest.java    |   22 +
 .../phoenix/end2end/AutoCommitTest.java         |   22 +
 .../org/trafodion/phoenix/end2end/BaseTest.java |   22 +
 .../phoenix/end2end/BinaryRowKeyTest.java       |   22 +
 .../phoenix/end2end/CoalesceFunctionTest.java   |   22 +
 .../end2end/CompareDecimalToLongTest.java       |   22 +
 .../phoenix/end2end/CreateTableTest.java        |   22 +
 .../phoenix/end2end/CustomEntityDataTest.java   |   22 +
 .../phoenix/end2end/DeleteRangeTest.java        |   22 +
 .../end2end/DescColumnSortOrderTest.java        |   22 +
 .../phoenix/end2end/DistinctCountTest.java      |   22 +
 .../phoenix/end2end/ExecuteStatementsTest.java  |   22 +
 .../phoenix/end2end/ExtendedQueryExecTest.java  |   22 +
 .../phoenix/end2end/FunkyNamesTest.java         |   22 +
 .../phoenix/end2end/GroupByCaseTest.java        |   22 +
 .../trafodion/phoenix/end2end/IndexTest.java    |   22 +
 .../trafodion/phoenix/end2end/IsNullTest.java   |   22 +
 .../trafodion/phoenix/end2end/KeyOnlyTest.java  |   22 +
 .../phoenix/end2end/MultiCfQueryExecTest.java   |   22 +
 .../trafodion/phoenix/end2end/OrderByTest.java  |   22 +
 .../phoenix/end2end/ProductMetricsTest.java     |   22 +
 .../phoenix/end2end/QueryExecTest.java          |   22 +
 .../end2end/QueryExecWithoutSCNTest.java        |   22 +
 .../phoenix/end2end/QueryPlanTest.java          |   22 +
 .../phoenix/end2end/ReadIsolationLevelTest.java |   22 +
 .../phoenix/end2end/SaltedTableTest.java        |   22 +
 .../end2end/SaltedTableUpsertSelectTest.java    |   22 +
 .../end2end/SaltedTableVarLengthRowKeyTest.java |   22 +
 .../phoenix/end2end/ServerExceptionTest.java    |   22 +
 .../phoenix/end2end/SkipScanQueryTest.java      |   22 +
 .../phoenix/end2end/StatementHintsTest.java     |   22 +
 .../trafodion/phoenix/end2end/StddevTest.java   |   22 +
 .../phoenix/end2end/ToCharFunctionTest.java     |   22 +
 .../phoenix/end2end/ToNumberFunctionTest.java   |   22 +
 .../org/trafodion/phoenix/end2end/TopNTest.java |   22 +
 .../phoenix/end2end/UpsertBigValuesTest.java    |   22 +
 .../end2end/UpsertSelectAutoCommitTest.java     |   22 +
 .../phoenix/end2end/UpsertSelectTest.java       |   22 +
 .../phoenix/end2end/UpsertValuesTest.java       |   22 +
 .../phoenix/end2end/VariableLengthPKTest.java   |   22 +
 246 files changed, 19030 insertions(+), 28278 deletions(-)
----------------------------------------------------------------------