Merge branch 'ignite-45' into ignite-497-stick
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/18f37fe1 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/18f37fe1 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/18f37fe1 Branch: refs/heads/ignite-497-stick Commit: 18f37fe18cd61e03a7423fb19fb88289bb74d20c Parents: b5a0e2c ead970c Author: nikolay_tikhonov <ntikho...@gridgain.com> Authored: Mon Mar 23 12:54:01 2015 +0300 Committer: nikolay_tikhonov <ntikho...@gridgain.com> Committed: Mon Mar 23 12:54:01 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 8 +- LICENSE.txt | 75 +- NOTICE.txt | 30 +- assembly/release-fabric.xml | 2 + bin/ignite-schema-import.bat | 59 +- bin/ignite-schema-import.sh | 33 +- bin/ignitevisorcmd.sh | 2 +- config/fabric/default-config.xml | 50 +- examples/config/example-cache.xml | 122 +- examples/config/example-compute.xml | 83 - examples/config/example-ignite.xml | 83 + examples/config/example-streamer.xml | 293 -- examples/config/filesystem/example-igfs.xml | 2 +- .../hibernate/example-hibernate-L2-cache.xml | 3 - examples/config/servlet/WEB-INF/web.xml | 2 +- examples/config/servlet/readme.txt | 2 +- examples/config/store/example-database.script | 27 - examples/memcached/memcached-example.php | 93 + examples/pom-standalone.xml | 22 +- examples/pom.xml | 75 + examples/readme.txt | 25 + examples/rest/http-rest-example.php | 15 +- examples/rest/memcache-rest-example.php | 92 - examples/schema-import/README.txt | 32 + examples/schema-import/bin/db-init.sql | 10 + examples/schema-import/bin/h2-server.bat | 80 + examples/schema-import/bin/h2-server.sh | 66 + .../schema-import/bin/schema-import.properties | 30 + examples/schema-import/pom.xml | 91 + .../ignite/schema/ConfigurationSnippet.java | 38 + .../java/org/apache/ignite/schema/Demo.java | 60 + .../java/org/apache/ignite/schema/Person.java | 33 + .../org/apache/ignite/schema/PersonKey.java | 31 + .../ignite/examples/ExampleNodeStartup.java | 2 +- .../apache/ignite/examples/ExamplesUtils.java | 67 +- .../computegrid/ComputeAsyncExample.java | 74 + .../computegrid/ComputeBroadcastExample.java | 6 +- .../computegrid/ComputeCallableExample.java | 6 +- .../computegrid/ComputeClosureExample.java | 6 +- .../ComputeClusterGroupsExample.java | 93 - .../ComputeContinuousMapperExample.java | 6 +- .../ComputeExecutorServiceExample.java | 71 - .../ComputeFibonacciContinuationExample.java | 6 +- .../computegrid/ComputeReducerExample.java | 6 +- .../computegrid/ComputeRunnableExample.java | 21 +- .../computegrid/ComputeScheduleExample.java | 81 - .../computegrid/ComputeTaskMapExample.java | 6 +- .../computegrid/ComputeTaskSplitExample.java | 6 +- .../cluster/ClusterGroupExample.java | 93 + .../computegrid/cluster/package-info.java | 22 + .../failover/ComputeFailoverExample.java | 1 - .../computegrid/failover/package-info.java | 2 +- .../montecarlo/CreditRiskExample.java | 6 +- .../computegrid/montecarlo/package-info.java | 2 +- .../examples/computegrid/package-info.java | 2 +- .../examples/datagrid/CacheAffinityExample.java | 6 +- .../examples/datagrid/CacheApiExample.java | 31 +- .../examples/datagrid/CacheAsyncApiExample.java | 86 + .../datagrid/CacheContinuousQueryExample.java | 8 +- .../datagrid/CacheDataStreamerExample.java | 25 +- .../examples/datagrid/CacheEventsExample.java | 10 +- .../datagrid/CachePopularNumbersExample.java | 172 - .../examples/datagrid/CachePutGetExample.java | 6 +- .../examples/datagrid/CacheQueryExample.java | 59 +- .../datagrid/CacheTransactionExample.java | 6 +- .../hibernate/HibernateL2CacheExample.java | 135 +- .../HibernateL2CacheExampleNodeStartup.java | 97 - .../datagrid/hibernate/package-info.java | 2 +- .../ignite/examples/datagrid/package-info.java | 2 +- .../starschema/CacheStarSchemaExample.java | 6 +- .../datagrid/starschema/DimProduct.java | 1 - .../examples/datagrid/starschema/DimStore.java | 1 - .../datagrid/starschema/FactPurchase.java | 2 - .../datagrid/starschema/package-info.java | 2 +- .../store/CacheNodeWithStoreStartup.java | 145 - .../datagrid/store/CacheStoreExample.java | 107 - .../store/CacheStoreLoadDataExample.java | 67 - .../ignite/examples/datagrid/store/Person.java | 155 + .../store/auto/CacheAutoStoreExample.java | 86 + .../auto/CacheAutoStoreLoadDataExample.java | 78 + .../datagrid/store/auto/CacheConfig.java | 80 + .../datagrid/store/auto/DbH2ServerStartup.java | 78 + .../datagrid/store/auto/package-info.java | 22 + .../store/dummy/CacheDummyPersonStore.java | 12 +- .../store/dummy/CacheDummyStoreExample.java | 130 + .../datagrid/store/dummy/package-info.java | 2 +- .../hibernate/CacheHibernatePersonStore.java | 42 +- .../hibernate/CacheHibernateStoreExample.java | 130 + .../datagrid/store/hibernate/Person.hbm.xml | 2 +- .../datagrid/store/hibernate/package-info.java | 2 +- .../store/jdbc/CacheJdbcPersonStore.java | 2 +- .../store/jdbc/CacheJdbcPojoPersonStore.java | 85 - .../store/jdbc/CacheJdbcStoreExample.java | 130 + .../datagrid/store/jdbc/package-info.java | 2 +- .../examples/datagrid/store/model/Person.java | 155 - .../examples/datagrid/store/package-info.java | 2 +- .../datastructures/IgniteAtomicLongExample.java | 7 +- .../IgniteAtomicReferenceExample.java | 7 +- .../IgniteAtomicSequenceExample.java | 7 +- .../IgniteAtomicStampedExample.java | 7 +- .../IgniteCountDownLatchExample.java | 7 +- .../IgniteExecutorServiceExample.java | 71 + .../datastructures/IgniteQueueExample.java | 7 +- .../datastructures/IgniteSetExample.java | 8 +- .../examples/datastructures/package-info.java | 2 +- .../ignite/examples/events/EventsExample.java | 8 +- .../ignite/examples/events/package-info.java | 2 +- .../ignite/examples/igfs/package-info.java | 2 +- .../examples/messaging/MessagingExample.java | 6 +- .../messaging/MessagingPingPongExample.java | 54 +- .../MessagingPingPongListenActorExample.java | 6 +- .../ignite/examples/messaging/package-info.java | 2 +- .../misc/client/memcache/package-info.java | 2 +- .../examples/misc/client/package-info.java | 2 +- .../misc/deployment/DeploymentExample.java | 6 +- .../examples/misc/deployment/package-info.java | 2 +- .../examples/misc/lifecycle/package-info.java | 2 +- .../ignite/examples/misc/package-info.java | 2 +- .../misc/schedule/ComputeScheduleExample.java | 81 + .../examples/misc/schedule/package-info.java | 22 + .../misc/springbean/SpringBeanExample.java | 4 +- .../examples/misc/springbean/package-info.java | 2 +- .../apache/ignite/examples/package-info.java | 2 +- .../examples/servicegrid/ServicesExample.java | 19 +- .../servicegrid/SimpleMapServiceImpl.java | 32 +- .../examples/servicegrid/package-info.java | 22 + .../streaming/StreamingCheckInExample.java | 580 --- .../streaming/StreamingNodeStartup.java | 35 - .../StreamingPopularNumbersExample.java | 166 - .../streaming/StreamingPriceBarsExample.java | 451 --- .../StreamingRunningAverageExample.java | 247 -- .../streaming/marketdata/CacheConfig.java | 44 + .../streaming/marketdata/Instrument.java | 106 + .../marketdata/QueryTopInstruments.java | 73 + .../streaming/marketdata/StreamMarketData.java | 103 + .../examples/streaming/numbers/CacheConfig.java | 46 + .../streaming/numbers/QueryPopularNumbers.java | 74 + .../streaming/numbers/StreamRandomNumbers.java | 78 + .../ignite/examples/streaming/package-info.java | 4 +- .../ignite/examples/java8/ComputeExample.java | 56 - .../examples/java8/ExampleNodeStartup.java | 35 - .../ignite/examples/java8/ExamplesUtils.java | 129 - .../ignite/examples/java8/MessagingExample.java | 162 - .../java8/cluster/ClusterGroupExample.java | 82 + .../examples/java8/cluster/package-info.java | 22 + .../java8/computegrid/ComputeAsyncExample.java | 71 + .../computegrid/ComputeBroadcastExample.java | 101 + .../computegrid/ComputeCallableExample.java | 73 + .../computegrid/ComputeClosureExample.java | 69 + .../computegrid/ComputeRunnableExample.java | 63 + .../java8/computegrid/package-info.java | 22 + .../java8/datagrid/CacheAffinityExample.java | 131 + .../java8/datagrid/CacheApiExample.java | 103 + .../java8/datagrid/CacheAsyncApiExample.java | 82 + .../examples/java8/datagrid/package-info.java | 22 + .../IgniteExecutorServiceExample.java | 69 + .../java8/datastructures/package-info.java | 22 + .../examples/java8/events/EventsExample.java | 132 + .../examples/java8/events/package-info.java | 22 + .../java8/messaging/MessagingExample.java | 163 + .../messaging/MessagingPingPongExample.java | 111 + .../examples/java8/messaging/package-info.java | 22 + .../misc/schedule/ComputeScheduleExample.java | 64 + .../java8/misc/schedule/package-info.java | 22 + .../ignite/examples/java8/package-info.java | 23 + .../java8/streaming/marketdata/CacheConfig.java | 44 + .../java8/streaming/marketdata/Instrument.java | 106 + .../marketdata/QueryTopInstruments.java | 73 + .../streaming/marketdata/StreamMarketData.java | 100 + .../java8/streaming/numbers/CacheConfig.java | 10 +- .../streaming/numbers/QueryPopularNumbers.java | 47 +- .../streaming/numbers/StreamRandomNumbers.java | 43 +- .../examples/java8/streaming/package-info.java | 22 + .../examples/ScalarCacheAffinityExample.scala | 6 +- .../scalar/examples/ScalarCacheExample.scala | 6 +- .../ScalarCachePopularNumbersExample.scala | 8 +- .../examples/ScalarCacheQueryExample.scala | 9 +- .../scalar/examples/ScalarClosureExample.scala | 4 +- .../examples/ScalarContinuationExample.scala | 4 +- .../examples/ScalarCreditRiskExample.scala | 4 +- .../scalar/examples/ScalarPingPongExample.scala | 4 +- .../scalar/examples/ScalarPrimeExample.scala | 4 +- .../scalar/examples/ScalarScheduleExample.scala | 4 +- .../examples/ScalarSnowflakeSchemaExample.scala | 11 +- .../scalar/examples/ScalarTaskExample.scala | 4 +- .../examples/ScalarWorldShortestMapReduce.scala | 4 +- .../ignite/examples/BasicExamplesSelfTest.java | 3 +- .../CacheExamplesMultiNodeSelfTest.java | 12 +- .../ignite/examples/CacheExamplesSelfTest.java | 20 +- ...heStoreLoadDataExampleMultiNodeSelfTest.java | 39 - .../examples/ClusterGroupExampleSelfTest.java | 39 + .../ComputeClusterGroupsExampleSelfTest.java | 39 - ...ibernateL2CacheExampleMultiNodeSelfTest.java | 2 +- .../examples/MessagingExamplesSelfTest.java | 3 +- .../testsuites/IgniteExamplesSelfTestSuite.java | 3 +- .../java8/IgniteExamplesJ8SelfTestSuite.java | 43 + .../integration/ClientAbstractSelfTest.java | 34 +- .../JettyRestProcessorAbstractSelfTest.java | 4 +- .../rest/RestBinaryProtocolSelfTest.java | 2 +- .../rest/TaskCommandHandlerSelfTest.java | 4 +- .../core/licenses/pcollections-mit-license.txt | 19 - modules/core/pom.xml | 3 +- .../src/main/java/com/romix/scala/None.java | 27 - .../src/main/java/com/romix/scala/Option.java | 42 - .../src/main/java/com/romix/scala/Some.java | 38 - .../scala/collection/concurrent/BasicNode.java | 32 - .../scala/collection/concurrent/CNodeBase.java | 49 - .../romix/scala/collection/concurrent/Gen.java | 29 - .../scala/collection/concurrent/INodeBase.java | 47 - .../scala/collection/concurrent/ListMap.java | 247 -- .../scala/collection/concurrent/MainNode.java | 51 - .../romix/scala/collection/concurrent/Pair.java | 54 - .../scala/collection/concurrent/TrieMap.java | 1826 --------- .../src/main/java/org/apache/ignite/Ignite.java | 37 +- .../java/org/apache/ignite/IgniteCache.java | 34 +- .../org/apache/ignite/IgniteDataStreamer.java | 41 +- .../org/apache/ignite/IgniteJdbcDriver.java | 10 - .../java/org/apache/ignite/IgniteStreamer.java | 154 - .../apache/ignite/IgniteSystemProperties.java | 7 + .../main/java/org/apache/ignite/Ignition.java | 2 +- .../ignite/cache/CacheExistsException.java | 52 + .../org/apache/ignite/cache/CacheManager.java | 27 +- .../cache/CacheServerNotFoundException.java | 49 + .../ignite/cache/CacheTypeFieldMetadata.java | 7 +- .../apache/ignite/cache/CacheTypeMetadata.java | 12 +- .../cache/IgniteCacheEntryEventFilter.java | 28 + .../eviction/fifo/CacheFifoEvictionPolicy.java | 4 +- .../CacheIgfsPerBlockLruEvictionPolicy.java | 7 +- .../eviction/lru/CacheLruEvictionPolicy.java | 4 +- .../ignite/cache/query/ContinuousQuery.java | 104 +- .../org/apache/ignite/cache/query/Query.java | 41 +- .../apache/ignite/cache/query/ScanQuery.java | 28 +- .../org/apache/ignite/cache/query/SpiQuery.java | 17 +- .../ignite/cache/query/SqlFieldsQuery.java | 24 +- .../org/apache/ignite/cache/query/SqlQuery.java | 21 +- .../apache/ignite/cache/query/TextQuery.java | 35 +- .../store/jdbc/CacheAbstractJdbcStore.java | 73 +- .../cache/store/jdbc/CacheJdbcBlobStore.java | 7 +- .../cache/store/jdbc/CacheJdbcPojoStore.java | 4 +- .../store/jdbc/dialect/BasicJdbcDialect.java | 6 +- .../cache/store/jdbc/dialect/DB2Dialect.java | 2 +- .../cache/store/jdbc/dialect/JdbcDialect.java | 2 +- .../store/jdbc/dialect/SQLServerDialect.java | 2 +- .../org/apache/ignite/cluster/ClusterGroup.java | 9 - .../org/apache/ignite/compute/ComputeJob.java | 3 +- .../ignite/compute/ComputeJobAdapter.java | 2 +- .../configuration/CacheConfiguration.java | 7 +- .../configuration/IgniteConfiguration.java | 27 +- .../configuration/NearCacheConfiguration.java | 23 - .../ignite/events/CacheQueryExecutedEvent.java | 7 +- .../ignite/events/CacheQueryReadEvent.java | 10 +- .../org/apache/ignite/events/EventType.java | 11 +- .../ignite/internal/GridKernalContext.java | 8 - .../ignite/internal/GridKernalContextImpl.java | 12 - .../apache/ignite/internal/IgniteKernal.java | 105 +- .../org/apache/ignite/internal/IgnitionEx.java | 18 +- .../internal/MarshallerContextAdapter.java | 2 +- .../router/impl/GridRouterClientImpl.java | 2 +- .../internal/cluster/ClusterGroupAdapter.java | 40 - .../cluster/ClusterNodeLocalMapImpl.java | 2 +- .../ClusterTopologyServerNotFoundException.java | 40 + .../cluster/IgniteClusterAsyncImpl.java | 5 - .../ignite/internal/igfs/common/IgfsLogger.java | 2 +- .../checkpoint/GridCheckpointManager.java | 4 +- .../managers/communication/GridIoManager.java | 4 +- .../communication/GridIoMessageFactory.java | 18 +- .../managers/deployment/GridDeployment.java | 2 +- .../deployment/GridDeploymentClassLoader.java | 2 +- .../deployment/GridDeploymentLocalStore.java | 7 +- .../GridDeploymentPerLoaderStore.java | 6 +- .../GridDeploymentPerVersionStore.java | 8 +- .../discovery/GridDiscoveryManager.java | 9 +- .../eventstorage/GridEventStorageManager.java | 2 +- .../affinity/GridAffinityAssignmentCache.java | 2 +- .../affinity/GridAffinityProcessor.java | 94 +- .../processors/affinity/GridAffinityUtils.java | 2 + .../cache/CacheStoreBalancingWrapper.java | 2 +- .../cache/CacheWeakQueryIteratorsHolder.java | 2 +- .../cache/DynamicCacheChangeRequest.java | 44 +- .../processors/cache/GridCacheAdapter.java | 8 +- .../cache/GridCacheAffinityManager.java | 52 +- .../cache/GridCacheAtomicVersionComparator.java | 21 +- .../cache/GridCacheConcurrentMap.java | 11 +- .../processors/cache/GridCacheContext.java | 47 +- .../cache/GridCacheDeploymentManager.java | 2 +- .../GridCacheEntryInfoCollectSwapListener.java | 2 +- .../cache/GridCacheEvictionManager.java | 6 +- .../processors/cache/GridCacheGateway.java | 114 +- .../processors/cache/GridCacheIoManager.java | 2 +- .../processors/cache/GridCacheMapEntry.java | 47 +- .../processors/cache/GridCacheMvccManager.java | 5 +- .../GridCachePartitionExchangeManager.java | 11 +- .../processors/cache/GridCacheProcessor.java | 257 +- .../processors/cache/GridCacheSwapManager.java | 2 +- .../processors/cache/GridCacheUtils.java | 11 +- .../cache/GridCacheWriteBehindStore.java | 2 +- .../processors/cache/GridPartitionLockKey.java | 104 - .../cache/IgniteCacheExistsException.java | 52 - .../processors/cache/IgniteCacheProxy.java | 147 +- .../CacheDataStructuresManager.java | 4 +- .../distributed/GridCacheTxFinishSync.java | 2 +- .../distributed/dht/GridDhtCacheAdapter.java | 2 +- .../distributed/dht/GridDhtLocalPartition.java | 5 +- .../distributed/dht/GridDhtLockFuture.java | 2 +- .../dht/GridDhtPartitionTopologyImpl.java | 2 +- .../distributed/dht/GridDhtTxLocalAdapter.java | 2 +- .../cache/distributed/dht/GridDhtTxRemote.java | 2 +- .../dht/atomic/GridDhtAtomicCache.java | 2 +- .../dht/atomic/GridDhtAtomicUpdateFuture.java | 2 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 11 +- .../colocated/GridDhtColocatedLockFuture.java | 5 +- .../preloader/GridDhtPartitionSupplyPool.java | 2 +- .../GridDhtPartitionsExchangeFuture.java | 91 +- .../dht/preloader/GridDhtPreloader.java | 2 +- .../distributed/near/GridNearAtomicCache.java | 2 + .../distributed/near/GridNearLockFuture.java | 4 +- .../cache/distributed/near/GridNearTxLocal.java | 3 +- .../near/GridNearTxPrepareFuture.java | 2 +- .../local/atomic/GridLocalAtomicCache.java | 5 - .../query/GridCacheDistributedQueryManager.java | 2 +- .../cache/query/GridCacheQueriesImpl.java | 2 +- .../cache/query/GridCacheQueryManager.java | 2 +- .../cache/query/GridCacheTwoStepQuery.java | 20 + .../CacheContinuousQueryFilterEx.java | 4 +- .../continuous/CacheContinuousQueryHandler.java | 12 +- .../continuous/CacheContinuousQueryManager.java | 30 +- .../query/jdbc/GridCacheQueryJdbcTask.java | 2 +- .../cache/transactions/IgniteTxManager.java | 2 +- .../GridCacheVersionConflictResolver.java | 2 +- .../processors/clock/GridClockServer.java | 2 +- .../clock/GridClockSyncProcessor.java | 2 +- .../continuous/GridContinuousProcessor.java | 2 +- .../datastreamer/DataStreamerImpl.java | 96 +- .../datastreamer/DataStreamerUpdateJob.java | 1 + .../datastructures/DataStructuresProcessor.java | 2 +- .../dr/IgniteDrDataStreamerCacheUpdater.java | 5 +- .../processors/igfs/IgfsClientSession.java | 2 +- .../processors/igfs/IgfsDataManager.java | 2 +- .../internal/processors/igfs/IgfsImpl.java | 2 +- .../processors/igfs/IgfsLocalMetrics.java | 30 +- .../internal/processors/igfs/IgfsProcessor.java | 2 +- .../internal/processors/igfs/IgfsServer.java | 6 +- .../processors/igfs/IgfsServerManager.java | 4 +- .../processors/job/GridJobProcessor.java | 15 +- .../jobmetrics/GridJobMetricsProcessor.java | 2 +- .../offheap/GridOffHeapProcessor.java | 2 +- .../query/GridQueryCacheObjectsIterator.java | 70 + .../processors/query/GridQueryIndexing.java | 20 +- .../processors/query/GridQueryProcessor.java | 66 +- .../processors/resource/GridResourceIoc.java | 2 +- .../processors/rest/GridRestProcessor.java | 4 +- .../handlers/cache/GridCacheCommandHandler.java | 2 - .../handlers/task/GridTaskCommandHandler.java | 2 +- .../service/GridServiceProcessor.java | 33 +- .../processors/service/GridServiceProxy.java | 2 +- .../session/GridTaskSessionProcessor.java | 2 +- .../streamer/GridStreamProcessor.java | 347 -- .../streamer/GridStreamerAttributes.java | 127 - .../streamer/GridStreamerCancelRequest.java | 110 - .../streamer/GridStreamerContextDelegate.java | 102 - .../streamer/GridStreamerContextImpl.java | 201 - .../streamer/GridStreamerExecutionBatch.java | 175 - .../streamer/GridStreamerExecutionRequest.java | 293 -- .../streamer/GridStreamerResponse.java | 144 - .../GridStreamerRouteFailedException.java | 36 - .../GridStreamerStageExecutionFuture.java | 340 -- .../streamer/GridStreamerWindowIterator.java | 40 - .../processors/streamer/IgniteStreamerEx.java | 94 - .../processors/streamer/IgniteStreamerImpl.java | 1375 ------- .../streamer/StreamerMBeanAdapter.java | 116 - .../streamer/StreamerMetricsAdapter.java | 272 -- .../streamer/StreamerMetricsHolder.java | 424 -- .../streamer/StreamerStageMBeanAdapter.java | 101 - .../streamer/StreamerStageMetricsAdapter.java | 135 - .../streamer/StreamerStageMetricsHolder.java | 167 - .../streamer/StreamerStageWrapper.java | 90 - .../streamer/StreamerWindowMetricsAdapter.java | 65 - .../streamer/StreamerWindowMetricsHolder.java | 50 - .../processors/streamer/package-info.java | 22 - .../task/GridStreamerBroadcastTask.java | 137 - .../streamer/task/GridStreamerQueryTask.java | 140 - .../streamer/task/GridStreamerReduceTask.java | 144 - .../processors/task/GridTaskProcessor.java | 4 +- .../processors/task/GridTaskWorker.java | 2 +- .../timeout/GridTimeoutProcessor.java | 2 +- .../internal/util/GridAnnotationsCache.java | 2 +- .../GridBoundedConcurrentLinkedHashMap.java | 4 +- .../GridBoundedConcurrentLinkedHashSet.java | 6 +- .../internal/util/GridClassLoaderCache.java | 2 +- .../internal/util/GridConcurrentFactory.java | 2 +- .../internal/util/GridConcurrentHashSet.java | 2 +- .../util/GridConcurrentLinkedHashSet.java | 4 +- .../ignite/internal/util/GridEnumCache.java | 2 +- .../internal/util/GridExecutionStatistics.java | 2 +- .../ignite/internal/util/GridKeyLock.java | 2 +- .../ignite/internal/util/GridLogThrottle.java | 2 +- .../internal/util/GridSynchronizedMap.java | 2 +- .../ignite/internal/util/IgniteUtils.java | 44 +- .../util/future/GridCompoundFuture.java | 2 +- .../internal/util/future/IgniteFutureImpl.java | 5 - .../ignite/internal/util/lang/GridFunc.java | 2 +- .../ignite/internal/util/nio/GridNioServer.java | 2 +- .../util/nio/GridSelectorNioSessionImpl.java | 2 +- .../offheap/unsafe/GridOffHeapSnapTreeMap.java | 2 +- .../util/offheap/unsafe/GridUnsafeMap.java | 8 +- .../unsafe/GridUnsafePartitionedMap.java | 4 +- .../ignite/internal/util/worker/GridWorker.java | 14 +- .../visor/node/VisorGridConfiguration.java | 12 - .../visor/node/VisorNodeDataCollectorJob.java | 37 +- .../node/VisorNodeDataCollectorJobResult.java | 28 - .../visor/node/VisorNodeDataCollectorTask.java | 6 - .../node/VisorNodeDataCollectorTaskResult.java | 43 +- .../internal/visor/streamer/VisorStreamer.java | 104 - .../streamer/VisorStreamerConfiguration.java | 177 - .../visor/streamer/VisorStreamerMetrics.java | 350 -- .../streamer/VisorStreamerMetricsResetTask.java | 75 - .../visor/streamer/VisorStreamerResetTask.java | 75 - .../streamer/VisorStreamerStageMetrics.java | 277 -- .../org/apache/ignite/lang/IgniteFuture.java | 31 +- .../jdk/JdkMarshallerObjectInputStream.java | 4 +- .../optimized/OptimizedClassDescriptor.java | 288 +- .../optimized/OptimizedMarshaller.java | 30 +- .../optimized/OptimizedMarshallerUtils.java | 52 +- .../optimized/OptimizedObjectInputStream.java | 111 +- .../optimized/OptimizedObjectOutputStream.java | 84 +- .../jobstealing/JobStealingCollisionSpi.java | 2 +- .../communication/tcp/TcpCommunicationSpi.java | 11 +- .../deployment/local/LocalDeploymentSpi.java | 2 +- .../discovery/tcp/TcpClientDiscoverySpi.java | 2 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 2 +- .../memory/MemoryEventStorageSpi.java | 2 +- .../adaptive/AdaptiveLoadBalancingSpi.java | 2 +- .../roundrobin/RoundRobinLoadBalancingSpi.java | 2 +- .../WeightedRandomLoadBalancingSpi.java | 2 +- .../spi/swapspace/file/FileSwapSpaceSpi.java | 2 +- .../apache/ignite/stream/StreamTransformer.java | 26 +- .../org/apache/ignite/stream/StreamVisitor.java | 53 + .../ignite/streamer/StreamerConfiguration.java | 249 -- .../apache/ignite/streamer/StreamerContext.java | 142 - .../ignite/streamer/StreamerEventRouter.java | 55 - .../streamer/StreamerEventRouterAdapter.java | 60 - .../streamer/StreamerFailureListener.java | 44 - .../apache/ignite/streamer/StreamerMBean.java | 169 - .../apache/ignite/streamer/StreamerMetrics.java | 209 - .../apache/ignite/streamer/StreamerStage.java | 61 - .../ignite/streamer/StreamerStageMBean.java | 114 - .../ignite/streamer/StreamerStageMetrics.java | 93 - .../apache/ignite/streamer/StreamerWindow.java | 206 - .../ignite/streamer/StreamerWindowMBean.java | 58 - .../ignite/streamer/StreamerWindowMetrics.java | 44 - .../ignite/streamer/index/StreamerIndex.java | 305 -- .../streamer/index/StreamerIndexEntry.java | 57 - .../streamer/index/StreamerIndexPolicy.java | 50 - .../streamer/index/StreamerIndexProvider.java | 107 - .../index/StreamerIndexProviderAdapter.java | 796 ---- .../index/StreamerIndexProviderMBean.java | 74 - .../streamer/index/StreamerIndexUpdateSync.java | 77 - .../streamer/index/StreamerIndexUpdater.java | 88 - .../index/hash/StreamerHashIndexProvider.java | 500 --- .../streamer/index/hash/package-info.java | 21 - .../ignite/streamer/index/package-info.java | 21 - .../index/tree/StreamerTreeIndexProvider.java | 956 ----- .../streamer/index/tree/package-info.java | 21 - .../apache/ignite/streamer/package-info.java | 21 - .../router/StreamerAffinityEventRouter.java | 150 - .../StreamerCacheAffinityEventRouter.java | 70 - .../router/StreamerLocalEventRouter.java | 46 - .../router/StreamerRandomEventRouter.java | 89 - .../router/StreamerRoundRobinEventRouter.java | 53 - .../ignite/streamer/router/package-info.java | 21 - .../window/StreamerBoundedSizeBatchWindow.java | 804 ---- .../window/StreamerBoundedSizeSortedWindow.java | 218 - .../window/StreamerBoundedSizeWindow.java | 144 - .../StreamerBoundedSizeWindowAdapter.java | 357 -- .../window/StreamerBoundedTimeBatchWindow.java | 906 ----- .../window/StreamerBoundedTimeWindow.java | 462 --- .../window/StreamerUnboundedWindow.java | 111 - .../streamer/window/StreamerWindowAdapter.java | 537 --- .../ignite/streamer/window/package-info.java | 21 - .../org/jdk8/backport/ConcurrentHashMap8.java | 3823 ------------------ .../jdk8/backport/ConcurrentLinkedDeque8.java | 1983 --------- .../jdk8/backport/ConcurrentLinkedHashMap.java | 2170 ---------- .../main/java/org/jdk8/backport/LongAdder.java | 235 -- .../main/java/org/jdk8/backport/Striped64.java | 370 -- .../org/jdk8/backport/ThreadLocalRandom8.java | 231 -- .../org/jetbrains/annotations/package-info.java | 27 + .../java/org/jsr166/ConcurrentHashMap8.java | 3794 +++++++++++++++++ .../java/org/jsr166/ConcurrentLinkedDeque8.java | 1954 +++++++++ .../org/jsr166/ConcurrentLinkedHashMap.java | 2141 ++++++++++ .../src/main/java/org/jsr166/LongAdder8.java | 206 + .../src/main/java/org/jsr166/Striped64_8.java | 346 ++ .../java/org/jsr166/ThreadLocalRandom8.java | 202 + .../src/main/java/org/jsr166/package-info.java | 10 + .../java/org/pcollections/AmortizedPQueue.java | 156 - .../main/java/org/pcollections/ConsPStack.java | 225 -- .../src/main/java/org/pcollections/Empty.java | 47 - .../main/java/org/pcollections/HashPMap.java | 175 - .../java/org/pcollections/HashTreePBag.java | 47 - .../java/org/pcollections/HashTreePMap.java | 52 - .../java/org/pcollections/HashTreePSet.java | 46 - .../src/main/java/org/pcollections/IntTree.java | 320 -- .../main/java/org/pcollections/IntTreePMap.java | 165 - .../src/main/java/org/pcollections/MapPBag.java | 143 - .../src/main/java/org/pcollections/MapPSet.java | 101 - .../main/java/org/pcollections/OrderedPSet.java | 85 - .../src/main/java/org/pcollections/PBag.java | 23 - .../main/java/org/pcollections/PCollection.java | 56 - .../src/main/java/org/pcollections/PMap.java | 49 - .../main/java/org/pcollections/POrderedSet.java | 25 - .../src/main/java/org/pcollections/PQueue.java | 38 - .../main/java/org/pcollections/PSequence.java | 73 - .../src/main/java/org/pcollections/PSet.java | 23 - .../src/main/java/org/pcollections/PStack.java | 51 - .../src/main/java/org/pcollections/PVector.java | 45 - .../org/pcollections/SimpleImmutableEntry.java | 146 - .../main/java/org/pcollections/TreePVector.java | 155 - .../resources/META-INF/classnames.properties | 8 +- .../resources/META-INF/licenses/apache-2.0.txt | 202 - .../META-INF/licenses/gnu-gplv2ce-license.txt | 349 -- .../resources/META-INF/licenses/snaptree.txt | 35 - .../core/src/main/resources/ignite.properties | 2 +- modules/core/src/test/config/example-cache.xml | 1 - .../core/src/test/config/examples.properties | 14 +- .../test/config/websession/example-cache.xml | 2 +- ...eJdbcStoreAbstractMultithreadedSelfTest.java | 2 +- ...CacheJdbcBlobStoreMultithreadedSelfTest.java | 8 +- .../internal/ClusterNodeMetricsSelfTest.java | 31 +- .../GridProjectionForCachesSelfTest.java | 15 +- .../GridDeploymentMessageCountSelfTest.java | 2 +- .../discovery/GridDiscoveryManagerSelfTest.java | 8 +- .../GridAffinityProcessorAbstractSelfTest.java | 2 +- .../GridCacheAbstractRemoveFailureTest.java | 3 +- .../cache/GridCacheAbstractSelfTest.java | 2 +- .../cache/GridCacheClearLocallySelfTest.java | 6 +- ...idCacheConfigurationConsistencySelfTest.java | 2 +- .../GridCacheInterceptorAbstractSelfTest.java | 2 +- ...heOffHeapTieredEvictionAbstractSelfTest.java | 9 +- .../GridCacheOnCopyFlagAbstractSelfTest.java | 2 +- ...ridCacheReplicatedSynchronousCommitTest.java | 2 +- .../GridCacheWriteBehindStoreSelfTest.java | 2 +- .../cache/IgniteCacheAbstractTest.java | 2 +- .../cache/IgniteCacheDynamicStopSelfTest.java | 130 + .../IgniteCacheEntryListenerAbstractTest.java | 13 +- .../cache/IgniteDynamicCacheStartSelfTest.java | 431 +- ...titionedAtomicSequenceMultiThreadedTest.java | 48 +- .../GridCacheClientModesAbstractSelfTest.java | 2 +- ...chePartitionedReloadAllAbstractSelfTest.java | 3 +- .../dht/GridCacheGlobalLoadTest.java | 2 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 2 +- ...GridCacheValueConsistencyAtomicSelfTest.java | 2 +- ...idCacheNearOnlyMultiNodeFullApiSelfTest.java | 2 +- .../near/GridCacheNearOnlyTopologySelfTest.java | 8 +- ...heNearOnlyLruNearEvictionPolicySelfTest.java | 2 +- .../IgniteCacheExpiryPolicyAbstractTest.java | 79 +- ...eCacheExpiryPolicyWithStoreAbstractTest.java | 40 +- .../IgniteCacheLoadAllAbstractTest.java | 2 +- .../IgniteCacheLoaderWriterAbstractTest.java | 2 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 45 +- .../DataStreamProcessorSelfTest.java | 2 +- .../IgniteDataStreamerPerformanceTest.java | 4 +- .../processors/igfs/IgfsCacheSelfTest.java | 15 +- .../processors/igfs/IgfsSizeSelfTest.java | 4 +- .../processors/service/DummyService.java | 6 +- .../streamer/GridStreamerEvictionSelfTest.java | 163 - .../streamer/GridStreamerFailoverSelfTest.java | 267 -- .../GridStreamerLifecycleAwareSelfTest.java | 212 - .../streamer/GridStreamerSelfTest.java | 796 ---- .../processors/streamer/GridTestStage.java | 52 - .../streamer/GridTestStreamerEventRouter.java | 49 - .../ignite/internal/processors/streamer/SC.java | 31 - .../util/future/GridCompoundFutureSelfTest.java | 3 +- .../future/GridFutureListenPerformanceTest.java | 4 +- .../util/future/GridFutureQueueTest.java | 2 +- .../ipc/shmem/IpcSharedMemorySpaceSelfTest.java | 2 +- .../offheap/GridOffHeapMapAbstractSelfTest.java | 3 +- ...idOffHeapPartitionedMapAbstractSelfTest.java | 2 +- ...apPartitionedMapPerformanceAbstractTest.java | 2 +- .../unsafe/GridUnsafeMemorySelfTest.java | 11 +- .../ignite/jvmtest/BlockingQueueTest.java | 4 +- .../ignite/jvmtest/ConcurrentMapTest.java | 2 +- .../ignite/lang/GridBasicPerformanceTest.java | 2 +- .../lang/GridFutureListenPerformanceTest.java | 4 +- .../GridImmutableCollectionsPerfomanceTest.java | 120 - .../lang/GridMetadataAwareAdapterSelfTest.java | 14 +- .../GridCircularBufferPerformanceTest.java | 11 +- .../lang/utils/GridCircularBufferSelfTest.java | 2 +- .../utils/GridConcurrentHashMapSelfTest.java | 4 +- .../GridConcurrentLinkedHashMapSelfTest.java | 2 +- .../ignite/lang/utils/GridPCollectionsTest.java | 54 - .../ignite/lang/utils/GridTrieMapSelfTest.java | 242 -- ...idFileSwapSpaceSpiMultithreadedLoadTest.java | 2 +- .../colocation/GridTestCacheStore.java | 5 +- .../communication/GridIoManagerBenchmark.java | 4 +- .../communication/GridIoManagerBenchmark0.java | 9 +- .../GridTcpCommunicationBenchmark.java | 6 +- .../GridContinuousOperationsLoadTest.java | 7 +- .../ignite/loadtests/dsi/GridDsiPerfJob.java | 2 +- ...dBoundedConcurrentLinkedHashSetLoadTest.java | 8 +- .../job/GridJobExecutionLoadTestClient.java | 4 +- ...GridJobExecutionLoadTestClientSemaphore.java | 4 +- ...JobExecutionSingleNodeSemaphoreLoadTest.java | 6 +- .../GridConcurrentLinkedHashMapBenchmark.java | 6 +- ...apPartitionedMapPerformanceAbstractTest.java | 2 +- .../ignite/loadtests/streamer/EventClosure.java | 60 - .../streamer/GridStreamerBenchmark.java | 140 - .../streamer/GridStreamerIndexLoadTest.java | 179 - .../loadtests/streamer/GridStreamerLoad.java | 62 - .../ignite/loadtests/streamer/IndexUpdater.java | 46 - .../ignite/loadtests/streamer/QueryClosure.java | 107 - .../loadtests/streamer/average/TestAverage.java | 70 - .../loadtests/streamer/average/TestStage.java | 63 - .../marshaller/GridMarshallerAbstractTest.java | 56 - .../marshaller/MarshallerContextTestImpl.java | 2 +- ...arshallerSerialPersistentFieldsSelfTest.java | 110 + .../optimized/OptimizedMarshallerTest.java | 4 +- .../OptimizedObjectStreamSelfTest.java | 22 +- .../tcp/GridTcpCommunicationSpiLanTest.java | 2 +- ...cpCommunicationSpiMultithreadedSelfTest.java | 2 +- .../file/GridFileSwapSpaceSpiSelfTest.java | 3 +- .../inmemory/GridTestSwapSpaceSpi.java | 2 +- .../index/GridStreamerIndexSelfTest.java | 686 ---- .../window/GridStreamerWindowSelfTest.java | 911 ----- .../testframework/junits/GridAbstractTest.java | 3 +- .../ignite/testframework/junits/IgniteMock.java | 20 +- .../junits/common/GridAbstractExamplesTest.java | 2 +- .../ignite/testsuites/IgniteBasicTestSuite.java | 3 - .../ignite/testsuites/IgniteCacheTestSuite.java | 5 +- .../IgniteMarshallerSelfTestSuite.java | 1 + .../testsuites/IgniteStreamerSelfTestSuite.java | 46 - ...dConcurrentLinkedDequeMultiThreadedTest.java | 6 +- .../util/GridConcurrentLinkedDequeSelfTest.java | 6 +- ...rrentLinkedHashMapMultiThreadedSelfTest.java | 4 +- modules/core/src/test/webapp/WEB-INF/web.xml | 4 +- .../processors/hadoop/HadoopClassLoader.java | 2 +- .../hadoop/counter/HadoopCountersImpl.java | 2 +- .../processors/hadoop/igfs/HadoopIgfsIpcIo.java | 2 +- .../hadoop/igfs/HadoopIgfsOutProc.java | 2 +- .../hadoop/jobtracker/HadoopJobTracker.java | 2 +- .../taskexecutor/HadoopExecutorService.java | 2 +- .../external/HadoopExternalTaskExecutor.java | 2 +- .../HadoopExternalCommunication.java | 6 +- .../hadoop/v1/HadoopV1ReduceTask.java | 5 +- .../processors/hadoop/v2/HadoopV2Job.java | 2 +- .../hadoop/v2/HadoopV2ReduceTask.java | 5 +- .../HadoopIgfs20FileSystemAbstractSelfTest.java | 4 +- .../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 12 +- .../IgniteHadoopFileSystemAbstractSelfTest.java | 2 +- .../hadoop/HadoopCommandLineTest.java | 2 +- .../processors/hadoop/HadoopMapReduceTest.java | 24 +- .../processors/hadoop/HadoopSharedMap.java | 2 +- .../taskexecutor/HadoopExecutorServiceTest.java | 7 +- .../cache/hibernate/HibernateRegionFactory.java | 15 +- .../processors/query/h2/IgniteH2Indexing.java | 34 +- .../processors/query/h2/opt/GridH2Table.java | 2 +- .../query/h2/opt/GridLuceneIndex.java | 8 +- .../query/h2/sql/GridSqlQueryParser.java | 4 +- .../query/h2/twostep/GridMapQueryExecutor.java | 2 +- .../query/h2/twostep/GridMergeIndex.java | 2 +- .../h2/twostep/GridReduceQueryExecutor.java | 15 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 6 +- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 66 +- .../GridCacheQueryIndexDisabledSelfTest.java | 16 +- .../cache/GridCacheQuerySimpleBenchmark.java | 9 +- .../processors/cache/GridCacheSwapSelfTest.java | 2 +- .../IgniteCacheAbstractFieldsQuerySelfTest.java | 36 +- .../cache/IgniteCacheAbstractQuerySelfTest.java | 89 +- ...gniteCacheSqlQueryMultiThreadedSelfTest.java | 4 +- .../IgniteCacheAtomicFieldsQuerySelfTest.java | 2 +- .../IgniteCachePartitionedQuerySelfTest.java | 8 +- ...gniteCacheReplicatedFieldsQuerySelfTest.java | 2 +- .../IgniteCacheReplicatedQuerySelfTest.java | 16 +- .../local/IgniteCacheLocalQuerySelfTest.java | 7 +- .../http/jetty/GridJettyRestHandler.java | 5 +- .../ignite/scalar/pimps/ScalarCachePimp.scala | 4 +- .../test/resources/spring-ping-pong-partner.xml | 2 +- .../processors/schedule/ScheduleFutureImpl.java | 11 - modules/schema-import/pom.xml | 11 +- modules/schema-import/readme.txt | 4 +- .../ignite/schema/generator/CodeGenerator.java | 556 +++ .../ignite/schema/generator/PojoGenerator.java | 414 -- .../schema/generator/SnippetGenerator.java | 144 - .../ignite/schema/generator/XmlGenerator.java | 14 +- .../org/apache/ignite/schema/ui/Controls.java | 42 +- .../ignite/schema/ui/SchemaImportApp.java | 168 +- .../schema/test/AbstractSchemaImportTest.java | 19 +- .../test/generator/CodeGeneratorTest.java | 70 + .../test/generator/PojoGeneratorTest.java | 70 - .../testsuites/IgniteSchemaImportTestSuite.java | 2 +- .../org/apache/ignite/IgniteSpringBean.java | 32 +- .../apache/ignite/cache/spring/SpringCache.java | 142 +- .../ignite/cache/spring/SpringCacheManager.java | 105 +- .../cache/spring/SpringDynamicCacheManager.java | 339 -- .../ignite/internal/GridFactorySelfTest.java | 40 + .../spring/GridSpringCacheManagerSelfTest.java | 107 +- .../GridSpringDynamicCacheManagerSelfTest.java | 219 - .../GridSpringDynamicCacheTestService.java | 34 +- .../org/apache/ignite/spring/spring-caching.xml | 10 + .../ignite/spring/spring-dynamic-caching.xml | 43 - .../testsuites/IgniteSpringTestSuite.java | 1 - modules/ssh/licenses/jcraft-revised-bsd.txt | 4 +- .../licenses/jcraft-revised-bsd.txt | 4 +- .../ignite/visor/commands/VisorConsole.scala | 6 +- .../commands/cache/VisorCacheCommand.scala | 4 +- .../visor/commands/logo_ignite_128x128.png | Bin 18667 -> 0 bytes .../ignite/visor/commands/logo_ignite_48x48.png | Bin 16572 -> 0 bytes .../cache/websession/IgniteWebSession.java | 286 -- .../websession/IgniteWebSessionFilter.java | 466 --- .../websession/IgniteWebSessionListener.java | 196 - .../ignite/cache/websession/WebSession.java | 286 ++ .../cache/websession/WebSessionFilter.java | 467 +++ .../cache/websession/WebSessionListener.java | 196 + .../IgniteServletContextListenerStartup.java | 181 - .../startup/servlet/IgniteServletStartup.java | 187 - .../servlet/ServletContextListenerStartup.java | 181 + .../ignite/startup/servlet/ServletStartup.java | 187 + .../cache/IgniteSqlQueryJoinBenchmark.java | 2 +- pom.xml | 40 +- 717 files changed, 19454 insertions(+), 43008 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/18f37fe1/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinBenchmark.java ---------------------------------------------------------------------- diff --cc modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinBenchmark.java index e47d6f5,4ab757a..457b67d --- a/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinBenchmark.java +++ b/modules/yardstick/src/main/java/org/apache/ignite/yardstick/cache/IgniteSqlQueryJoinBenchmark.java @@@ -106,6 -106,11 +106,6 @@@ public class IgniteSqlQueryJoinBenchmar qry.setArgs(minSalary, maxSalary); - return cache.queryFields(qry).getAll(); + return cache.query(qry).getAll(); } - - /** {@inheritDoc} */ - @Override protected IgniteCache<Integer, Object> cache() { - return ignite().jcache("query"); - } }
