Merge branch 'master' of github.com:apache/incubator-trafodion into installbugfixes
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/246eb868 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/246eb868 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/246eb868 Branch: refs/heads/master Commit: 246eb8687f3955f8b6504b439eca0bcf7b274033 Parents: 1fb0141 125ae49 Author: Amanda Moran <[email protected]> Authored: Thu Jan 28 18:01:52 2016 +0000 Committer: Amanda Moran <[email protected]> Committed: Thu Jan 28 18:01:52 2016 +0000 ---------------------------------------------------------------------- core/rest/pom.xml | 63 ++- core/sql/comexe/ComTdbHbaseAccess.cpp | 16 +- core/sql/comexe/ComTdbHbaseAccess.h | 10 +- core/sql/executor/ExHbaseIUD.cpp | 2 + core/sql/executor/ExHbaseSelect.cpp | 4 + core/sql/executor/HBaseClient_JNI.cpp | 7 +- core/sql/executor/HBaseClient_JNI.h | 2 +- core/sql/exp/ExpHbaseInterface.cpp | 11 +- core/sql/exp/ExpHbaseInterface.h | 6 +- core/sql/generator/GenExplain.cpp | 5 + core/sql/generator/GenRelScan.cpp | 11 + core/sql/generator/Generator.cpp | 12 + core/sql/generator/Generator.h | 4 +- core/sql/regress/executor/DIFF013.KNOWN | 2 +- core/sql/regress/executor/EXPECTED013.SB | 29 +- core/sql/regress/executor/EXPECTED131 | 453 ++++++++++++++++ core/sql/regress/executor/EXPECTED140 | 48 +- core/sql/regress/executor/FILTER131 | 31 ++ core/sql/regress/executor/TEST131 | 96 ++++ core/sql/regress/fullstack2/EXPECTED062 | 41 +- core/sql/regress/fullstack2/EXPECTED062.RELEASE | 33 +- core/sql/regress/seabase/EXPECTED010 | 532 ++++++++++++------- core/sql/regress/seabase/EXPECTED011 | 20 +- core/sql/regress/seabase/EXPECTED016 | 35 +- core/sql/regress/tools/runregr_executor.ksh | 2 +- core/sql/regress/tools/sbdefs | 1 + core/sql/sqlcomp/DefaultConstants.h | 2 + core/sql/sqlcomp/nadefaults.cpp | 2 + .../java/org/trafodion/sql/HTableClient.java | 3 +- dcs/pom.xml | 74 ++- .../serverHandler/ServerApiSqlExecute.java | 1 + .../dcs/servermt/serverSql/TrafStatement.java | 1 + docs/.gitignore | 2 + docs/client_install/pom.xml | 10 +- docs/command_interface/pom.xml | 9 +- docs/install_guide/pom.xml | 7 + docs/odb_user/pom.xml | 9 +- docs/sql_reference/pom.xml | 9 +- docs/src/site/markdown/document.md | 86 +-- docs/src/site/markdown/website.md | 12 +- pom.xml | 12 + 41 files changed, 1313 insertions(+), 402 deletions(-) ----------------------------------------------------------------------
