Merge remote-tracking branch 'origin/ignite-sprint-5' into ignite-471
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/af92d1d7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/af92d1d7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/af92d1d7 Branch: refs/heads/ignite-471 Commit: af92d1d72fc7874c33e8fba7c41e4eed0523adce Parents: 88c7bf3 2361640 Author: Denis Magda <dma...@gridgain.com> Authored: Wed May 13 15:33:00 2015 +0300 Committer: Denis Magda <dma...@gridgain.com> Committed: Wed May 13 15:33:00 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 32 +- dev-tools/.gitignore | 2 + dev-tools/build.gradle | 45 + dev-tools/src/main/groovy/jiraslurp.groovy | 146 + examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 4 +- .../TcpDiscoveryCloudIpFinderSelfTest.java | 2 - modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../processors/cache/GridCacheAdapter.java | 26 +- .../cache/GridCacheEvictionManager.java | 2 +- .../processors/cache/GridCacheIoManager.java | 314 +- .../processors/cache/GridCacheMessage.java | 8 +- .../processors/cache/GridCacheProxyImpl.java | 24 - .../processors/cache/GridCacheSwapManager.java | 215 +- .../processors/cache/IgniteInternalCache.java | 27 - .../dht/atomic/GridDhtAtomicUpdateResponse.java | 8 + .../dht/atomic/GridNearAtomicUpdateFuture.java | 2 +- .../atomic/GridNearAtomicUpdateResponse.java | 18 +- .../colocated/GridDhtColocatedLockFuture.java | 2 + .../dht/preloader/GridDhtForceKeysFuture.java | 6 + .../dht/preloader/GridDhtForceKeysResponse.java | 54 +- .../distributed/near/GridNearCacheAdapter.java | 10 - .../distributed/near/GridNearGetResponse.java | 8 +- .../processors/cache/local/GridLocalCache.java | 8 +- .../local/atomic/GridLocalAtomicCache.java | 27 +- .../cache/query/GridCacheQueryManager.java | 21 +- .../transactions/IgniteTxLocalAdapter.java | 12 +- .../processors/igfs/IgfsDeleteWorker.java | 4 + .../offheap/GridOffHeapProcessor.java | 17 + .../util/lang/GridFilteredIterator.java | 2 +- .../ignite/internal/util/lang/GridFunc.java | 7218 +++++------------- .../util/offheap/GridOffHeapPartitionedMap.java | 9 + .../unsafe/GridUnsafePartitionedMap.java | 155 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 22 +- .../core/src/main/resources/ignite.properties | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 227 +- .../cache/GridCacheAbstractSelfTest.java | 4 +- .../cache/GridCacheSwapReloadSelfTest.java | 20 +- .../IgniteCacheP2pUnmarshallingErrorTest.java | 189 + ...gniteCacheP2pUnmarshallingNearErrorTest.java | 56 + ...CacheP2pUnmarshallingRebalanceErrorTest.java | 80 + .../IgniteCacheP2pUnmarshallingTxErrorTest.java | 109 + .../cache/IgniteCachePeekModesAbstractTest.java | 15 +- .../cache/OffHeapTieredTransactionSelfTest.java | 127 + ...CacheLoadingConcurrentGridStartSelfTest.java | 49 +- ...icOffHeapTieredMultiNodeFullApiSelfTest.java | 43 + ...ionedNearDisabledOffHeapFullApiSelfTest.java | 8 +- ...DisabledOffHeapMultiNodeFullApiSelfTest.java | 8 +- ...abledOffHeapTieredAtomicFullApiSelfTest.java | 56 + ...earDisabledOffHeapTieredFullApiSelfTest.java | 33 + ...edOffHeapTieredMultiNodeFullApiSelfTest.java | 33 + ...CacheAtomicOffHeapTieredFullApiSelfTest.java | 32 + ...icOffHeapTieredMultiNodeFullApiSelfTest.java | 33 + ...yWriteOrderOffHeapTieredFullApiSelfTest.java | 33 + ...erOffHeapTieredMultiNodeFullApiSelfTest.java | 33 + ...achePartitionedMultiNodeFullApiSelfTest.java | 15 +- ...dCachePartitionedOffHeapFullApiSelfTest.java | 8 +- ...titionedOffHeapMultiNodeFullApiSelfTest.java | 8 +- ...PartitionedOffHeapTieredFullApiSelfTest.java | 32 + ...edOffHeapTieredMultiNodeFullApiSelfTest.java | 72 + ...idCacheReplicatedOffHeapFullApiSelfTest.java | 8 +- ...plicatedOffHeapMultiNodeFullApiSelfTest.java | 8 +- ...eReplicatedOffHeapTieredFullApiSelfTest.java | 33 + ...edOffHeapTieredMultiNodeFullApiSelfTest.java | 33 + ...LocalAtomicOffHeapTieredFullApiSelfTest.java | 32 + .../GridCacheLocalOffHeapFullApiSelfTest.java | 6 +- ...dCacheLocalOffHeapTieredFullApiSelfTest.java | 32 + ...idFileSwapSpaceSpiMultithreadedLoadTest.java | 4 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 65 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 2 + .../IgniteCacheFullApiSelfTestSuite.java | 18 + ...gniteCacheP2pUnmarshallingErrorTestSuit.java | 41 + .../ignite/testsuites/IgniteCacheTestSuite.java | 293 - .../testsuites/IgniteCacheTestSuite2.java | 141 + .../testsuites/IgniteCacheTestSuite3.java | 140 + .../testsuites/IgniteCacheTestSuite4.java | 131 + modules/extdata/p2p/pom.xml | 2 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 4 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 11 +- .../cache/GridCacheOffHeapSelfTest.java | 11 +- ...niteCacheP2pUnmarshallingQueryErrorTest.java | 56 + ...eQueryMultiThreadedOffHeapTiredSelfTest.java | 37 + .../IgniteCacheQueryMultiThreadedSelfTest.java | 29 +- .../IgniteCacheQuerySelfTestSuite.java | 4 + modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- .../ignite/scalar/ScalarConversions.scala | 8 - modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- .../ignite/schema/generator/CodeGenerator.java | 6 +- modules/slf4j/pom.xml | 2 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 28 +- 112 files changed, 4735 insertions(+), 6277 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/af92d1d7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/af92d1d7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMessage.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/af92d1d7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java index 7338f34,eb82218..b366ca9 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java @@@ -1596,12 -1646,8 +1650,8 @@@ public class GridCacheSwapManager exten int part = cctx.affinity().partition(key); - offheap.removex(spaceName, part, key, key.valueBytes(cctx.cacheObjectContext())); + offheap.removex(spaceName, part, key, U.toArray(key.valueBytes(cctx.cacheObjectContext()))); } - - @Override protected void onClose() throws IgniteCheckedException { - it.close(); - } }; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/af92d1d7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridDhtAtomicUpdateResponse.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/af92d1d7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/atomic/GridNearAtomicUpdateResponse.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/af92d1d7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java index 030a4e6,73d877a..af4472d --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetResponse.java @@@ -65,10 -65,10 +65,10 @@@ public class GridNearGetResponse extend /** Error. */ @GridDirectTransient - private Throwable err; + private IgniteCheckedException err; /** Serialized error. */ - private byte[] errBytes; + private ByteBuffer errBytes; /** * Empty constructor required for {@link Externalizable}. http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/af92d1d7/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/af92d1d7/modules/core/src/main/java/org/apache/ignite/internal/processors/offheap/GridOffHeapProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/af92d1d7/modules/core/src/main/java/org/apache/ignite/spi/discovery/tcp/TcpDiscoverySpi.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/af92d1d7/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/af92d1d7/modules/indexing/pom.xml ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/af92d1d7/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapAndSwapSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/af92d1d7/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheOffHeapSelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/af92d1d7/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java ---------------------------------------------------------------------- diff --cc modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java index cce6865,54bc814..3c6ba03 --- a/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java +++ b/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/IgniteCacheQueryMultiThreadedSelfTest.java @@@ -84,7 -84,19 +84,18 @@@ public class IgniteCacheQueryMultiThrea cfg.setDiscoverySpi(disco); cfg.setSwapSpaceSpi(new FileSwapSpaceSpi()); - cfg.setMarshaller(new OptimizedMarshaller(false)); + cfg.setCacheConfiguration(cacheConfiguration()); + + GridQueryProcessor.idxCls = FakeIndexing.class; + + return cfg; + } + + /** + * @return Cache configuration. + */ + protected CacheConfiguration cacheConfiguration() { CacheConfiguration<?,?> cacheCfg = defaultCacheConfiguration(); cacheCfg.setCacheMode(PARTITIONED);
