Merge remote-tracking branch 'origin/master' into TRAFODION-1905
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/d3d6b3da Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/d3d6b3da Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/d3d6b3da Branch: refs/heads/master Commit: d3d6b3daca00cb7adc843e6fe28d1998eaf37d15 Parents: 2dd96fd 7a13b83 Author: Gunnar Tapper <[email protected]> Authored: Mon Apr 11 13:44:29 2016 -0600 Committer: Gunnar Tapper <[email protected]> Committed: Mon Apr 11 13:44:29 2016 -0600 ---------------------------------------------------------------------- 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 | 4 ++ core/sql/sqlcomp/nadefaults.cpp | 5 ++ 11 files changed, 218 insertions(+), 36 deletions(-) ----------------------------------------------------------------------
