phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jamestay...@apache.org
Subject [2/5] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-phoenix
Date Thu, 27 Feb 2014 02:39:05 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/incubator-phoenix


Project: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/commit/3f123685
Tree: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/tree/3f123685
Diff: http://git-wip-us.apache.org/repos/asf/incubator-phoenix/diff/3f123685

Branch: refs/heads/master
Commit: 3f123685c789351fbb6a662dcee6df92b6e9cec8
Parents: 35cc093 0e2b62e
Author: jamestaylor <jamestaylor@apache.org>
Authored: Fri Feb 21 12:13:10 2014 -0800
Committer: jamestaylor <jamestaylor@apache.org>
Committed: Fri Feb 21 12:13:10 2014 -0800

----------------------------------------------------------------------
 phoenix-assembly/src/build/client.xml           | 23 +++----
 .../src/build/components-minimal.xml            |  8 ++-
 .../apache/phoenix/compile/DeleteCompiler.java  |  2 +-
 .../MutatingParallelIteratorFactory.java        |  8 +--
 .../apache/phoenix/compile/QueryCompiler.java   |  4 ++
 .../apache/phoenix/compile/SequenceManager.java | 70 +++++++++++++-------
 .../apache/phoenix/compile/UpsertCompiler.java  | 20 +++---
 .../apache/phoenix/execute/AggregatePlan.java   |  9 ++-
 .../org/apache/phoenix/execute/ScanPlan.java    |  4 +-
 .../filter/MultiKeyValueComparisonFilter.java   |  5 +-
 .../phoenix/filter/RowKeyComparisonFilter.java  |  7 +-
 .../phoenix/iterate/ParallelIterators.java      |  4 +-
 .../phoenix/iterate/SequenceResultIterator.java |  3 +-
 .../phoenix/iterate/SpoolingResultIterator.java | 18 +++--
 .../apache/phoenix/join/HashCacheClient.java    |  3 +-
 .../org/apache/phoenix/join/ScanProjector.java  |  6 +-
 .../apache/phoenix/schema/tuple/BaseTuple.java  | 27 ++++++++
 .../phoenix/schema/tuple/DelegateTuple.java     | 64 ++++++++++++++++++
 .../schema/tuple/MultiKeyValueTuple.java        |  4 +-
 .../phoenix/schema/tuple/ResultTuple.java       |  3 +-
 .../schema/tuple/SingleKeyValueTuple.java       |  2 +-
 .../org/apache/phoenix/schema/tuple/Tuple.java  | 12 +++-
 .../java/org/apache/phoenix/util/TupleUtil.java |  3 +-
 .../ConnectionQueryServicesTestImpl.java        |  2 +-
 .../apache/phoenix/end2end/SequenceTest.java    | 26 ++++++--
 .../phoenix/end2end/UpsertSelectTest.java       | 43 ++++++++++++
 .../iterate/SpoolingResultIteratorTest.java     |  7 +-
 27 files changed, 289 insertions(+), 98 deletions(-)
----------------------------------------------------------------------



Mime
View raw message