Merge branch '4.x-HBase-1.3' into omid2
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/2d8df433 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/2d8df433 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/2d8df433 Branch: refs/heads/omid2 Commit: 2d8df4332ef2f72a4c344a9dca71df927b546e02 Parents: 7b5a49a c2afbcf Author: James Taylor <[email protected]> Authored: Tue Oct 2 08:31:06 2018 -0700 Committer: James Taylor <[email protected]> Committed: Tue Oct 2 08:31:06 2018 -0700 ---------------------------------------------------------------------- .../org/apache/phoenix/end2end/SplitIT.java | 260 +++++++++++++++++++ .../end2end/UpsertSelectAutoCommitIT.java | 22 +- .../java/org/apache/phoenix/end2end/ViewIT.java | 21 +- .../phoenix/end2end/index/LocalIndexIT.java | 22 ++ .../phoenix/schema/stats/StatsCollectorIT.java | 73 ++++-- .../apache/phoenix/compile/UpsertCompiler.java | 17 ++ .../phoenix/coprocessor/ScanRegionObserver.java | 9 +- .../phoenix/iterate/RegionScannerFactory.java | 19 +- .../phoenix/iterate/TableResultIterator.java | 50 ++-- .../apache/phoenix/schema/MetaDataClient.java | 42 +-- .../tuple/EncodedColumnQualiferCellsList.java | 25 +- .../java/org/apache/phoenix/util/ScanUtil.java | 8 + .../phoenix/util/csv/CsvUpsertExecutor.java | 20 +- .../phoenix/util/json/JsonUpsertExecutor.java | 3 + .../java/org/apache/phoenix/query/BaseTest.java | 73 +++--- .../util/AbstractUpsertExecutorTest.java | 51 +++- 16 files changed, 512 insertions(+), 203 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/2d8df433/phoenix-core/src/it/java/org/apache/phoenix/end2end/ViewIT.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/2d8df433/phoenix-core/src/it/java/org/apache/phoenix/schema/stats/StatsCollectorIT.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/2d8df433/phoenix-core/src/main/java/org/apache/phoenix/iterate/TableResultIterator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/2d8df433/phoenix-core/src/main/java/org/apache/phoenix/schema/MetaDataClient.java ----------------------------------------------------------------------
