Merge branch 'master' of git://git.apache.org/incubator-trafodion into 
TRAFODION-1829


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

Branch: refs/heads/master
Commit: 39f0fba8cea9004a144c82f5d2ee316b6e9601c7
Parents: 66b4edb 70b17ed
Author: venkat1m <[email protected]>
Authored: Thu Mar 31 17:46:24 2016 +0000
Committer: venkat1m <[email protected]>
Committed: Thu Mar 31 17:46:24 2016 +0000

----------------------------------------------------------------------
 .../java/org/trafodion/jdbc/t2/BaseRow.java     |   67 -
 .../java/org/trafodion/jdbc/t2/InsertRow.java   |   89 -
 .../main/java/org/trafodion/jdbc/t2/Row.java    |  275 --
 core/sqf/sql/scripts/ilh_cleanhb                |  106 +
 core/sqf/sql/scripts/ilh_hbase_repair           |   65 +
 core/sqf/sql/scripts/ilh_hbcheck                |   72 +
 core/sqf/sql/scripts/ilh_traf_restart           |  117 +
 core/sqf/sql/scripts/ilh_trafinit               |  108 +
 .../sql/scripts/install_hadoop_regr_test_env    |    4 +-
 core/sqf/sql/scripts/install_local_hadoop       |    5 +
 core/sqf/sql/scripts/trafnodestatus             |  105 +
 core/sqf/sql/scripts/trafnodestatus.awk         |   76 +
 core/sqf/src/seabed/src/fs.cpp                  |    3 +-
 core/sqf/tools/sqtools.sh                       |   56 +
 core/sql/bin/SqlciErrors.txt                    |    2 +-
 core/sql/comexe/ComTdbHbaseAccess.h             |   27 +-
 core/sql/executor/ExHbaseSelect.cpp             |   19 +-
 core/sql/executor/ex_control.cpp                |    6 +
 core/sql/generator/GenRelScan.cpp               |    2 +-
 core/sql/generator/Generator.cpp                |    8 +-
 core/sql/optimizer/NATable.cpp                  |    4 +-
 core/sql/parser/ElemDDLCol.cpp                  |  542 ++--
 core/sql/parser/ElemDDLColDef.h                 |   14 +-
 core/sql/parser/StmtDDLCreate.cpp               |    7 +-
 core/sql/parser/sqlparser.y                     |   17 +-
 core/sql/regress/core/EXPECTED131               |   89 +-
 core/sql/regress/core/EXPECTEDRTS               | 1436 ++++++-----
 core/sql/regress/core/FILTERRTS                 |    2 +
 core/sql/regress/core/TEST131                   |   40 +
 core/sql/regress/core/TESTRTS                   |   24 +-
 core/sql/regress/privs1/EXPECTED133             |  Bin 22984 -> 26383 bytes
 core/sql/regress/privs1/TEST133                 |   97 +-
 core/sql/regress/seabase/EXPECTED010            |    2 +-
 core/sql/regress/seabase/EXPECTED027            |  157 +-
 core/sql/regress/seabase/TEST010                |    2 +-
 core/sql/regress/seabase/TEST027                |   16 +
 core/sql/regress/tools/runregr_udr.ksh          |    2 +-
 core/sql/regress/udr/EXPECTED103                |  529 ++++
 core/sql/regress/udr/FILTER103                  |   25 +
 core/sql/regress/udr/TEST103                    |  246 ++
 core/sql/regress/udr/TEST103_functions.cpp      |  191 ++
 core/sql/regress/udr/TEST103_procs.java         |  224 ++
 core/sql/regress/udr/Utils.java                 |  279 ++
 core/sql/sqlcomp/CmpSeabaseDDL.h                |    1 +
 core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp        |   12 +-
 core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp       |   23 +-
 core/sql/sqlcomp/CmpSeabaseDDLschema.cpp        |  101 +-
 core/sql/sqlcomp/CmpSeabaseDDLtable.cpp         |    8 +-
 core/sql/sqlcomp/CmpSeabaseDDLview.cpp          |    1 -
 core/sql/sqlcomp/nadefaults.cpp                 |    2 +-
 core/sql/ustat/hs_globals.cpp                   |   24 +-
 .../src/asciidoc/_chapters/SQuirrel.adoc        |    8 +-
 .../src/asciidoc/_chapters/about.adoc           |   11 +-
 .../src/asciidoc/_chapters/dbviz.adoc           |   17 +-
 .../src/asciidoc/_chapters/introduction.adoc    |  130 +-
 .../src/asciidoc/_chapters/jdbct4.adoc          |  353 ++-
 .../src/asciidoc/_chapters/odb.adoc             |   49 +-
 .../src/asciidoc/_chapters/odbc_linux.adoc      |   82 +-
 .../src/asciidoc/_chapters/odbc_windows.adoc    |  176 +-
 .../src/asciidoc/_chapters/sample_prog.adoc     |    6 +-
 .../src/asciidoc/_chapters/trafci.adoc          |  323 ++-
 docs/client_install/src/asciidoc/index.adoc     |   11 +-
 .../src/images/win10_edit_path.jpg              |  Bin 0 -> 65094 bytes
 .../src/images/win10_select_java.jpg            |  Bin 0 -> 22758 bytes
 .../src/asciidoc/_chapters/about.adoc           |    4 +-
 .../src/asciidoc/_chapters/commands.adoc        |    8 +-
 .../src/asciidoc/_chapters/install.adoc         |   70 +-
 .../src/asciidoc/_chapters/interactive.adoc     |   56 +-
 .../src/asciidoc/_chapters/introduction.adoc    |   10 +-
 .../src/asciidoc/_chapters/launch.adoc          |  148 +-
 .../src/asciidoc/_chapters/perlpython.adoc      |   72 +-
 .../src/asciidoc/_chapters/scripts.adoc         |   24 +-
 docs/command_interface/src/asciidoc/index.adoc  |    4 +
 .../src/resources/source/sample.pl              |   19 +
 .../src/resources/source/sample.py              |   29 +
 docs/spj_guide/pom.xml                          |  289 +++
 .../spj_guide/src/asciidoc/_chapters/about.adoc |  200 ++
 .../src/asciidoc/_chapters/create_spjs.adoc     |  508 ++++
 .../src/asciidoc/_chapters/deploy_spjs.adoc     |  557 ++++
 .../src/asciidoc/_chapters/develop_spjs.adoc    |  899 +++++++
 .../src/asciidoc/_chapters/execute_spjs.adoc    |  730 ++++++
 .../src/asciidoc/_chapters/get_started.adoc     |  121 +
 .../asciidoc/_chapters/grant_privileges.adoc    |  312 +++
 .../src/asciidoc/_chapters/introduction.adoc    |  255 ++
 .../_chapters/performance_troubleshooting.adoc  |  416 +++
 .../src/asciidoc/_chapters/sample_database.adoc |  816 ++++++
 .../src/asciidoc/_chapters/sample_spjs.adoc     | 2386 ++++++++++++++++++
 docs/spj_guide/src/asciidoc/index.adoc          |  113 +
 docs/src/site/markdown/documentation.md         |    4 +
 docs/src/site/markdown/download.md              |    2 +-
 install/installer/rest_installer                |   11 +-
 install/installer/traf_cloudera_mods98          |   64 +-
 install/installer/traf_config_check             |    7 +-
 install/installer/traf_createPasswordLessSSH    |    6 +-
 install/installer/traf_getHadoopNodes           |  105 +-
 install/installer/traf_hortonworks_mods98       |  101 +-
 .../installer/trafodion_apache_hadoop_install   |   12 +-
 install/installer/trafodion_install             |   12 -
 install/installer/trafodion_uninstaller         |   10 +-
 pom.xml                                         |    4 +-
 100 files changed, 12471 insertions(+), 2408 deletions(-)
----------------------------------------------------------------------


Reply via email to