phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maryann...@apache.org
Subject [2/2] phoenix git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/phoenix
Date Tue, 25 Nov 2014 23:04:06 GMT
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/phoenix


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

Branch: refs/heads/master
Commit: 88196ca9f850a45febec94f8ad5031e7ec4fd19c
Parents: 54b3ef9 e5033ae
Author: maryannxue <maryannxue@apache.org>
Authored: Tue Nov 25 17:57:49 2014 -0500
Committer: maryannxue <maryannxue@apache.org>
Committed: Tue Nov 25 17:57:49 2014 -0500

----------------------------------------------------------------------
 .../phoenix/end2end/SpooledTmpFileDeleteIT.java |  2 +-
 .../FailForUnsupportedHBaseVersionsIT.java      |  4 +-
 .../index/balancer/IndexLoadBalancerIT.java     |  4 +-
 .../EndToEndCoveredColumnsIndexBuilderIT.java   |  4 +-
 .../example/EndToEndCoveredIndexingIT.java      |  4 +-
 .../covered/example/FailWithoutRetriesIT.java   |  4 +-
 .../phoenix/mapreduce/CsvBulkLoadToolIT.java    |  4 +-
 .../phoenix/cache/aggcache/SpillFile.java       | 12 ++--
 .../phoenix/compile/CreateIndexCompiler.java    |  1 +
 .../phoenix/compile/CreateSequenceCompiler.java |  4 +-
 .../apache/phoenix/compile/UpsertCompiler.java  | 67 ++++++++++----------
 .../phoenix/coprocessor/BaseRegionScanner.java  |  1 +
 .../coprocessor/MetaDataRegionObserver.java     | 11 ++--
 .../coprocessor/SequenceRegionObserver.java     |  5 ++
 .../UngroupedAggregateRegionObserver.java       |  2 +
 .../phoenix/expression/ModulusExpression.java   |  4 ++
 .../expression/function/SubstrFunction.java     |  1 +
 .../phoenix/filter/ColumnProjectionFilter.java  |  1 +
 .../hbase/index/covered/data/LocalTable.java    |  2 +
 .../covered/example/CoveredColumnIndexer.java   |  3 +-
 .../index/table/CoprocessorHTableFactory.java   |  2 +
 .../phoenix/hbase/index/wal/KeyValueCodec.java  |  1 +
 .../index/write/KillServerOnFailurePolicy.java  |  5 +-
 .../apache/phoenix/index/PhoenixIndexCodec.java |  2 +
 .../apache/phoenix/schema/DelegateColumn.java   |  4 ++
 .../phoenix/trace/PhoenixMetricsSink.java       | 36 +++++------
 .../phoenix/pig/PhoenixHBaseLoaderIT.java       |  4 +-
 27 files changed, 117 insertions(+), 77 deletions(-)
----------------------------------------------------------------------



Mime
View raw message