Merge branches 'ignite-484-1' and 'ignite-sprint-6' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-484-1
# Conflicts: # modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java # modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryManager.java # modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java # modules/core/src/test/java/org/apache/ignite/internal/processors/cache/query/GridCacheSwapScanQueryAbstractSelfTest.java # modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java # modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/GridReduceQueryExecutor.java # modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java # modules/indexing/src/test/java/org/apache/ignite/testsuites/IgniteCacheQuerySelfTestSuite.java # modules/scalar-2.10/pom.xml # modules/spark-2.10/pom.xml # modules/spark/pom.xml # modules/visor-console-2.10/pom.xml Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/0a5e97c2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/0a5e97c2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/0a5e97c2 Branch: refs/heads/ignite-sprint-7 Commit: 0a5e97c248b2c3aa401ce9062b9ebd9787a4db24 Parents: a7229dc b087aca Author: S.Vladykin <svlady...@gridgain.com> Authored: Fri Jun 12 10:36:11 2015 +0300 Committer: S.Vladykin <svlady...@gridgain.com> Committed: Fri Jun 12 10:36:11 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 15 + examples/config/example-cache.xml | 2 + examples/pom.xml | 2 +- modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- .../client/router/TcpSslRouterSelfTest.java | 5 + .../client/suite/IgniteClientTestSuite.java | 3 +- modules/cloud/pom.xml | 2 +- .../cloud/TcpDiscoveryCloudIpFinder.java | 25 +- .../TcpDiscoveryCloudIpFinderSelfTest.java | 3 +- modules/codegen/pom.xml | 2 +- modules/core/pom.xml | 2 +- .../apache/ignite/cache/query/ScanQuery.java | 20 + .../ignite/internal/GridPluginContext.java | 6 + .../apache/ignite/internal/IgniteKernal.java | 2 +- .../internal/MarshallerContextAdapter.java | 30 +- .../ignite/internal/MarshallerContextImpl.java | 10 +- .../internal/interop/InteropIgnition.java | 54 +- .../internal/interop/InteropProcessor.java | 8 + .../processors/cache/GridCacheMessage.java | 51 -- .../processors/cache/GridCacheProcessor.java | 27 +- .../processors/cache/KeyCacheObjectImpl.java | 11 +- .../cache/query/GridCacheQueryManager.java | 5 +- .../cacheobject/IgniteCacheObjectProcessor.java | 9 +- .../IgniteCacheObjectProcessorImpl.java | 12 +- .../continuous/GridContinuousProcessor.java | 15 +- .../datastreamer/DataStreamerCacheUpdaters.java | 2 +- .../datastreamer/DataStreamerImpl.java | 8 +- .../portable/GridPortableInputStream.java | 10 + .../processors/query/GridQueryProcessor.java | 2 +- .../ignite/internal/util/IgniteUtils.java | 3 + .../util/ipc/shmem/IpcSharedMemoryUtils.java | 4 +- .../internal/visor/VisorMultiNodeTask.java | 2 +- .../ignite/marshaller/MarshallerContext.java | 8 + .../org/apache/ignite/plugin/PluginContext.java | 6 + .../java/org/jsr166/ConcurrentHashMap8.java | 8 +- .../java/org/jsr166/ConcurrentLinkedDeque8.java | 586 ++++++------------- .../src/main/java/org/jsr166/LongAdder8.java | 35 +- .../core/src/main/java/org/jsr166/README.txt | 11 + .../src/main/java/org/jsr166/Striped64_8.java | 22 +- .../java/org/jsr166/ThreadLocalRandom8.java | 19 +- .../src/main/java/org/jsr166/package-info.java | 12 +- .../core/src/main/resources/ignite.properties | 2 +- modules/core/src/test/config/tests.properties | 2 +- .../ignite/GridSuppressedExceptionSelfTest.java | 4 +- .../internal/GridDiscoveryEventSelfTest.java | 6 +- ...ridFailFastNodeFailureDetectionSelfTest.java | 2 + .../GridFailoverTaskWithPredicateSelfTest.java | 3 - .../GridJobMasterLeaveAwareSelfTest.java | 2 - .../internal/GridJobStealingSelfTest.java | 3 - ...ectionLocalJobMultipleArgumentsSelfTest.java | 2 - .../GridTaskExecutionContextSelfTest.java | 9 - .../IgniteComputeEmptyClusterGroupTest.java | 3 - .../IgniteComputeTopologyExceptionTest.java | 9 - .../GridDiscoveryManagerAliveCacheSelfTest.java | 5 + .../cache/GridCacheAbstractSelfTest.java | 3 - .../cache/GridCacheAffinityRoutingSelfTest.java | 4 +- .../cache/GridCacheDeploymentSelfTest.java | 3 - .../cache/GridCacheEntryMemorySizeSelfTest.java | 91 +-- .../cache/GridCacheMemoryModeSelfTest.java | 2 - ...inodeUpdateNearEnabledNoBackupsSelfTest.java | 2 +- ...CacheMultinodeUpdateNearEnabledSelfTest.java | 2 +- .../processors/cache/GridCacheOffHeapTest.java | 28 +- .../cache/GridCachePutAllFailoverSelfTest.java | 5 + .../GridCacheReferenceCleanupSelfTest.java | 3 - .../processors/cache/GridCacheStopSelfTest.java | 5 + .../cache/GridCacheVersionMultinodeTest.java | 2 +- .../cache/IgniteCacheAbstractTest.java | 3 - .../IgniteCacheEntryListenerAbstractTest.java | 14 +- .../IgniteCacheInterceptorSelfTestSuite.java | 2 +- .../cache/IgniteCacheInvokeReadThroughTest.java | 5 + ...gniteCacheTransactionalStopBusySelfTest.java | 5 + ...teStartCacheInTransactionAtomicSelfTest.java | 32 + .../IgniteStartCacheInTransactionSelfTest.java | 254 ++++++++ .../IgniteTxMultiThreadedAbstractTest.java | 4 +- ...cheAtomicReferenceMultiNodeAbstractTest.java | 11 - ...GridCacheQueueMultiNodeAbstractSelfTest.java | 2 - ...dCacheQueueMultiNodeConsistencySelfTest.java | 5 + ...CacheQueueRotativeMultiNodeAbstractTest.java | 10 - .../GridCacheSetAbstractSelfTest.java | 9 - ...omicOffheapQueueCreateMultiNodeSelfTest.java | 5 + ...ionedAtomicQueueCreateMultiNodeSelfTest.java | 5 + ...rtitionedDataStructuresFailoverSelfTest.java | 5 + ...edOffheapDataStructuresFailoverSelfTest.java | 5 + ...PartitionedQueueCreateMultiNodeSelfTest.java | 5 + ...dCachePartitionedQueueEntryMoveSelfTest.java | 5 + ...nedQueueFailoverDataConsistencySelfTest.java | 5 + ...eplicatedDataStructuresFailoverSelfTest.java | 5 + ...CacheLoadingConcurrentGridStartSelfTest.java | 5 + .../GridCacheAbstractJobExecutionTest.java | 3 - .../GridCachePreloadLifecycleAbstractTest.java | 2 - ...heAbstractTransformWriteThroughSelfTest.java | 3 - .../dht/GridCacheColocatedFailoverSelfTest.java | 5 + .../GridCacheColocatedTxExceptionSelfTest.java | 5 + ...ePartitionedNearDisabledMetricsSelfTest.java | 4 +- ...dCachePartitionedTopologyChangeSelfTest.java | 5 + .../near/GridCacheNearEvictionSelfTest.java | 3 - .../near/GridCacheNearTxExceptionSelfTest.java | 5 + .../GridCachePartitionedFailoverSelfTest.java | 5 + ...PartitionedFullApiMultithreadedSelfTest.java | 5 + ...idCachePartitionedHitsAndMissesSelfTest.java | 3 - .../GridCachePartitionedNodeRestartTest.java | 5 + ...ePartitionedOptimisticTxNodeRestartTest.java | 5 + ...CachePartitionedTxMultiThreadedSelfTest.java | 5 + .../GridCacheReplicatedFailoverSelfTest.java | 5 + ...eReplicatedFullApiMultithreadedSelfTest.java | 5 + .../GridCacheReplicatedInvalidateSelfTest.java | 4 +- ...ridCacheReplicatedMultiNodeLockSelfTest.java | 5 + .../GridCacheReplicatedMultiNodeSelfTest.java | 5 + .../GridCacheReplicatedNodeRestartSelfTest.java | 5 + .../GridCacheReplicatedTxExceptionSelfTest.java | 5 + .../replicated/GridReplicatedTxPreloadTest.java | 2 + ...acheAtomicReplicatedNodeRestartSelfTest.java | 5 + .../GridCacheEvictionFilterSelfTest.java | 4 +- ...cheSynchronousEvictionsFailoverSelfTest.java | 5 + .../IgniteCacheExpiryPolicyAbstractTest.java | 10 +- ...eCacheExpiryPolicyWithStoreAbstractTest.java | 4 +- ...dCacheLocalFullApiMultithreadedSelfTest.java | 5 + .../GridCacheLocalTxExceptionSelfTest.java | 5 + .../GridCacheSwapScanQueryAbstractSelfTest.java | 3 - ...ridCacheContinuousQueryAbstractSelfTest.java | 2 - .../closure/GridClosureProcessorSelfTest.java | 29 +- .../continuous/GridEventConsumeSelfTest.java | 2 - .../DataStreamProcessorSelfTest.java | 44 +- .../processors/igfs/IgfsModesSelfTest.java | 4 +- .../internal/util/nio/GridNioSelfTest.java | 13 +- .../internal/util/nio/GridNioSslSelfTest.java | 2 + .../unsafe/GridUnsafeMemorySelfTest.java | 4 +- .../tostring/GridToStringBuilderSelfTest.java | 4 +- .../marshaller/MarshallerContextTestImpl.java | 11 +- .../ignite/messaging/GridMessagingSelfTest.java | 3 - .../GridP2PContinuousDeploymentSelfTest.java | 2 + .../p2p/GridP2PLocalDeploymentSelfTest.java | 6 +- .../p2p/GridP2PRemoteClassLoadersSelfTest.java | 31 +- .../spi/GridTcpSpiForwardingSelfTest.java | 3 - .../ignite/testframework/GridTestUtils.java | 14 + .../config/GridTestProperties.java | 14 +- .../junits/IgniteTestResources.java | 16 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 29 +- .../IgniteCacheDataStructuresSelfTestSuite.java | 24 +- .../IgniteCacheEvictionSelfTestSuite.java | 3 +- .../IgniteCacheFailoverTestSuite.java | 22 +- .../IgniteCacheFullApiSelfTestSuite.java | 8 +- ...niteCacheP2pUnmarshallingErrorTestSuite.java | 20 +- .../testsuites/IgniteCacheRestartTestSuite.java | 10 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 44 +- .../testsuites/IgniteCacheTestSuite2.java | 4 +- .../testsuites/IgniteCacheTestSuite3.java | 14 +- .../testsuites/IgniteCacheTestSuite4.java | 15 +- .../testsuites/IgniteKernalSelfTestSuite.java | 14 +- .../IgniteMarshallerSelfTestSuite.java | 28 +- .../testsuites/IgniteUtilSelfTestSuite.java | 18 +- .../apache/ignite/util/GridRandomSelfTest.java | 4 +- modules/extdata/p2p/pom.xml | 2 +- .../tests/p2p/P2PTestTaskExternalPath1.java | 10 +- .../tests/p2p/P2PTestTaskExternalPath2.java | 8 +- modules/extdata/uri/pom.xml | 2 +- modules/gce/pom.xml | 2 +- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- .../HadoopIgfs20FileSystemAbstractSelfTest.java | 4 +- .../IgniteHadoopFileSystemAbstractSelfTest.java | 2 +- .../processors/hadoop/HadoopMapReduceTest.java | 21 +- .../collections/HadoopHashMapSelfTest.java | 4 +- .../HadoopExternalTaskExecutionSelfTest.java | 2 + .../HadoopExternalCommunicationSelfTest.java | 5 + .../testsuites/IgniteHadoopTestSuite.java | 7 +- modules/hibernate/pom.xml | 2 +- .../hibernate/HibernateL2CacheSelfTest.java | 5 + .../HibernateL2CacheTransactionalSelfTest.java | 5 + .../testsuites/IgniteHibernateTestSuite.java | 4 +- modules/indexing/pom.xml | 18 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 10 +- .../cache/GridCacheOffHeapSelfTest.java | 1 - ...idCacheReduceQueryMultithreadedSelfTest.java | 10 - .../processors/cache/GridCacheSwapSelfTest.java | 3 - .../IgniteCacheAbstractFieldsQuerySelfTest.java | 13 +- .../cache/IgniteCacheAbstractQuerySelfTest.java | 2 - ...hePartitionedQueryMultiThreadedSelfTest.java | 40 +- .../IgniteCacheQueryMultiThreadedSelfTest.java | 1 - .../IgniteCacheQueryNodeRestartSelfTest.java | 5 + ...dCacheAbstractReduceFieldsQuerySelfTest.java | 1 - .../h2/GridIndexingSpiAbstractSelfTest.java | 4 +- .../query/h2/sql/BaseH2CompareQueryTest.java | 4 +- .../query/h2/sql/GridQueryParsingTest.java | 5 +- modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/mesos/README.txt | 2 +- modules/mesos/pom.xml | 2 +- .../apache/ignite/mesos/ClusterProperties.java | 15 + .../apache/ignite/mesos/IgniteScheduler.java | 10 +- modules/rest-http/pom.xml | 2 +- modules/scalar-2.10/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/pom.xml | 2 +- modules/spark-2.10/pom.xml | 2 +- modules/spark/pom.xml | 40 +- modules/spring/pom.xml | 2 +- modules/ssh/pom.xml | 2 +- modules/tools/pom.xml | 2 +- modules/urideploy/pom.xml | 2 +- modules/visor-console-2.10/pom.xml | 2 +- modules/visor-console/pom.xml | 2 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- .../IgniteWebSessionSelfTestSuite.java | 2 +- modules/yardstick/pom.xml | 2 +- pom.xml | 2 +- 212 files changed, 1554 insertions(+), 1032 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a5e97c2/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java index 11a8c84,e6b69bc..90000e8 --- a/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/query/ScanQuery.java @@@ -99,26 -99,23 +99,46 @@@ public final class ScanQuery<K, V> exte /** * Gets partition number over which this query should iterate. Will return {@code null} if partition was not * set. In this case query will iterate over all partitions in the cache. + * + * @return Partition number or {@code null}. + */ + @Nullable public Integer getPartition() { + return part; + } + + /** + * Sets partition number over which this query should iterate. If {@code null}, query will iterate over + * all partitions in the cache. Must be in the range [0, N) where N is partition number in the cache. + * + * @param part Partition number over which this query should iterate. + * @return {@code this} for chaining. + */ + public ScanQuery<K, V> setPartition(@Nullable Integer part) { + this.part = part; + + return this; + } + ++ /** ++ * Gets partition number over which this query should iterate. Will return {@code null} if partition was not ++ * set. In this case query will iterate over all partitions in the cache. + * + * @return Partition number or {@code null}. + */ + @Nullable public Integer getPartition() { + return part; + } + + /** + * Sets partition number over which this query should iterate. If {@code null}, query will iterate over + * all partitions in the cache. Must be in the range [0, N) where N is partition number in the cache. + * + * @param part Partition number over which this query should iterate. + */ + public void setPartition(@Nullable Integer part) { + this.part = part; + } + /** {@inheritDoc} */ @Override public ScanQuery<K, V> setPageSize(int pageSize) { return (ScanQuery<K, V>)super.setPageSize(pageSize); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a5e97c2/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/0a5e97c2/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a5e97c2/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java ---------------------------------------------------------------------- diff --cc modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java index ed9fc9a,c598e38..7fa038c --- a/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java +++ b/modules/core/src/test/java/org/apache/ignite/testsuites/IgniteCacheTestSuite4.java @@@ -140,6 -138,9 +138,11 @@@ public class IgniteCacheTestSuite4 exte suite.addTestSuite(IgniteCacheManyClientsTest.class); + suite.addTestSuite(IgniteStartCacheInTransactionSelfTest.class); + suite.addTestSuite(IgniteStartCacheInTransactionAtomicSelfTest.class); + ++ suite.addTestSuite(IgniteCacheManyClientsTest.class); ++ return suite; } } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a5e97c2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheCrossCacheQuerySelfTest.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/0a5e97c2/modules/indexing/src/test/java/org/apache/ignite/internal/processors/cache/distributed/near/IgniteCacheQueryNodeRestartSelfTest.java ----------------------------------------------------------------------
