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 2016/03/02 07:36:47 UTC
[3/5] incubator-trafodion git commit: Merge branch 'master' into
col-privs
Merge branch 'master' into col-privs
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/b9161bfe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/b9161bfe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/b9161bfe
Branch: refs/heads/master
Commit: b9161bfe28e6931ee7d7763a14603c841b04f4a9
Parents: 392031a b2fe5fd
Author: Roberta Marton <ro...@apache.org>
Authored: Tue Mar 1 16:02:50 2016 +0000
Committer: Roberta Marton <ro...@apache.org>
Committed: Tue Mar 1 16:02:50 2016 +0000
----------------------------------------------------------------------
.gitattributes | 3 -
.gitignore | 3 +
.rat-excludes | 6 +-
LICENSE | 305 -
Makefile | 13 +-
NOTICE | 2 +-
README | 8 +-
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/sqf/.gitignore | 3 +
core/sqf/LocalSettingsTemplate.sh | 4 +-
core/sqf/Makefile | 12 +-
core/sqf/sqenvcom.sh | 5 +-
core/sqf/sql/scripts/sqgen | 12 +-
core/sql/SqlCompilerDebugger/mk.sh | 3 +
core/sql/cli/CliExpExchange.cpp | 2 +
core/sql/common/ComSmallDefs.h | 2 +
core/sql/executor/HBaseClient_JNI.cpp | 25 +-
core/sql/executor/HBaseClient_JNI.h | 3 +-
core/sql/exp/ExpHbaseInterface.cpp | 8 +-
core/sql/exp/ExpHbaseInterface.h | 12 +-
core/sql/exp/exp_datetime.cpp | 30 +-
core/sql/generator/Generator.cpp | 5 +
core/sql/nskgmake/SqlCompilerDebugger/Makefile | 15 +-
core/sql/optimizer/NAColumn.h | 43 +-
core/sql/optimizer/NATable.cpp | 7 +-
core/sql/optimizer/NodeMap.cpp | 15 +-
.../sql/parser/StmtDDLAlterTableAlterColumn.cpp | 20 +-
core/sql/parser/StmtDDLAlterTableAlterColumn.h | 17 +-
core/sql/parser/sqlparser.y | 6 +-
core/sql/parser/ulexer.h | 21 +
core/sql/regress/compGeneral/EXPECTED071 | 8 +-
core/sql/regress/core/EXPECTED056.SB | 52 +-
core/sql/regress/executor/EXPECTED013.SB | 38 +-
core/sql/regress/executor/EXPECTED022.LINUX | 9365 -----------------
core/sql/regress/executor/EXPECTED022.SB | 9467 ++++++++++++++++++
core/sql/regress/executor/TEST022 | 12 +
core/sql/regress/privs2/EXPECTED138 | 2 +-
core/sql/regress/seabase/EXPECTED011 | 101 +-
core/sql/regress/seabase/EXPECTED027 | 433 +-
core/sql/regress/seabase/TEST011 | 16 -
core/sql/regress/seabase/TEST027 | 58 +
core/sql/sqlci/Param.cpp | 8 +-
core/sql/sqlci/SqlCmd.cpp | 37 +-
core/sql/sqlcomp/CmpDescribe.cpp | 180 +-
core/sql/sqlcomp/CmpSeabaseDDL.h | 68 +-
core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 217 +-
core/sql/sqlcomp/CmpSeabaseDDLschema.cpp | 4 +-
core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 1507 ++-
core/sql/sqlcomp/DefaultConstants.h | 4 +
core/sql/sqlcomp/nadefaults.cpp | 10 +-
.../java/org/trafodion/sql/HBaseClient.java | 33 +-
core/sql/ustat/hs_update.cpp | 3 +-
dcs/.gitignore | 2 +
dcs/Makefile | 14 +-
dcs/bin/stop-dcs.sh | 2 +-
dcs/src/assembly/all.xml | 4 +-
.../dcs/master/listener/ConnectReply.java | 60 +-
.../src/asciidoc/_chapters/about.adoc | 3 +-
docs/client_install/src/asciidoc/index.adoc | 3 +-
docs/command_interface/pom.xml | 2 +
.../src/asciidoc/_chapters/about.adoc | 2 +
docs/command_interface/src/asciidoc/index.adoc | 5 +-
docs/messages_guide/pom.xml | 2 +
.../src/asciidoc/_chapters/about.adoc | 3 +-
docs/messages_guide/src/asciidoc/index.adoc | 5 +-
docs/odb_user/pom.xml | 2 +
docs/odb_user/src/asciidoc/_chapters/about.adoc | 3 +-
docs/odb_user/src/asciidoc/index.adoc | 5 +-
docs/provisioning_guide/pom.xml | 2 +
.../src/asciidoc/_chapters/about.adoc | 20 +-
.../src/asciidoc/_chapters/activate.adoc | 147 +
.../src/asciidoc/_chapters/enable_security.adoc | 491 +
.../src/asciidoc/_chapters/install_prepare.adoc | 39 -
.../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 | 256 +-
.../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 | 15 +-
docs/shared/trafodion-logo.jpg | Bin 0 -> 28850 bytes
docs/shared/trafodion-manuals.css | 2 +-
docs/sql_reference/pom.xml | 2 +
.../src/asciidoc/_chapters/about.adoc | 3 +-
docs/sql_reference/src/asciidoc/index.adoc | 5 +-
docs/src/site/markdown/documentation.md | 3 +
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.png | Bin 0 -> 7241 bytes
.../resources/images/logos/trafodion-logo.jpg | Bin 0 -> 18953 bytes
docs/src/site/site.xml | 117 +-
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 | 6 +-
licenses/Apache | 203 +
licenses/LICENSE-bsd3 | 14 -
licenses/LICENSE-bsd4 | 34 -
licenses/LICENSE-facebook | 14 -
licenses/LICENSE-jquery | 8 -
licenses/LICENSE-js | 21 -
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 +
.../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 | 24 +-
.../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 | 24 +-
.../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 +
180 files changed, 16677 insertions(+), 12013 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/b9161bfe/core/sql/sqlcomp/CmpSeabaseDDLtable.cpp
----------------------------------------------------------------------