Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-496
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/08cb0652 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/08cb0652 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/08cb0652 Branch: refs/heads/ignite-496 Commit: 08cb0652988090e2b739f5f5c6fdea8d0eee3d4c Parents: 6704ce1 d578683 Author: sboikov <semen.boi...@inria.fr> Authored: Mon Mar 23 21:21:10 2015 +0300 Committer: sboikov <semen.boi...@inria.fr> Committed: Mon Mar 23 21:21:10 2015 +0300 ---------------------------------------------------------------------- NOTICE.txt | 2 +- .../hibernate/CacheHibernatePersonStore.java | 6 +- .../store/jdbc/CacheJdbcPersonStore.java | 2 +- .../apache/ignite/cache/CacheTypeMetadata.java | 6 ++ .../ignite/cache/query/SqlFieldsQuery.java | 7 -- .../apache/ignite/cache/query/TextQuery.java | 14 +-- .../cache/store/CacheLoadOnlyStoreAdapter.java | 2 +- .../apache/ignite/cache/store/CacheStore.java | 2 +- .../ignite/cache/store/CacheStoreAdapter.java | 2 +- .../ignite/cache/store/CacheStoreSession.java | 2 +- .../store/jdbc/CacheAbstractJdbcStore.java | 2 +- .../cache/store/jdbc/CacheJdbcBlobStore.java | 2 +- .../cache/CacheStoreBalancingWrapper.java | 4 +- .../cache/GridCacheLoaderWriterStore.java | 2 +- .../processors/cache/GridCacheStoreManager.java | 95 +++++++------------- .../cache/GridCacheWriteBehindStore.java | 17 ++-- .../processors/cache/IgniteCacheProxy.java | 10 +-- .../cache/query/GridCacheQueriesImpl.java | 2 +- .../cache/query/GridCacheTwoStepQuery.java | 20 +++++ .../transactions/TransactionProxyImpl.java | 17 ---- .../query/GridQueryCacheObjectsIterator.java | 70 +++++++++++++++ .../processors/query/GridQueryIndexing.java | 20 ++--- .../processors/query/GridQueryProcessor.java | 64 +++++++------ .../ignite/internal/util/IgniteUtils.java | 16 ++++ .../internal/util/future/IgniteFutureImpl.java | 5 -- .../org/apache/ignite/lang/IgniteFuture.java | 31 +++++-- .../apache/ignite/transactions/Transaction.java | 29 ------ .../org/jdk8/backport/ConcurrentHashMap8.java | 32 +------ .../jdk8/backport/ConcurrentLinkedDeque8.java | 32 +------ .../jdk8/backport/ConcurrentLinkedHashMap.java | 32 +------ .../main/java/org/jdk8/backport/LongAdder.java | 32 +------ .../main/java/org/jdk8/backport/Striped64.java | 27 +----- .../org/jdk8/backport/ThreadLocalRandom8.java | 32 +------ .../store/GridCacheBalancingStoreSelfTest.java | 2 +- .../cache/store/GridGeneratingTestStore.java | 2 +- .../IgniteCacheExpiryStoreLoadSelfTest.java | 2 +- .../GridCacheAbstractLocalStoreSelfTest.java | 2 +- ...idCacheConfigurationConsistencySelfTest.java | 2 +- .../cache/GridCacheGenericTestStore.java | 2 +- .../cache/GridCacheLifecycleAwareSelfTest.java | 2 +- .../cache/GridCacheStorePutxSelfTest.java | 2 +- .../processors/cache/GridCacheTestStore.java | 2 +- .../IgniteTxStoreExceptionAbstractSelfTest.java | 2 +- .../IgniteCrossCacheTxStoreSelfTest.java | 6 +- .../IgniteCacheStoreSessionAbstractTest.java | 21 +++-- ...acheStoreSessionWriteBehindAbstractTest.java | 2 +- .../IgniteCacheTxStoreSessionTest.java | 14 +-- .../cache/GridAbstractCacheStoreSelfTest.java | 34 +++---- .../hibernate/CacheHibernateBlobStore.java | 6 +- .../processors/query/h2/IgniteH2Indexing.java | 32 ++++--- .../h2/twostep/GridReduceQueryExecutor.java | 13 +-- .../processors/schedule/ScheduleFutureImpl.java | 11 --- 52 files changed, 339 insertions(+), 458 deletions(-) ----------------------------------------------------------------------
