Merge branches 'ignite-737' and 'ignite-sprint-4' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-737
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/5b9ffad8 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/5b9ffad8 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/5b9ffad8 Branch: refs/heads/ignite-286 Commit: 5b9ffad8f12960774935b1634b9477801e8cb802 Parents: 7d98979 ca6675f Author: AKuznetsov <akuznet...@gridgain.com> Authored: Fri Apr 17 15:51:59 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Fri Apr 17 15:51:59 2015 +0700 ---------------------------------------------------------------------- .../processors/cache/GridCacheAtomicFuture.java | 7 - .../dht/atomic/GridDhtAtomicCache.java | 51 +-- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 19 -- .../dht/atomic/GridNearAtomicUpdateFuture.java | 14 - .../internal/GridLifecycleBeanSelfTest.java | 36 +++ .../GridCacheAtomicTimeoutSelfTest.java | 314 ------------------- .../IgniteCacheAtomicMessageRecoveryTest.java | 32 ++ .../IgniteCacheMessageRecoveryAbstractTest.java | 175 +++++++++++ .../IgniteCacheTxMessageRecoveryTest.java | 32 ++ ...eAtomicInvalidPartitionHandlingSelfTest.java | 14 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 3 +- .../query/h2/sql/GridSqlFunction.java | 6 +- .../query/h2/sql/GridSqlPlaceholder.java | 51 +++ .../query/h2/sql/GridSqlQueryParser.java | 6 +- .../h2/sql/AbstractH2CompareQueryTest.java | 49 ++- .../query/h2/sql/GridQueryParsingTest.java | 9 + .../query/h2/sql/H2CompareBigQueryTest.java | 2 +- .../processors/query/h2/sql/bigQuery.sql | 2 +- 18 files changed, 394 insertions(+), 428 deletions(-) ----------------------------------------------------------------------
