Merge branch 'master' of github.com:apache/incubator-trafodion into predicatePushdownV2
Project: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/commit/38573bff Tree: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/tree/38573bff Diff: http://git-wip-us.apache.org/repos/asf/incubator-trafodion/diff/38573bff Branch: refs/heads/master Commit: 38573bff44e90a4b6bb82d03af8d83631a6e38bb Parents: 8a6f220 24d6bdb Author: Eric Owhadi <[email protected]> Authored: Fri Jan 8 01:59:05 2016 +0000 Committer: Eric Owhadi <[email protected]> Committed: Fri Jan 8 01:59:05 2016 +0000 ---------------------------------------------------------------------- core/conn/jdbc_type2/native/SrvrCommon.cpp | 73 +-- core/sql/executor/hiveHook.cpp | 2 +- .../java/org/trafodion/jdbc_test/BatchTest.java | 582 +++++++++++++++++++ .../org/trafodion/jdbc_test/JdbcCommon.java | 224 +++++++ .../org/trafodion/phoenix/end2end/BaseTest.java | 5 - .../trafodion/phoenix/end2end/BatchTest.java | 250 -------- 6 files changed, 823 insertions(+), 313 deletions(-) ----------------------------------------------------------------------
