IGNITE-389 - Merge branch ignite-sprint-5 into ignite-389
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/7ee51ba0 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/7ee51ba0 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/7ee51ba0 Branch: refs/heads/ignite-883-1 Commit: 7ee51ba05dc65148835e1491b91a23695c940d12 Parents: 2aa1ace 97d0bc1 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Wed Jun 3 15:18:44 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Wed Jun 3 15:18:44 2015 -0700 ---------------------------------------------------------------------- assembly/dependencies-visor-console.xml | 3 + .../hibernate/CacheHibernatePersonStore.java | 202 +--- .../hibernate/CacheHibernateStoreExample.java | 17 + .../store/jdbc/CacheJdbcPersonStore.java | 180 +-- .../store/jdbc/CacheJdbcStoreExample.java | 13 + .../store/spring/CacheSpringPersonStore.java | 128 +++ .../store/spring/CacheSpringStoreExample.java | 143 +++ .../datagrid/store/spring/package-info.java | 22 + .../ignite/cache/eviction/EvictableEntry.java | 7 + .../ignite/cache/eviction/EvictionPolicy.java | 2 + .../cache/eviction/fifo/FifoEvictionPolicy.java | 117 +- .../eviction/fifo/FifoEvictionPolicyMBean.java | 22 + .../cache/eviction/lru/LruEvictionPolicy.java | 135 ++- .../eviction/lru/LruEvictionPolicyMBean.java | 38 + .../eviction/random/RandomEvictionPolicy.java | 10 +- .../eviction/sorted/SortedEvictionPolicy.java | 141 ++- .../sorted/SortedEvictionPolicyMBean.java | 22 + .../apache/ignite/cache/query/QueryMetrics.java | 6 +- .../apache/ignite/cache/store/CacheStore.java | 2 + .../ignite/cache/store/CacheStoreSession.java | 22 + .../cache/store/CacheStoreSessionListener.java | 133 +++ .../jdbc/CacheJdbcStoreSessionListener.java | 141 +++ .../configuration/CacheConfiguration.java | 32 + .../configuration/IgniteConfiguration.java | 38 +- .../managers/communication/GridIoManager.java | 12 +- .../discovery/GridDiscoveryManager.java | 4 +- .../cache/CacheEvictableEntryImpl.java | 31 + .../processors/cache/CacheMetricsImpl.java | 4 +- .../processors/cache/GridCacheMapEntry.java | 64 +- .../processors/cache/GridCacheProcessor.java | 12 +- .../cache/GridCacheSharedContext.java | 47 +- .../processors/cache/GridCacheUtils.java | 54 + .../cache/distributed/dht/GridDhtGetFuture.java | 11 +- .../dht/atomic/GridDhtAtomicCache.java | 13 +- .../GridDhtPartitionsExchangeFuture.java | 46 +- .../dht/preloader/GridDhtPreloader.java | 9 +- .../local/atomic/GridLocalAtomicCache.java | 25 +- .../cache/query/GridCacheQueryAdapter.java | 12 +- .../cache/store/CacheOsStoreManager.java | 1 - .../cache/store/CacheStoreManager.java | 7 +- .../store/GridCacheStoreManagerAdapter.java | 202 +++- .../cache/transactions/IgniteTxAdapter.java | 33 +- .../transactions/IgniteTxLocalAdapter.java | 142 ++- .../processors/query/GridQueryProcessor.java | 311 ++++-- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- ...cheStoreSessionListenerAbstractSelfTest.java | 315 ++++++ ...heStoreSessionListenerLifecycleSelfTest.java | 395 +++++++ .../CacheJdbcStoreSessionListenerSelfTest.java | 175 +++ .../cache/GridCacheAbstractFullApiSelfTest.java | 27 + .../cache/GridCacheAbstractMetricsSelfTest.java | 48 +- .../GridCacheConcurrentTxMultiNodeTest.java | 8 +- ...idCacheConfigurationConsistencySelfTest.java | 14 +- .../cache/GridCacheMemoryModeSelfTest.java | 23 +- .../processors/cache/GridCacheOffHeapTest.java | 5 +- .../cache/GridCacheReloadSelfTest.java | 6 +- .../cache/IgniteCachePeekModesAbstractTest.java | 5 +- .../IgniteCrossCacheTxStoreSelfTest.java | 147 ++- ...GridCacheDhtEvictionNearReadersSelfTest.java | 11 +- .../dht/GridCacheDhtEvictionSelfTest.java | 11 +- .../dht/IgniteCacheMultiTxLockSelfTest.java | 6 +- .../GridCachePartitionedEvictionSelfTest.java | 11 +- .../GridCachePartitionedFullApiSelfTest.java | 32 + ...ePartitionedMultiThreadedPutGetSelfTest.java | 6 +- ...edOffHeapTieredMultiNodeFullApiSelfTest.java | 2 +- .../cache/eviction/EvictionAbstractTest.java | 1056 ++++++++++++++++++ .../GridCacheBatchEvictUnswapSelfTest.java | 5 +- ...heConcurrentEvictionConsistencySelfTest.java | 82 +- .../GridCacheConcurrentEvictionsSelfTest.java | 29 +- .../GridCacheDistributedEvictionsSelfTest.java | 5 +- .../GridCacheEmptyEntriesAbstractSelfTest.java | 11 +- .../eviction/GridCacheEvictionAbstractTest.java | 484 -------- .../GridCacheEvictionTouchSelfTest.java | 22 +- .../cache/eviction/GridCacheMockEntry.java | 5 + .../fifo/FifoEvictionPolicySelfTest.java | 262 +++++ ...ridCacheFifoBatchEvictionPolicySelfTest.java | 384 ------- .../GridCacheFifoEvictionPolicySelfTest.java | 372 ------ .../lru/GridCacheLruEvictionPolicySelfTest.java | 417 ------- .../GridCacheLruNearEvictionPolicySelfTest.java | 136 --- ...heNearOnlyLruNearEvictionPolicySelfTest.java | 168 --- .../eviction/lru/LruEvictionPolicySelfTest.java | 353 ++++++ .../lru/LruNearEvictionPolicySelfTest.java | 140 +++ .../LruNearOnlyNearEvictionPolicySelfTest.java | 172 +++ .../GridCacheRandomEvictionPolicySelfTest.java | 258 ----- .../RandomEvictionPolicyCacheSizeSelfTest.java | 6 + .../random/RandomEvictionPolicySelfTest.java | 357 ++++++ ...dCacheSortedBatchEvictionPolicySelfTest.java | 385 ------- ...acheSortedEvictionPolicyPerformanceTest.java | 135 --- .../GridCacheSortedEvictionPolicySelfTest.java | 373 ------- .../SortedEvictionPolicyPerformanceTest.java | 134 +++ .../sorted/SortedEvictionPolicySelfTest.java | 266 +++++ .../loadtests/GridCacheMultiNodeLoadTest.java | 5 +- .../GridCachePartitionedAtomicLongLoadTest.java | 6 +- .../loadtests/hashmap/GridCacheTestContext.java | 3 +- .../swap/GridSwapEvictAllBenchmark.java | 6 +- .../junits/cache/TestCacheSession.java | 18 + .../cache/TestThreadLocalCacheSession.java | 15 + .../junits/common/GridCommonAbstractTest.java | 24 + .../IgniteCacheEvictionSelfTestSuite.java | 14 +- .../testsuites/IgniteCacheTestSuite4.java | 3 + .../CacheHibernateStoreSessionListener.java | 216 ++++ ...heHibernateStoreSessionListenerSelfTest.java | 228 ++++ .../testsuites/IgniteHibernateTestSuite.java | 2 + .../GridCacheOffheapIndexEntryEvictTest.java | 200 ++++ .../cache/GridCacheOffheapIndexGetSelfTest.java | 18 +- .../cache/GridCacheQueryMetricsSelfTest.java | 84 +- .../cache/GridIndexingWithNoopSwapSelfTest.java | 6 +- ...QueryMultiThreadedOffHeapTieredSelfTest.java | 37 + ...eQueryMultiThreadedOffHeapTiredSelfTest.java | 37 - .../IgniteCacheQueryMultiThreadedSelfTest.java | 11 +- .../cache/ttl/CacheTtlAbstractSelfTest.java | 6 +- .../IgniteCacheQuerySelfTestSuite.java | 4 +- .../IgniteCacheWithIndexingTestSuite.java | 1 + modules/spring/pom.xml | 14 + .../spring/CacheSpringStoreSessionListener.java | 207 ++++ ...CacheSpringStoreSessionListenerSelfTest.java | 197 ++++ .../testsuites/IgniteSpringTestSuite.java | 3 + scripts/git-apply-patch.sh | 8 +- scripts/git-format-patch.sh | 6 +- scripts/git-patch-functions.sh | 36 +- 119 files changed, 7299 insertions(+), 3998 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ee51ba0/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ee51ba0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ee51ba0/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ee51ba0/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java index 31337ae,ed8e1e2..1be2a36 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java @@@ -675,37 -709,24 +709,27 @@@ public class GridQueryProcessor extend throw new IllegalStateException("Failed to execute query (grid is stopping)."); try { - String space = cctx.name(); - String sql = qry.getSql(); - Object[] args = qry.getArgs(); - - final GridQueryFieldsResult res = idx.queryFields(space, sql, F.asList(args), idx.backupFilter()); - - if (ctx.event().isRecordable(EVT_CACHE_QUERY_EXECUTED)) { - ctx.event().record(new CacheQueryExecutedEvent<>( - ctx.discovery().localNode(), - "SQL query executed.", - EVT_CACHE_QUERY_EXECUTED, - CacheQueryType.SQL.name(), - null, - null, - sql, - null, - null, - args, - null, - null)); - } + return executeQuery(cctx, new IgniteOutClosureX<QueryCursor<List<?>>>() { + @Override public QueryCursor<List<?>> applyx() throws IgniteCheckedException { + String space = cctx.name(); + String sql = qry.getSql(); + Object[] args = qry.getArgs(); - QueryCursorImpl<List<?>> cursor = new QueryCursorImpl<>(new Iterable<List<?>>() { - @Override public Iterator<List<?>> iterator() { - return new GridQueryCacheObjectsIterator(res.iterator(), cctx, cctx.keepPortable()); - } - }); - GridQueryFieldsResult res = idx.queryFields(space, sql, F.asList(args), idx.backupFilter()); ++ final GridQueryFieldsResult res = idx.queryFields(space, sql, F.asList(args), idx.backupFilter()); + + sendQueryExecutedEvent(sql, args); - cursor.fieldsMeta(res.metaData()); - QueryCursorImpl<List<?>> cursor = new QueryCursorImpl<>( - new GridQueryCacheObjectsIterator(res.iterator(), cctx, cctx.keepPortable())); ++ QueryCursorImpl<List<?>> cursor = new QueryCursorImpl<>(new Iterable<List<?>>() { ++ @Override public Iterator<List<?>> iterator() { ++ return new GridQueryCacheObjectsIterator(res.iterator(), cctx, cctx.keepPortable()); ++ } ++ }); - return cursor; + cursor.fieldsMeta(res.metaData()); + + return cursor; + } + }); } catch (IgniteCheckedException e) { throw new CacheException(e); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ee51ba0/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/7ee51ba0/modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java ----------------------------------------------------------------------
