Merge branches 'ignite-816' and 'ignite-sprint-5' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-816
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c8086c9b Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c8086c9b Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c8086c9b Branch: refs/heads/ignite-929 Commit: c8086c9b1341bbd898c892873c4b916b7a8e9a03 Parents: 882b6aa d2af9e2 Author: AKuznetsov <akuznet...@gridgain.com> Authored: Tue May 26 09:47:33 2015 +0700 Committer: AKuznetsov <akuznet...@gridgain.com> Committed: Tue May 26 09:47:33 2015 +0700 ---------------------------------------------------------------------- .gitignore | 3 +- DEVNOTES.txt | 34 +- LICENSE | 238 + LICENSE.txt | 238 - NOTICE | 12 + NOTICE.txt | 12 - assembly/release-base.xml | 10 +- assembly/release-schema-import.xml | 50 + bin/ignite-schema-import.bat | 2 +- bin/ignite-schema-import.sh | 2 +- bin/ignite.bat | 2 +- bin/ignite.sh | 2 +- bin/ignitevisorcmd.bat | 2 +- bin/ignitevisorcmd.sh | 2 +- bin/include/build-classpath.bat | 46 + bin/include/build-classpath.sh | 71 + bin/include/functions.sh | 2 +- bin/include/target-classpath.bat | 46 - bin/include/target-classpath.sh | 71 - dev-tools/.gitignore | 2 + dev-tools/build.gradle | 54 + dev-tools/gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 51017 bytes .../gradle/wrapper/gradle-wrapper.properties | 6 + dev-tools/gradlew | 164 + dev-tools/slurp.sh | 66 + dev-tools/src/main/groovy/jiraslurp.groovy | 487 ++ examples/pom.xml | 2 +- .../streaming/StreamTransformerExample.java | 4 +- .../streaming/StreamVisitorExample.java | 4 +- .../ignite/examples/streaming/package-info.java | 1 - .../streaming/wordcount/CacheConfig.java | 7 +- .../streaming/wordcount/QueryWords.java | 12 +- .../streaming/wordcount/StreamWords.java | 12 +- .../streaming/wordcount/package-info.java | 1 - .../socket/WordsSocketStreamerClient.java | 82 + .../socket/WordsSocketStreamerServer.java | 124 + .../wordcount/socket/package-info.java | 21 + modules/aop/pom.xml | 2 +- modules/aws/pom.xml | 2 +- .../config/grid-client-config.properties | 50 +- modules/clients/pom.xml | 2 +- .../ClientPropertiesConfigurationSelfTest.java | 12 +- .../ClientAbstractConnectivitySelfTest.java | 14 + modules/cloud/pom.xml | 4 +- .../TcpDiscoveryCloudIpFinderSelfTest.java | 2 - modules/codegen/pom.xml | 2 +- .../ignite/codegen/MessageCodeGenerator.java | 4 +- modules/core/pom.xml | 2 +- modules/core/src/main/java/META-INF/LICENSE | 238 + modules/core/src/main/java/META-INF/NOTICE | 12 + .../java/org/apache/ignite/IgniteCache.java | 5 + .../org/apache/ignite/IgniteJdbcDriver.java | 81 +- .../internal/GridEventConsumeHandler.java | 26 + .../apache/ignite/internal/IgniteKernal.java | 26 +- .../org/apache/ignite/internal/IgnitionEx.java | 136 +- .../client/GridClientConfiguration.java | 2 +- .../internal/direct/DirectByteBufferStream.java | 4 +- .../interop/InteropAwareEventFilter.java | 37 + .../internal/interop/InteropBootstrap.java | 34 + .../interop/InteropBootstrapFactory.java | 39 + .../internal/interop/InteropException.java | 71 + .../internal/interop/InteropIgnition.java | 166 + .../interop/InteropLocalEventListener.java | 28 + .../interop/InteropNoCallbackException.java | 50 + .../internal/interop/InteropProcessor.java | 36 + .../managers/communication/GridIoManager.java | 14 +- .../communication/GridIoMessageFactory.java | 4 +- .../GridLifecycleAwareMessageFilter.java | 5 +- .../eventstorage/GridEventStorageManager.java | 29 +- .../cache/DynamicCacheDescriptor.java | 16 +- .../processors/cache/GridCacheAdapter.java | 589 +- .../processors/cache/GridCacheContext.java | 7 + .../cache/GridCacheEvictionManager.java | 2 +- .../processors/cache/GridCacheIoManager.java | 320 +- .../processors/cache/GridCacheMapEntry.java | 123 +- .../processors/cache/GridCacheMessage.java | 8 +- .../processors/cache/GridCacheMvccManager.java | 4 +- .../GridCachePartitionExchangeManager.java | 7 +- .../processors/cache/GridCacheProcessor.java | 189 +- .../processors/cache/GridCacheProxyImpl.java | 24 - .../processors/cache/GridCacheSwapManager.java | 215 +- .../processors/cache/GridCacheTtlManager.java | 156 +- .../processors/cache/GridCacheUtils.java | 6 +- .../processors/cache/IgniteInternalCache.java | 27 - ...ridCacheOptimisticCheckPreparedTxFuture.java | 434 -- ...idCacheOptimisticCheckPreparedTxRequest.java | 232 - ...dCacheOptimisticCheckPreparedTxResponse.java | 179 - .../distributed/GridCacheTxRecoveryFuture.java | 506 ++ .../distributed/GridCacheTxRecoveryRequest.java | 261 + .../GridCacheTxRecoveryResponse.java | 182 + .../GridDistributedCacheAdapter.java | 210 +- .../distributed/GridDistributedLockRequest.java | 111 +- .../GridDistributedTxFinishRequest.java | 70 +- .../distributed/GridDistributedTxMapping.java | 5 +- .../GridDistributedTxPrepareRequest.java | 112 +- .../GridDistributedTxRemoteAdapter.java | 22 +- .../distributed/dht/GridDhtCacheAdapter.java | 22 +- .../distributed/dht/GridDhtLocalPartition.java | 2 +- .../distributed/dht/GridDhtLockFuture.java | 2 - .../distributed/dht/GridDhtLockRequest.java | 45 +- .../dht/GridDhtOffHeapCacheEntry.java | 63 + .../dht/GridDhtTransactionalCacheAdapter.java | 15 +- .../distributed/dht/GridDhtTxFinishFuture.java | 3 - .../distributed/dht/GridDhtTxFinishRequest.java | 43 +- .../cache/distributed/dht/GridDhtTxLocal.java | 38 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 95 +- .../cache/distributed/dht/GridDhtTxMapping.java | 2 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 100 +- .../dht/GridDhtTxPrepareRequest.java | 60 +- .../cache/distributed/dht/GridDhtTxRemote.java | 8 +- .../distributed/dht/GridNoStorageCacheMap.java | 4 +- .../dht/GridPartitionedGetFuture.java | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 7 +- .../atomic/GridDhtAtomicOffHeapCacheEntry.java | 63 + .../dht/atomic/GridDhtAtomicUpdateResponse.java | 8 + .../dht/atomic/GridNearAtomicUpdateFuture.java | 44 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 36 +- .../atomic/GridNearAtomicUpdateResponse.java | 18 +- .../dht/colocated/GridDhtColocatedCache.java | 5 +- .../colocated/GridDhtColocatedLockFuture.java | 37 +- .../GridDhtColocatedOffHeapCacheEntry.java | 63 + .../colocated/GridDhtDetachedCacheEntry.java | 4 +- .../dht/preloader/GridDhtForceKeysFuture.java | 6 + .../dht/preloader/GridDhtForceKeysResponse.java | 54 +- .../GridDhtPartitionsExchangeFuture.java | 2 +- .../distributed/near/GridNearCacheAdapter.java | 13 +- .../distributed/near/GridNearCacheEntry.java | 6 +- .../distributed/near/GridNearGetResponse.java | 8 +- .../distributed/near/GridNearLockFuture.java | 11 - .../distributed/near/GridNearLockRequest.java | 61 +- .../near/GridNearOffHeapCacheEntry.java | 60 + .../near/GridNearOptimisticTxPrepareFuture.java | 768 ++ .../GridNearPessimisticTxPrepareFuture.java | 347 + .../near/GridNearTransactionalCache.java | 4 - .../near/GridNearTxFinishRequest.java | 28 +- .../cache/distributed/near/GridNearTxLocal.java | 109 +- .../near/GridNearTxPrepareFuture.java | 1050 --- .../near/GridNearTxPrepareFutureAdapter.java | 231 + .../near/GridNearTxPrepareRequest.java | 52 +- .../near/GridNearTxPrepareResponse.java | 28 +- .../distributed/near/GridNearTxRemote.java | 24 +- .../processors/cache/local/GridLocalCache.java | 8 +- .../cache/local/GridLocalCacheEntry.java | 18 + .../local/atomic/GridLocalAtomicCache.java | 27 +- .../cache/query/GridCacheQueryManager.java | 21 +- .../cache/query/GridCacheSqlQuery.java | 2 +- .../cache/query/GridCacheTwoStepQuery.java | 17 + .../cache/transactions/IgniteInternalTx.java | 19 +- .../transactions/IgniteTransactionsImpl.java | 4 +- .../cache/transactions/IgniteTxAdapter.java | 76 +- .../cache/transactions/IgniteTxEntry.java | 48 +- .../cache/transactions/IgniteTxHandler.java | 106 +- .../transactions/IgniteTxLocalAdapter.java | 185 +- .../cache/transactions/IgniteTxLocalEx.java | 21 +- .../cache/transactions/IgniteTxManager.java | 271 +- .../datastreamer/DataStreamerImpl.java | 2 + .../processors/igfs/IgfsDataManager.java | 3 + .../processors/igfs/IgfsDeleteWorker.java | 4 + .../processors/igfs/IgfsMetaManager.java | 2 +- .../internal/processors/igfs/IgfsUtils.java | 11 +- .../offheap/GridOffHeapProcessor.java | 17 + .../processors/resource/GridResourceField.java | 16 +- .../processors/resource/GridResourceIoc.java | 389 +- .../processors/resource/GridResourceMethod.java | 13 + .../resource/GridResourceProcessor.java | 20 +- .../ignite/internal/util/IgniteUtils.java | 28 +- .../util/lang/GridComputeJobWrapper.java | 96 - .../util/lang/GridFilteredIterator.java | 2 +- .../ignite/internal/util/lang/GridFunc.java | 7218 +++++------------- .../internal/util/nio/GridBufferedParser.java | 4 - .../internal/util/nio/GridDelimitedParser.java | 91 + .../util/nio/GridNioDelimitedBuffer.java | 106 + .../util/offheap/GridOffHeapPartitionedMap.java | 9 + .../unsafe/GridUnsafePartitionedMap.java | 155 +- .../internal/visor/query/VisorQueryArg.java | 14 +- .../internal/visor/query/VisorQueryJob.java | 2 + .../apache/ignite/lang/IgniteAsyncSupport.java | 4 +- .../communication/tcp/TcpCommunicationSpi.java | 2 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 4 - .../spi/discovery/tcp/TcpDiscoverySpi.java | 74 +- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 14 +- .../org/apache/ignite/stream/StreamAdapter.java | 111 + .../ignite/stream/StreamTupleExtractor.java | 33 + .../stream/socket/SocketMessageConverter.java | 31 + .../ignite/stream/socket/SocketStreamer.java | 218 + .../ignite/stream/socket/package-info.java | 21 + .../resources/META-INF/classnames.properties | 13 +- .../core/src/main/resources/ignite.properties | 2 +- .../internal/GridUpdateNotifierSelfTest.java | 21 +- .../processors/cache/CacheGetFromJobTest.java | 110 + .../cache/CacheOffheapMapEntrySelfTest.java | 168 + .../cache/CacheRemoveAllSelfTest.java | 81 + .../GridCacheAbstractFailoverSelfTest.java | 12 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 227 +- .../cache/GridCacheAbstractSelfTest.java | 4 +- .../cache/GridCacheSwapReloadSelfTest.java | 20 +- .../IgniteCacheEntryListenerAbstractTest.java | 4 +- .../cache/IgniteCacheNearLockValueSelfTest.java | 145 + .../IgniteCacheP2pUnmarshallingErrorTest.java | 189 + ...gniteCacheP2pUnmarshallingNearErrorTest.java | 56 + ...CacheP2pUnmarshallingRebalanceErrorTest.java | 80 + .../IgniteCacheP2pUnmarshallingTxErrorTest.java | 109 + .../cache/IgniteCachePeekModesAbstractTest.java | 15 +- .../cache/OffHeapTieredTransactionSelfTest.java | 127 + ...CacheLoadingConcurrentGridStartSelfTest.java | 163 + .../GridCacheAbstractNodeRestartSelfTest.java | 101 +- ...GridCacheLoadingConcurrentGridStartTest.java | 154 - .../distributed/GridCacheLockAbstractTest.java | 2 - .../distributed/IgniteTxGetAfterStopTest.java | 131 + ...xOriginatingNodeFailureAbstractSelfTest.java | 2 +- .../dht/GridCacheDhtPreloadSelfTest.java | 2 +- ...icOffHeapTieredMultiNodeFullApiSelfTest.java | 43 + ...achePartitionedNearDisabledLockSelfTest.java | 47 + ...ionedNearDisabledOffHeapFullApiSelfTest.java | 8 +- ...DisabledOffHeapMultiNodeFullApiSelfTest.java | 8 +- ...abledOffHeapTieredAtomicFullApiSelfTest.java | 56 + ...earDisabledOffHeapTieredFullApiSelfTest.java | 33 + ...edOffHeapTieredMultiNodeFullApiSelfTest.java | 33 + ...rDisabledPrimaryNodeFailureRecoveryTest.java | 31 + ...rtitionedPrimaryNodeFailureRecoveryTest.java | 31 + ...woBackupsPrimaryNodeFailureRecoveryTest.java | 37 + ...ePrimaryNodeFailureRecoveryAbstractTest.java | 533 ++ ...idCacheAtomicReplicatedFailoverSelfTest.java | 6 + ...CacheAtomicOffHeapTieredFullApiSelfTest.java | 32 + ...icOffHeapTieredMultiNodeFullApiSelfTest.java | 33 + ...yWriteOrderOffHeapTieredFullApiSelfTest.java | 33 + ...erOffHeapTieredMultiNodeFullApiSelfTest.java | 33 + ...achePartitionedMultiNodeFullApiSelfTest.java | 15 +- .../GridCachePartitionedNodeRestartTest.java | 4 +- ...dCachePartitionedOffHeapFullApiSelfTest.java | 8 +- ...titionedOffHeapMultiNodeFullApiSelfTest.java | 8 +- ...PartitionedOffHeapTieredFullApiSelfTest.java | 32 + ...edOffHeapTieredMultiNodeFullApiSelfTest.java | 72 + ...ePartitionedOptimisticTxNodeRestartTest.java | 4 +- .../GridCachePartitionedTxSalvageSelfTest.java | 25 +- .../near/IgniteCacheNearOnlyTxTest.java | 190 + .../near/NoneRebalanceModeSelfTest.java | 67 + .../GridCacheReplicatedFailoverSelfTest.java | 6 + .../GridCacheReplicatedLockSelfTest.java | 5 + .../GridCacheReplicatedNodeRestartSelfTest.java | 82 + ...idCacheReplicatedOffHeapFullApiSelfTest.java | 8 +- ...plicatedOffHeapMultiNodeFullApiSelfTest.java | 8 +- ...eReplicatedOffHeapTieredFullApiSelfTest.java | 33 + ...edOffHeapTieredMultiNodeFullApiSelfTest.java | 33 + .../RandomEvictionPolicyCacheSizeSelfTest.java | 72 + .../IgniteCacheExpiryPolicyAbstractTest.java | 2 +- .../IgniteCacheExpiryPolicyTestSuite.java | 2 + .../expiry/IgniteCacheTtlCleanupSelfTest.java | 85 + ...LocalAtomicOffHeapTieredFullApiSelfTest.java | 32 + .../GridCacheLocalIsolatedNodesSelfTest.java | 18 +- .../GridCacheLocalOffHeapFullApiSelfTest.java | 6 +- ...dCacheLocalOffHeapTieredFullApiSelfTest.java | 32 + .../igfs/IgfsClientCacheSelfTest.java | 132 + .../processors/igfs/IgfsOneClientNodeTest.java | 133 + .../processors/igfs/IgfsStreamsSelfTest.java | 2 +- .../util/nio/GridNioDelimitedBufferTest.java | 112 + ...idFileSwapSpaceSpiMultithreadedLoadTest.java | 4 +- .../tcp/TcpClientDiscoverySelfTest.java | 8 + .../discovery/tcp/TcpDiscoveryRestartTest.java | 199 + .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 65 +- .../stream/socket/SocketStreamerSelfTest.java | 315 + .../ignite/stream/socket/package-info.java | 21 + .../ignite/testsuites/IgniteBasicTestSuite.java | 2 + .../IgniteCacheEvictionSelfTestSuite.java | 1 + .../IgniteCacheFailoverTestSuite.java | 10 +- .../IgniteCacheFullApiSelfTestSuite.java | 18 + ...gniteCacheP2pUnmarshallingErrorTestSuit.java | 41 + .../testsuites/IgniteCacheRestartTestSuite.java | 11 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 296 +- .../testsuites/IgniteCacheTestSuite2.java | 144 + .../testsuites/IgniteCacheTestSuite3.java | 142 + .../testsuites/IgniteCacheTestSuite4.java | 135 + .../IgniteCacheTxRecoverySelfTestSuite.java | 4 + .../ignite/testsuites/IgniteIgfsTestSuite.java | 3 + .../testsuites/IgniteStreamTestSuite.java | 39 + .../testsuites/IgniteUtilSelfTestSuite.java | 1 + 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 +- .../processors/hadoop/v2/HadoopV2Context.java | 10 +- .../testsuites/IgniteHadoopTestSuite.java | 2 +- modules/hibernate/pom.xml | 2 +- modules/indexing/pom.xml | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 4 + .../processors/query/h2/sql/GridSqlQuery.java | 20 + .../query/h2/sql/GridSqlQueryParser.java | 10 +- .../query/h2/sql/GridSqlQuerySplitter.java | 11 +- .../processors/query/h2/sql/GridSqlSelect.java | 2 +- .../processors/query/h2/sql/GridSqlUnion.java | 2 +- .../query/h2/twostep/GridMapQueryExecutor.java | 3 + .../h2/twostep/GridReduceQueryExecutor.java | 119 +- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 11 +- .../cache/GridCacheOffHeapSelfTest.java | 11 +- .../cache/GridCacheOffheapIndexGetSelfTest.java | 111 + .../IgniteCacheAbstractFieldsQuerySelfTest.java | 21 + ...niteCacheP2pUnmarshallingQueryErrorTest.java | 56 + ...eQueryMultiThreadedOffHeapTiredSelfTest.java | 37 + .../IgniteCacheQueryMultiThreadedSelfTest.java | 29 +- .../IgniteCacheQuerySelfTestSuite.java | 4 + .../IgniteCacheWithIndexingTestSuite.java | 2 + modules/jcl/pom.xml | 2 +- modules/jta/pom.xml | 2 +- .../processors/cache/jta/CacheJtaManager.java | 4 +- modules/log4j/pom.xml | 2 +- modules/rest-http/pom.xml | 2 +- modules/scalar/pom.xml | 2 +- .../ignite/scalar/ScalarConversions.scala | 8 - .../scalar/tests/ScalarCacheQueriesSpec.scala | 154 +- .../ignite/scalar/tests/ScalarCacheSpec.scala | 23 +- .../scalar/tests/ScalarConversionsSpec.scala | 43 +- .../scalar/tests/ScalarProjectionSpec.scala | 128 +- .../scalar/tests/ScalarReturnableSpec.scala | 41 +- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 8 +- .../ignite/schema/generator/CodeGenerator.java | 47 +- 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 | 4 +- .../commands/cache/VisorCacheScanCommand.scala | 2 +- .../ignite/visor/VisorRuntimeBaseSpec.scala | 2 +- .../visor/commands/VisorArgListSpec.scala | 60 +- .../commands/VisorFileNameCompleterSpec.scala | 34 +- .../commands/ack/VisorAckCommandSpec.scala | 20 +- .../commands/alert/VisorAlertCommandSpec.scala | 68 +- .../cache/VisorCacheClearCommandSpec.scala | 48 +- .../commands/cache/VisorCacheCommandSpec.scala | 66 +- .../config/VisorConfigurationCommandSpec.scala | 8 +- .../cswap/VisorCacheSwapCommandSpec.scala | 24 +- .../deploy/VisorDeployCommandSpec.scala | 10 +- .../disco/VisorDiscoveryCommandSpec.scala | 46 +- .../events/VisorEventsCommandSpec.scala | 28 +- .../visor/commands/gc/VisorGcCommandSpec.scala | 30 +- .../commands/help/VisorHelpCommandSpec.scala | 57 +- .../commands/kill/VisorKillCommandSpec.scala | 58 +- .../commands/log/VisorLogCommandSpec.scala | 10 +- .../commands/mem/VisorMemoryCommandSpec.scala | 77 +- .../commands/node/VisorNodeCommandSpec.scala | 22 +- .../commands/open/VisorOpenCommandSpec.scala | 16 +- .../commands/ping/VisorPingCommandSpec.scala | 16 +- .../commands/start/VisorStartCommandSpec.scala | 126 +- .../commands/tasks/VisorTasksCommandSpec.scala | 112 +- .../commands/top/VisorTopologyCommandSpec.scala | 52 +- .../commands/vvm/VisorVvmCommandSpec.scala | 30 +- modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 2 +- .../config/benchmark-client-mode.properties | 89 + modules/yardstick/pom.xml | 2 +- parent/pom.xml | 5 + pom.xml | 318 +- 354 files changed, 16152 insertions(+), 12111 deletions(-) ----------------------------------------------------------------------
