Merge remote branch 'origin/master' into ddlxns2_br
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/6b45e177 Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/6b45e177 Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/6b45e177 Branch: refs/heads/master Commit: 6b45e1773d8be613431116c9b021e7dd03025b3d Parents: e1e727c 19b4f1f Author: Cloud User <[email protected]> Authored: Tue Apr 12 01:08:27 2016 +0000 Committer: Cloud User <[email protected]> Committed: Tue Apr 12 01:08:27 2016 +0000 ---------------------------------------------------------------------- core/sql/arkcmp/CmpContext.h | 1 + core/sql/bin/SqlciErrors.txt | 2 +- core/sql/cli/Statement.cpp | 5 +- core/sql/comexe/ComTdbHdfsScan.h | 5 +- core/sql/executor/ExHdfsScan.cpp | 27 +- core/sql/executor/ExHdfsScan.h | 99 +- core/sql/exp/exp_datetime.cpp | 3 +- core/sql/generator/GenExpGenerator.cpp | 47 +- core/sql/generator/GenPreCode.cpp | 96 +- core/sql/generator/GenRelScan.cpp | 6 +- core/sql/generator/GenRelUpdate.cpp | 24 - core/sql/optimizer/BindItemExpr.cpp | 22 +- core/sql/optimizer/NARoutine.cpp | 47 +- core/sql/optimizer/NARoutineDB.h | 4 +- core/sql/optimizer/NATable.cpp | 1 + core/sql/optimizer/RelExeUtil.cpp | 8 +- core/sql/optimizer/RelExeUtil.h | 2 + core/sql/optimizer/SynthType.cpp | 5 +- core/sql/pom.xml.apache | 2 +- core/sql/regress/core/EXPECTED116 | 102 +- core/sql/regress/core/TEST116 | 18 + core/sql/regress/hive/EXPECTED005 | 61 + core/sql/regress/hive/TEST005 | 17 + core/sql/regress/hive/TEST005_a.hive.sql | 18 + core/sql/regress/hive/tbl_dos.data | 10 + core/sql/regress/seabase/EXPECTED027 | 98 +- core/sql/regress/seabase/EXPECTED030 | 34 +- core/sql/regress/seabase/EXPECTED031 | 24 + core/sql/regress/seabase/TEST030 | 2 + core/sql/regress/seabase/TEST031 | 8 + core/sql/sqlcomp/CmpSeabaseDDLcleanup.cpp | 3 +- core/sql/sqlcomp/CmpSeabaseDDLcommon.cpp | 87 +- core/sql/sqlcomp/CmpSeabaseDDLroutine.cpp | 16 +- core/sql/sqlcomp/CmpSeabaseDDLtable.cpp | 24 +- core/sql/sqlcomp/DefaultConstants.h | 4 + core/sql/sqlcomp/nadefaults.cpp | 5 + docs/.gitignore | 2 - .../src/asciidoc/_chapters/introduction.adoc | 2 +- .../src/asciidoc/_chapters/odb.adoc | 6 +- .../src/asciidoc/_chapters/trickle_load.adoc | 2 +- docs/shared/license.txt | 11 + docs/spj_guide/pom.xml | 10 +- .../spj_guide/src/asciidoc/_chapters/about.adoc | 31 +- .../src/asciidoc/_chapters/create_spjs.adoc | 725 +++-- .../src/asciidoc/_chapters/deploy_spjs.adoc | 649 ++--- .../src/asciidoc/_chapters/develop_spjs.adoc | 171 +- .../src/asciidoc/_chapters/execute_spjs.adoc | 625 ++-- .../src/asciidoc/_chapters/get_started.adoc | 57 +- .../asciidoc/_chapters/grant_privileges.adoc | 254 +- .../src/asciidoc/_chapters/introduction.adoc | 57 +- .../_chapters/performance_troubleshooting.adoc | 461 +-- .../src/asciidoc/_chapters/sample_database.adoc | 826 +----- .../src/asciidoc/_chapters/sample_spjs.adoc | 2678 ++++++------------ docs/spj_guide/src/asciidoc/index.adoc | 61 +- .../src/images/call-statement-elements.jpg | Bin 0 -> 33415 bytes .../src/resources/acknowledgements.txt | 38 + .../src/resources/source/Inventory.java | 120 + .../spj_guide/src/resources/source/Payroll.java | 151 + docs/spj_guide/src/resources/source/Sales.java | 346 +++ .../src/resources/source/adjustSalary.java | 41 + .../src/resources/source/employeeJob.java | 32 + .../resources/source/invent_partloc_table.sql | 56 + .../resources/source/invent_partsupp_table.sql | 128 + .../src/resources/source/invent_schema.sql | 2 + .../resources/source/invent_supplier_table.sql | 35 + .../src/resources/source/lowerPrice.java | 44 + .../src/resources/source/numDailyOrders.java | 29 + .../src/resources/source/numMonthlyOrders.java | 41 + .../src/resources/source/orderSummary.java | 76 + .../src/resources/source/partData.java | 103 + .../src/resources/source/partlocations.java | 42 + .../src/resources/source/persnl_dept_table.sql | 70 + .../resources/source/persnl_employee_table.sql | 99 + .../src/resources/source/persnl_job_table.sql | 20 + .../resources/source/persnl_project_table.sql | 45 + .../src/resources/source/persnl_schema.sql | 2 + .../src/resources/source/projectTeam.java | 25 + .../resources/source/sales_customer_table.sql | 30 + .../resources/source/sales_odetail_table.sql | 84 + .../src/resources/source/sales_orders_table.sql | 66 + .../src/resources/source/sales_parts_table.sql | 45 + .../src/resources/source/sales_schema.sql | 2 + .../src/resources/source/supplierinfo.java | 38 + .../src/resources/source/supplyquantities.java | 32 + .../src/resources/source/topSalesReps.java | 43 + .../src/resources/source/totalPrice.java | 47 + .../src/asciidoc/_chapters/sql_statements.adoc | 163 +- docs/src/site/markdown/documentation.md | 63 +- docs/src/site/markdown/index.md | 25 +- .../resources/images/logo-carousel/slide-1.png | Bin 0 -> 58887 bytes .../resources/images/logo-carousel/slide-2.png | Bin 0 -> 57783 bytes docs/src/site/site.xml | 14 +- pom.xml | 5 +- 93 files changed, 5102 insertions(+), 4665 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6b45e177/core/sql/bin/SqlciErrors.txt ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6b45e177/core/sql/cli/Statement.cpp ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/6b45e177/core/sql/sqlcomp/nadefaults.cpp ----------------------------------------------------------------------
