You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by vj...@apache.org on 2023/12/06 05:56:06 UTC
(phoenix) 01/01: Merge branch 'master' into PHOENIX-7001-feature

This is an automated email from the ASF dual-hosted git repository.

vjasani pushed a commit to branch PHOENIX-7001-feature
in repository https://gitbox.apache.org/repos/asf/phoenix.git

commit 21bf5a181840cb9f5689f636ac7eacd5423f8ced
Merge: 5d3fd4033d b241252307
Author: Viraj Jasani <vj...@apache.org>
AuthorDate: Tue Dec 5 21:55:52 2023 -0800

    Merge branch 'master' into PHOENIX-7001-feature

 .../end2end/BaseTenantSpecificViewIndexIT.java     |   8 +-
 .../phoenix/end2end/CostBasedDecisionIT.java       |  57 +++++++----
 .../java/org/apache/phoenix/end2end/DeleteIT.java  |   2 +-
 .../phoenix/end2end/FlappingLocalIndexIT.java      |  16 +--
 .../phoenix/end2end/IndexBuildTimestampIT.java     |   6 +-
 .../apache/phoenix/end2end/IndexExtendedIT.java    |   4 +-
 .../org/apache/phoenix/end2end/IndexToolIT.java    |   8 +-
 .../phoenix/end2end/LocalIndexSplitMergeIT.java    |  16 +--
 .../phoenix/end2end/TenantSpecificViewIndexIT.java |  13 +--
 .../phoenix/end2end/UserDefinedFunctionsIT.java    |   2 +-
 .../it/java/org/apache/phoenix/end2end/ViewIT.java |  10 +-
 .../apache/phoenix/end2end/index/BaseIndexIT.java  |  23 +++--
 .../end2end/index/GlobalIndexOptimizationIT.java   |   3 +-
 .../phoenix/end2end/index/IndexMaintenanceIT.java  |   8 +-
 .../apache/phoenix/end2end/index/IndexUsageIT.java |  26 ++---
 .../apache/phoenix/end2end/index/LocalIndexIT.java |  40 +++++---
 .../end2end/index/MutableIndexFailureIT.java       |   5 +-
 .../phoenix/end2end/index/MutableIndexIT.java      |  25 +++--
 .../apache/phoenix/end2end/index/ViewIndexIT.java  |   5 +-
 .../end2end/index/txn/TxWriteFailureIT.java        |   3 +-
 .../apache/phoenix/end2end/join/BaseJoinIT.java    |  10 ++
 .../phoenix/end2end/join/HashJoinLocalIndexIT.java | 111 ++++++++++++++-------
 .../end2end/join/SortMergeJoinLocalIndexIT.java    |  22 ++--
 .../apache/phoenix/end2end/join/SubqueryIT.java    |  40 +++++---
 .../end2end/join/SubqueryUsingSortMergeJoinIT.java |  30 ++++--
 .../org/apache/phoenix/iterate/ExplainTable.java   |  20 +++-
 .../phoenix/iterate/OffsetResultIterator.java      |   2 +-
 pom.xml                                            |  18 ++--
 28 files changed, 345 insertions(+), 188 deletions(-)