Merge branch 'master' into priv-fixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/240cc688 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/240cc688 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/240cc688 Branch: refs/heads/master Commit: 240cc68846a078c4494c98dab4a3fe2185d9c570 Parents: 5af07d6 02c6c32 Author: Roberta Marton <[email protected]> Authored: Tue Jan 26 16:22:30 2016 +0000 Committer: Roberta Marton <[email protected]> Committed: Tue Jan 26 16:22:30 2016 +0000 ---------------------------------------------------------------------- .rat-excludes | 4 +- RAT_README.txt | 10 + .../transactional/TrxRegionEndpoint.java | 318 +- .../transactional/TrxRegionObserver.java | 72 +- core/sql/executor/ExHbaseAccess.cpp | 75 +- core/sql/executor/ExHbaseAccess.h | 2 - core/sql/executor/ExHbaseIUD.cpp | 28 +- core/sql/generator/GenExplain.cpp | 261 ++ core/sql/generator/GenPreCode.cpp | 481 ++- core/sql/generator/GenRelScan.cpp | 3 +- core/sql/optimizer/RelScan.h | 10 + core/sql/optimizer/ValueDesc.cpp | 32 +- core/sql/optimizer/ValueDesc.h | 5 + core/sql/regress/core/EXPECTEDRTS | 1390 ++++---- core/sql/regress/executor/EXPECTED140 | 911 +++++ core/sql/regress/executor/FILTER140 | 42 + core/sql/regress/executor/TEST140 | 96 + core/sql/regress/seabase/EXPECTED010 | 454 ++- core/sql/regress/seabase/EXPECTED011 | 22 +- core/sql/regress/seabase/EXPECTED016 | 161 +- core/sql/regress/tools/runregr_core.ksh | 2 +- core/sql/regress/tools/runregr_executor.ksh | 2 +- core/sql/regress/tools/sbdefs | 2 +- core/sql/sqlcomp/DefaultConstants.h | 2 +- core/sql/sqlcomp/nadefaults.cpp | 17 + .../java/org/trafodion/sql/HTableClient.java | 571 ++- docs/.gitignore | 1 - docs/client_install/pom.xml | 19 +- .../src/asciidoc/_chapters/about.adoc | 2 + .../src/asciidoc/_chapters/introduction.adoc | 6 +- docs/client_install/src/asciidoc/index.adoc | 2 - docs/command_interface/pom.xml | 19 +- .../src/asciidoc/_chapters/commands.adoc | 6 +- .../src/asciidoc/_chapters/interactive.adoc | 10 +- .../src/asciidoc/_chapters/scripts.adoc | 2 +- docs/css/trafodion-manuals.css | 431 --- docs/css/trafodion-theme.yml | 75 - docs/install_guide/pom.xml | 2 +- .../src/asciidoc/_chapters/about.adoc | 24 +- .../src/asciidoc/_chapters/dev_install.adoc | 26 - .../src/asciidoc/_chapters/howto.adoc | 26 - .../src/asciidoc/_chapters/product_install.adoc | 26 - .../src/asciidoc/_chapters/requirements.adoc | 70 + docs/install_guide/src/asciidoc/index.adoc | 5 - docs/messages_guide/pom.xml | 279 ++ .../src/asciidoc/_chapters/about.adoc | 180 + .../src/asciidoc/_chapters/binder_msgs.adoc | 2906 ++++++++++++++++ .../src/asciidoc/_chapters/compiler_msgs.adoc | 1549 +++++++++ .../src/asciidoc/_chapters/ddl_msgs.adoc | 3047 ++++++++++++++++ .../src/asciidoc/_chapters/executor_msgs.adoc | 935 +++++ .../asciidoc/_chapters/file_system_errors.adoc | 529 +++ .../src/asciidoc/_chapters/generator_msgs.adoc | 59 + .../src/asciidoc/_chapters/introduction.adoc | 116 + .../src/asciidoc/_chapters/optimizer_msgs.adoc | 118 + .../src/asciidoc/_chapters/parser_msgs.adoc | 3273 ++++++++++++++++++ .../src/asciidoc/_chapters/sort_msgs.adoc | 504 +++ .../src/asciidoc/_chapters/sqlstate.adoc | 2111 +++++++++++ .../_chapters/udr_language_mgr_msgs.adoc | 112 + docs/messages_guide/src/asciidoc/index.adoc | 73 + docs/odb_user/pom.xml | 19 +- docs/shared/google-analytics-postprocessor.rb | 43 + docs/shared/trafodion-manuals.css | 431 +++ docs/shared/trafodion-theme.yml | 76 + docs/sql_reference/pom.xml | 19 +- .../src/asciidoc/_chapters/about.adoc | 2 +- .../src/asciidoc/_chapters/sql_statements.adoc | 10 +- .../src/asciidoc/_chapters/sql_utilities.adoc | 2 +- .../src/site/markdown/create-dev-environment.md | 1 + docs/src/site/markdown/document.md | 1 + docs/src/site/markdown/download.md | 12 +- docs/src/site/markdown/index.md | 119 +- docs/src/site/markdown/passwordless-ssh.md | 4 +- docs/src/site/site.xml | 6 +- 73 files changed, 20373 insertions(+), 1888 deletions(-) ----------------------------------------------------------------------
