Merge branch 'master' of git://git.apache.org/incubator-trafodion into
parallelScan
Conflicts:
core/sql/sqlcomp/DefaultConstants.h
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo
Commit:
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/a895b686
Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/a895b686
Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/a895b686
Branch: refs/heads/master
Commit: a895b686411557e55dad2bfae233bf0bcaaf2ba3
Parents: a7f9a62 7a13b83
Author: Eric Owhadi <[email protected]>
Authored: Mon Apr 11 17:40:49 2016 +0000
Committer: Eric Owhadi <[email protected]>
Committed: Mon Apr 11 17:40:49 2016 +0000
----------------------------------------------------------------------
core/sql/comexe/ComTdbHdfsScan.h | 5 +-
core/sql/executor/ExHdfsScan.cpp | 27 +-
core/sql/executor/ExHdfsScan.h | 99 +-
core/sql/generator/GenRelScan.cpp | 6 +-
core/sql/pom.xml.apache | 2 +-
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/sqlcomp/DefaultConstants.h | 5 +
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 +-
67 files changed, 4626 insertions(+), 4454 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a895b686/core/sql/generator/GenRelScan.cpp
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a895b686/core/sql/sqlcomp/DefaultConstants.h
----------------------------------------------------------------------
diff --cc core/sql/sqlcomp/DefaultConstants.h
index d284fc1,81c8854..e8cf41d
--- a/core/sql/sqlcomp/DefaultConstants.h
+++ b/core/sql/sqlcomp/DefaultConstants.h
@@@ -3808,10 -3808,10 +3808,15 @@@ enum DefaultConstant
// Currently syskey, _salt_, _division_.
TRAF_ALLOW_RESERVED_COLNAMES,
+ //if 0, regular scanner is used. From 0.x to 1.0, percentage of regions
that need to be scanned that will be done in parallel.
+ //if >= 2, set a fixed number of thread, real DOP. 2.0 2 thread, 3.0 3
thread etc.
+ HBASE_DOP_PARALLEL_SCANNER,
+
+ // bitmap to control various special behavior of HIVE_SCAN
+ // // 1 : DOS FORMAT conversion on
+ // // 2 : todo
+ HIVE_SCAN_SPECIAL_MODE,
++
// This enum constant must be the LAST one in the list; it's a count,
// not an Attribute (it's not IN DefaultDefaults; it's the SIZE of it)!
__NUM_DEFAULT_ATTRIBUTES
http://git-wip-us.apache.org/repos/asf/incubator-trafodion/blob/a895b686/core/sql/sqlcomp/nadefaults.cpp
----------------------------------------------------------------------
