Merge branch ignite-sql-tests into ignite-45
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/c82d4d8e Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/c82d4d8e Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/c82d4d8e Branch: refs/heads/ignite-45 Commit: c82d4d8e4ef06207564f36a2f1248c85286c7b1a Parents: 910cdda a0d6f5d Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Fri Mar 13 18:43:03 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Fri Mar 13 18:43:03 2015 -0700 ---------------------------------------------------------------------- DEVNOTES.txt | 20 +- LICENSE.txt | 54 +- NOTICE.txt | 11 + RELEASE_NOTES.txt | 0 assembly/dependencies-optional-fabric.xml | 2 +- assembly/dependencies-optional-hadoop.xml | 2 +- assembly/dependencies-schema-import.xml | 56 + assembly/dependencies-schema-load.xml | 56 - assembly/release-hadoop.xml | 16 +- bin/ignite-schema-import.bat | 97 + bin/ignite-schema-import.sh | 78 + bin/ignite-schema-load.bat | 116 - bin/ignite-schema-load.sh | 78 - bin/include/igniteservice.exe | Bin 6144 -> 0 bytes config/hadoop/default-config.xml | 10 +- docs/core-site.ignite.xml | 90 - docs/hadoop_readme.md | 117 - docs/hadoop_readme.pdf | Bin 82297 -> 0 bytes docs/hive-site.ignite.xml | 37 - docs/mapred-site.ignite.xml | 66 - examples/config/example-cache.xml | 46 +- examples/config/filesystem/example-igfs.xml | 24 +- examples/config/store/example-database.script | 27 + .../config/store/example-jdbc-pojo-store.xml | 142 ++ .../failover/ComputeFailoverExample.java | 1 + .../datagrid/CacheDataLoaderExample.java | 91 - .../datagrid/CacheDataStreamerExample.java | 91 + .../datagrid/CachePopularNumbersExample.java | 18 +- .../examples/datagrid/CacheQueryExample.java | 77 +- .../starschema/CacheStarSchemaExample.java | 21 +- .../datagrid/starschema/DimProduct.java | 3 +- .../examples/datagrid/starschema/DimStore.java | 3 +- .../datagrid/starschema/FactPurchase.java | 2 + .../store/CacheNodeWithStoreStartup.java | 30 + .../datagrid/store/CacheStoreExample.java | 1 + .../store/CacheStoreLoadDataExample.java | 20 +- .../ignite/examples/datagrid/store/Person.java | 103 - .../store/dummy/CacheDummyPersonStore.java | 3 +- .../hibernate/CacheHibernatePersonStore.java | 2 +- .../datagrid/store/hibernate/Person.hbm.xml | 2 +- .../datagrid/store/hibernate/hibernate.cfg.xml | 3 - .../store/jdbc/CacheJdbcPersonStore.java | 4 +- .../store/jdbc/CacheJdbcPojoPersonStore.java | 96 + .../examples/datagrid/store/model/Person.java | 155 ++ .../datagrid/store/model/PersonKey.java | 97 + .../MemcacheRestExampleNodeStartup.java | 12 +- .../apache/ignite/examples/ComputeExample.java | 2 +- .../ScalarCachePopularNumbersExample.scala | 47 +- .../ignite/examples/CacheExamplesSelfTest.java | 6 +- ipc/shmem/compile | 4 + ipc/shmem/config.guess | 4 + ipc/shmem/config.sub | 4 + ipc/shmem/depcomp | 4 + ipc/shmem/ltmain.sh | 3 + ipc/shmem/missing | 4 + modules/clients/readme.md | 17 + .../ignite/jdbc/JdbcComplexQuerySelfTest.java | 8 +- .../ignite/jdbc/JdbcEmptyCacheSelfTest.java | 2 +- .../ignite/jdbc/JdbcLocalCachesSelfTest.java | 16 +- .../ignite/jdbc/JdbcMetadataSelfTest.java | 6 +- .../jdbc/JdbcPreparedStatementSelfTest.java | 5 +- .../ignite/jdbc/JdbcResultSetSelfTest.java | 7 +- .../ignite/jdbc/JdbcStatementSelfTest.java | 7 +- .../clients/src/test/resources/spring-cache.xml | 23 +- .../src/test/resources/spring-server-node.xml | 7 - .../test/resources/spring-server-ssl-node.xml | 4 - modules/codegen/pom.xml | 6 + .../ignite/codegen/MessageCodeGenerator.java | 12 +- modules/core/licenses/snaptree-bsd-license.txt | 35 + modules/core/licenses/snaptree-license.txt | 35 - modules/core/licenses/sun-bcl-license.txt | 50 - modules/core/pom.xml | 13 + .../META-INF/native/linux64/libigniteshmem.so | Bin 138345 -> 0 bytes .../META-INF/native/osx/libigniteshmem.dylib | Bin 33116 -> 0 bytes .../src/main/java/org/apache/ignite/Ignite.java | 10 +- .../java/org/apache/ignite/IgniteCache.java | 92 +- .../org/apache/ignite/IgniteDataLoader.java | 379 ---- .../org/apache/ignite/IgniteDataStreamer.java | 401 ++++ .../apache/ignite/cache/CachePreloadMode.java | 67 - .../apache/ignite/cache/CacheRebalanceMode.java | 67 + .../java/org/apache/ignite/cache/GridCache.java | 12 +- .../org/apache/ignite/cache/query/Query.java | 72 +- .../apache/ignite/cache/query/QueryMetrics.java | 4 +- .../ignite/cache/query/QueryTypeResolver.java | 32 - .../org/apache/ignite/cache/query/SqlQuery.java | 9 +- .../query/annotations/QuerySqlFunction.java | 4 +- .../store/jdbc/CacheAbstractJdbcStore.java | 33 +- .../cache/store/jdbc/CacheJdbcPojoStore.java | 52 +- .../apache/ignite/cluster/ClusterMetrics.java | 66 +- .../configuration/CacheConfiguration.java | 511 ++--- .../configuration/CacheQueryConfiguration.java | 182 -- .../configuration/FileSystemConfiguration.java | 55 +- .../configuration/IgniteConfiguration.java | 20 +- .../configuration/QueryConfiguration.java | 227 -- .../ignite/events/CachePreloadingEvent.java | 172 -- .../ignite/events/CacheQueryExecutedEvent.java | 2 + .../ignite/events/CacheQueryReadEvent.java | 2 + .../ignite/events/CacheRebalancingEvent.java | 172 ++ .../java/org/apache/ignite/events/Event.java | 2 +- .../org/apache/ignite/events/EventType.java | 44 +- .../igfs/IgfsIpcEndpointConfiguration.java | 241 ++ .../apache/ignite/igfs/IgfsIpcEndpointType.java | 29 + .../ClusterLocalNodeMetricsMXBeanImpl.java | 5 + .../ignite/internal/ClusterMetricsSnapshot.java | 26 +- .../ignite/internal/GridKernalContext.java | 8 +- .../ignite/internal/GridKernalContextImpl.java | 12 +- .../org/apache/ignite/internal/GridTopic.java | 2 +- .../apache/ignite/internal/IgniteKernal.java | 16 +- .../org/apache/ignite/internal/IgnitionEx.java | 11 +- .../managers/communication/GridIoManager.java | 8 +- .../communication/GridIoMessageFactory.java | 34 +- .../processors/cache/CacheProjection.java | 65 +- .../cache/CacheWeakQueryIteratorsHolder.java | 2 +- .../processors/cache/GridCacheAdapter.java | 188 +- .../cache/GridCacheClearAllRunnable.java | 5 +- .../processors/cache/GridCacheContext.java | 10 +- .../processors/cache/GridCacheEventManager.java | 12 +- .../cache/GridCacheEvictionManager.java | 6 +- .../processors/cache/GridCacheMapEntry.java | 2 +- .../GridCachePartitionExchangeManager.java | 6 +- .../processors/cache/GridCacheProcessor.java | 69 +- .../cache/GridCacheProjectionImpl.java | 25 + .../processors/cache/GridCacheProxyImpl.java | 60 + .../processors/cache/GridCacheSwapListener.java | 5 +- .../processors/cache/GridCacheSwapManager.java | 29 +- .../processors/cache/GridCacheUtils.java | 5 +- .../processors/cache/IgniteCacheProxy.java | 195 +- .../processors/cache/QueryCursorImpl.java | 87 + .../GridDistributedCacheAdapter.java | 10 +- .../distributed/dht/GridDhtLocalPartition.java | 4 +- .../distributed/dht/GridDhtLockFuture.java | 4 +- .../dht/GridDhtPartitionTopologyImpl.java | 14 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 10 +- .../dht/preloader/GridDhtForceKeysFuture.java | 30 +- .../preloader/GridDhtPartitionDemandPool.java | 78 +- .../preloader/GridDhtPartitionSupplyPool.java | 22 +- .../dht/preloader/GridDhtPreloader.java | 14 +- .../processors/cache/query/CacheQuery.java | 2 +- .../query/GridCacheDistributedQueryManager.java | 2 + .../cache/query/GridCacheQueriesEx.java | 9 +- .../cache/query/GridCacheQueriesImpl.java | 11 +- .../cache/query/GridCacheQueriesProxy.java | 4 +- .../cache/query/GridCacheQueryAdapter.java | 3 +- .../cache/query/GridCacheQueryManager.java | 16 +- .../cache/query/GridCacheSqlQuery.java | 2 +- .../cache/query/GridCacheSqlResult.java | 29 - .../cache/query/GridCacheTwoStepQuery.java | 2 +- .../processors/cache/query/QueryCursorImpl.java | 87 - .../continuous/CacheContinuousQueryHandler.java | 3 + .../transactions/IgniteTxLocalAdapter.java | 3 +- .../version/GridCacheRawVersionedEntry.java | 4 +- .../IgniteCacheObjectProcessorImpl.java | 3 +- .../dataload/GridDataLoadCacheUpdaters.java | 206 -- .../dataload/GridDataLoadRequest.java | 451 ---- .../dataload/GridDataLoadResponse.java | 166 -- .../dataload/GridDataLoadUpdateJob.java | 150 -- .../dataload/GridDataLoaderFuture.java | 62 - .../dataload/GridDataLoaderProcessor.java | 307 --- .../dataload/IgniteDataLoaderEntry.java | 170 -- .../dataload/IgniteDataLoaderImpl.java | 1391 ------------ .../internal/processors/dataload/package.html | 24 - .../datastreamer/DataStreamProcessor.java | 307 +++ .../datastreamer/DataStreamerCacheUpdaters.java | 206 ++ .../datastreamer/DataStreamerEntry.java | 170 ++ .../datastreamer/DataStreamerFuture.java | 60 + .../datastreamer/DataStreamerImpl.java | 1403 ++++++++++++ .../datastreamer/DataStreamerRequest.java | 451 ++++ .../datastreamer/DataStreamerResponse.java | 166 ++ .../datastreamer/DataStreamerUpdateJob.java | 150 ++ .../processors/datastreamer/package.html | 24 + .../dr/GridDrDataLoadCacheUpdater.java | 92 - .../dr/IgniteDrDataStreamerCacheUpdater.java | 92 + .../processors/igfs/IgfsDataManager.java | 25 +- .../internal/processors/igfs/IgfsImpl.java | 2 +- .../internal/processors/igfs/IgfsProcessor.java | 5 +- .../internal/processors/igfs/IgfsServer.java | 49 +- .../processors/igfs/IgfsServerManager.java | 35 +- .../processors/query/GridQueryIndexing.java | 34 +- .../processors/query/GridQueryProcessor.java | 509 ++--- .../query/GridQueryTypeDescriptor.java | 18 +- .../messages/GridQueryCancelRequest.java | 114 + .../twostep/messages/GridQueryFailResponse.java | 140 ++ .../messages/GridQueryNextPageRequest.java | 167 ++ .../messages/GridQueryNextPageResponse.java | 240 ++ .../h2/twostep/messages/GridQueryRequest.java | 211 ++ .../processors/rest/GridRestCommand.java | 8 +- .../processors/rest/GridRestProcessor.java | 2 - .../processors/streamer/IgniteStreamerImpl.java | 4 +- .../util/ipc/IpcServerEndpointDeserializer.java | 66 - .../visor/cache/VisorCacheCompactTask.java | 66 - .../visor/cache/VisorCacheConfiguration.java | 14 +- .../cache/VisorCacheDefaultConfiguration.java | 1 - .../cache/VisorCachePreloadConfiguration.java | 16 +- .../cache/VisorCacheQueryConfiguration.java | 120 + .../node/VisorCacheQueryConfiguration.java | 106 - .../visor/node/VisorGridConfiguration.java | 11 - .../visor/node/VisorIgfsConfiguration.java | 5 +- .../visor/node/VisorQueryConfiguration.java | 138 -- .../mxbean/ClusterLocalNodeMetricsMXBean.java | 4 + .../spi/discovery/tcp/TcpDiscoverySpi.java | 7 +- .../spi/indexing/IndexingQueryFilter.java | 2 +- .../ignite/spi/indexing/noop/package.html | 24 + .../spi/swapspace/file/FileSwapSpaceSpi.java | 10 +- .../resources/META-INF/classnames.properties | 34 +- .../resources/META-INF/licenses/apache-2.0.txt | 0 .../core/src/test/bin/start-nodes-custom.bat | 3 +- .../spring-cache-client-benchmark-1.xml | 2 - .../spring-cache-client-benchmark-2.xml | 2 - .../spring-cache-client-benchmark-3.xml | 2 - .../core/src/test/config/discovery-stress.xml | 3 +- modules/core/src/test/config/example-cache.xml | 7 +- modules/core/src/test/config/igfs-loopback.xml | 8 +- modules/core/src/test/config/igfs-shmem.xml | 10 +- .../src/test/config/load/cache-benchmark.xml | 2 - .../test/config/load/cache-client-benchmark.xml | 2 - .../config/load/dsi-49-server-production.xml | 4 +- .../src/test/config/load/dsi-load-client.xml | 4 +- .../src/test/config/load/dsi-load-server.xml | 4 +- modules/core/src/test/config/log4j-test.xml | 6 + .../core/src/test/config/spring-cache-load.xml | 2 +- .../config/spring-cache-put-remove-load.xml | 2 - .../core/src/test/config/spring-multicache.xml | 16 +- modules/core/src/test/config/start-nodes.ini | 15 + .../test/config/websession/spring-cache-1.xml | 6 +- .../test/config/websession/spring-cache-2.xml | 6 +- .../test/config/websession/spring-cache-3.xml | 6 +- .../ignite/igfs/IgfsEventsAbstractSelfTest.java | 5 +- .../igfs/IgfsFragmentizerAbstractSelfTest.java | 2 - .../ignite/internal/ClusterMetricsSelfTest.java | 2 + .../GridDiscoveryManagerAliveCacheSelfTest.java | 5 +- .../GridCacheAbstractFailoverSelfTest.java | 4 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 196 +- .../GridCacheAbstractLocalStoreSelfTest.java | 8 +- .../cache/GridCacheAbstractSelfTest.java | 8 + ...acheAbstractUsersAffinityMapperSelfTest.java | 4 +- .../cache/GridCacheBasicStoreAbstractTest.java | 4 +- .../GridCacheConcurrentTxMultiNodeTest.java | 9 +- ...idCacheConfigurationConsistencySelfTest.java | 28 +- ...ridCacheConfigurationValidationSelfTest.java | 8 +- .../GridCacheDeploymentOffHeapSelfTest.java | 1 - .../cache/GridCacheDeploymentSelfTest.java | 4 +- .../GridCacheFieldsQueryNoDataSelfTest.java | 83 - ...idCacheGetAndTransformStoreAbstractTest.java | 4 +- .../cache/GridCacheIncrementTransformTest.java | 4 +- .../cache/GridCacheKeyCheckSelfTest.java | 1 - .../processors/cache/GridCacheLeakTest.java | 1 - .../cache/GridCacheMemoryModeSelfTest.java | 1 - .../cache/GridCacheMultiUpdateLockSelfTest.java | 4 +- .../cache/GridCacheOffHeapSelfTest.java | 5 +- .../processors/cache/GridCacheOffHeapTest.java | 1 - .../GridCacheOrderedPreloadingSelfTest.java | 6 +- .../cache/GridCacheP2PUndeploySelfTest.java | 10 +- .../cache/GridCachePartitionedGetSelfTest.java | 4 +- ...hePartitionedProjectionAffinitySelfTest.java | 4 +- .../GridCachePreloadingEvictionsSelfTest.java | 6 +- .../cache/GridCachePutAllFailoverSelfTest.java | 1 - .../cache/GridCacheQueryEmbeddedValue.java | 2 + .../cache/GridCacheQueryIndexSelfTest.java | 126 -- .../GridCacheQueryIndexingDisabledSelfTest.java | 1 - .../GridCacheQueryInternalKeysSelfTest.java | 5 +- .../processors/cache/GridCacheStopSelfTest.java | 1 - .../cache/GridCacheSwapPreloadSelfTest.java | 4 +- .../processors/cache/GridCacheTestValue.java | 2 +- .../processors/cache/GridCacheTestValue2.java | 2 + .../GridCacheValueBytesPreloadingSelfTest.java | 2 +- ...idCacheValueConsistencyAbstractSelfTest.java | 4 +- .../IgniteCacheAbstractStopBusySelfTest.java | 2 +- .../cache/IgniteCacheTxPreloadNoWriteTest.java | 111 + ...tAllUpdateNonPreloadedPartitionSelfTest.java | 4 +- .../IgniteTxExceptionAbstractSelfTest.java | 1 - .../cache/IgniteTxMultiNodeAbstractTest.java | 4 + ...dCacheQueueMultiNodeConsistencySelfTest.java | 3 +- .../IgniteCollectionAbstractTest.java | 4 +- ...GridCachePartitionedNodeRestartSelfTest.java | 4 +- ...idCachePartitionedNodeRestartTxSelfTest.java | 4 +- ...PartitionedQueueCreateMultiNodeSelfTest.java | 4 +- .../GridCacheAbstractNodeRestartSelfTest.java | 6 +- ...tractPartitionedByteArrayValuesSelfTest.java | 2 - .../GridCacheAbstractPrimarySyncSelfTest.java | 4 +- ...acheEntrySetIterationPreloadingSelfTest.java | 2 +- ...heExpiredEntriesPreloadAbstractSelfTest.java | 6 +- .../distributed/GridCacheLockAbstractTest.java | 4 +- ...dCacheMultithreadedFailoverAbstractTest.java | 4 +- ...dCachePartitionedAffinityFilterSelfTest.java | 4 +- .../GridCachePreloadEventsAbstractSelfTest.java | 8 +- .../GridCachePreloadLifecycleAbstractTest.java | 6 +- ...GridCachePreloadRestartAbstractSelfTest.java | 10 +- ...iteTxConsistencyRestartAbstractSelfTest.java | 6 +- .../IgniteTxPreloadAbstractTest.java | 6 +- .../dht/GridCacheAtomicNearCacheSelfTest.java | 4 +- ...dCacheColocatedTxSingleThreadedSelfTest.java | 4 +- ...GridCacheDhtEvictionNearReadersSelfTest.java | 4 +- .../dht/GridCacheDhtEvictionSelfTest.java | 4 +- .../dht/GridCacheDhtInternalEntrySelfTest.java | 4 +- .../dht/GridCacheDhtMappingSelfTest.java | 4 +- .../dht/GridCacheDhtPreloadBigDataSelfTest.java | 10 +- .../dht/GridCacheDhtPreloadDelayedSelfTest.java | 26 +- .../GridCacheDhtPreloadDisabledSelfTest.java | 8 +- .../GridCacheDhtPreloadMessageCountTest.java | 4 +- .../dht/GridCacheDhtPreloadOffHeapSelfTest.java | 1 - .../dht/GridCacheDhtPreloadPutGetSelfTest.java | 6 +- .../dht/GridCacheDhtPreloadSelfTest.java | 28 +- .../GridCacheDhtPreloadStartStopSelfTest.java | 12 +- .../dht/GridCacheDhtPreloadUnloadSelfTest.java | 10 +- ...ePartitionedNearDisabledMetricsSelfTest.java | 4 +- ...idCachePartitionedPreloadEventsSelfTest.java | 8 +- ...dCachePartitionedTopologyChangeSelfTest.java | 4 +- ...ridCachePartitionedUnloadEventsSelfTest.java | 12 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 4 +- ...unctionExcludeNeighborsAbstractSelfTest.java | 4 +- ...GridCacheAtomicMultiNodeFullApiSelfTest.java | 5 +- ...idCacheAtomicPartitionedMetricsSelfTest.java | 4 +- .../near/GridCacheNearEvictionSelfTest.java | 4 +- .../near/GridCacheNearMultiGetSelfTest.java | 4 +- .../near/GridCacheNearOnlyTopologySelfTest.java | 4 +- .../GridCacheNearPartitionedClearSelfTest.java | 4 +- .../near/GridCacheNearReadersSelfTest.java | 4 +- .../near/GridCacheNearTxMultiNodeSelfTest.java | 4 +- ...AffinityExcludeNeighborsPerformanceTest.java | 4 +- .../GridCachePartitionedAffinitySelfTest.java | 4 +- .../GridCachePartitionedBasicOpSelfTest.java | 2 +- .../near/GridCachePartitionedEventSelfTest.java | 4 +- ...idCachePartitionedHitsAndMissesSelfTest.java | 16 +- .../GridCachePartitionedMetricsSelfTest.java | 4 +- ...achePartitionedMultiNodeCounterSelfTest.java | 4 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 4 +- .../GridCachePartitionedNodeRestartTest.java | 4 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 4 +- ...achePartitionedPreloadLifecycleSelfTest.java | 4 +- ...hePartitionedQueryMultiThreadedSelfTest.java | 303 --- .../GridCachePartitionedTxSalvageSelfTest.java | 2 +- ...achePartitionedTxSingleThreadedSelfTest.java | 4 +- ...stractReplicatedByteArrayValuesSelfTest.java | 2 - .../GridCacheReplicatedInvalidateSelfTest.java | 4 +- .../GridCacheReplicatedNodeRestartSelfTest.java | 6 +- .../GridCacheSyncReplicatedPreloadSelfTest.java | 6 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 4 +- ...idCacheReplicatedPreloadOffHeapSelfTest.java | 3 +- .../GridCacheReplicatedPreloadSelfTest.java | 16 +- ...eplicatedPreloadStartStopEventsSelfTest.java | 6 +- .../GridCacheEvictionFilterSelfTest.java | 4 +- .../GridCacheLruNearEvictionPolicySelfTest.java | 7 +- ...heNearOnlyLruNearEvictionPolicySelfTest.java | 7 +- .../GridCacheLocalByteArrayValuesSelfTest.java | 1 - ...ridCacheContinuousQueryAbstractSelfTest.java | 33 +- ...dCacheContinuousQueryReplicatedSelfTest.java | 6 +- ...dCacheAbstractReduceFieldsQuerySelfTest.java | 409 ---- ...ridCacheReduceFieldsQueryAtomicSelfTest.java | 38 - ...GridCacheReduceFieldsQueryLocalSelfTest.java | 37 - ...cheReduceFieldsQueryPartitionedSelfTest.java | 59 - ...acheReduceFieldsQueryReplicatedSelfTest.java | 37 - .../dataload/GridDataLoaderImplSelfTest.java | 208 -- .../dataload/GridDataLoaderPerformanceTest.java | 196 -- .../GridDataLoaderProcessorSelfTest.java | 975 --------- .../DataStreamProcessorSelfTest.java | 974 +++++++++ .../datastreamer/DataStreamerImplSelfTest.java | 205 ++ .../IgniteDataStreamerPerformanceTest.java | 196 ++ .../processors/igfs/IgfsAbstractSelfTest.java | 255 ++- ...sCachePerBlockLruEvictionPolicySelfTest.java | 16 +- .../processors/igfs/IgfsCacheSelfTest.java | 1 - .../igfs/IgfsDataManagerSelfTest.java | 1 - .../igfs/IgfsDualAbstractSelfTest.java | 71 +- .../igfs/IgfsExUniversalFileSystemAdapter.java | 87 + .../igfs/IgfsMetaManagerSelfTest.java | 1 - .../processors/igfs/IgfsMetricsSelfTest.java | 16 +- .../processors/igfs/IgfsModesSelfTest.java | 13 +- .../processors/igfs/IgfsProcessorSelfTest.java | 1 - .../igfs/IgfsProcessorValidationSelfTest.java | 7 - ...IpcEndpointRegistrationAbstractSelfTest.java | 23 +- ...dpointRegistrationOnLinuxAndMacSelfTest.java | 7 +- ...pcEndpointRegistrationOnWindowsSelfTest.java | 5 +- .../processors/igfs/IgfsSizeSelfTest.java | 9 +- .../processors/igfs/IgfsStreamsSelfTest.java | 1 - .../processors/igfs/IgfsTaskSelfTest.java | 2 - .../igfs/UniversalFileSystemAdapter.java | 79 + .../IgfsAbstractRecordResolverSelfTest.java | 2 - .../cache/GridCacheCommandHandlerSelfTest.java | 1 - .../IpcServerEndpointDeserializerSelfTest.java | 160 -- .../ipc/shmem/IpcSharedMemoryNodeStartup.java | 10 +- .../loadtests/GridCacheMultiNodeLoadTest.java | 4 +- .../capacity/spring-capacity-cache.xml | 4 +- .../loadtests/colocation/GridTestMain.java | 4 +- .../loadtests/colocation/spring-colocation.xml | 6 +- .../GridContinuousOperationsLoadTest.java | 2 +- .../GridCachePartitionedAtomicLongLoadTest.java | 2 +- .../loadtests/discovery/GridGcTimeoutTest.java | 2 +- .../mapper/GridContinuousMapperLoadTest1.java | 2 +- .../mapper/GridContinuousMapperLoadTest2.java | 2 +- .../ignite/loadtests/mapper/TestObject.java | 2 +- .../swap/GridSwapEvictAllBenchmark.java | 1 - .../marshaller/GridMarshallerAbstractTest.java | 1 - .../GridP2PContinuousDeploymentSelfTest.java | 4 +- .../tcp/GridCacheDhtLockBackupSelfTest.java | 4 +- .../testframework/junits/GridAbstractTest.java | 1 - .../ignite/testframework/junits/IgniteMock.java | 4 +- .../junits/common/GridCommonAbstractTest.java | 4 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 10 +- .../ignite/testsuites/IgniteIgfsTestSuite.java | 2 - .../webapp/META-INF/ignite-webapp-config.xml | 72 +- .../query/h2/GridH2IndexingGeoSelfTest.java | 7 + modules/hadoop/config/core-site.ignite.xml | 90 + modules/hadoop/config/hive-site.ignite.xml | 37 + modules/hadoop/config/mapred-site.ignite.xml | 66 + modules/hadoop/docs/hadoop_readme.md | 135 ++ modules/hadoop/docs/hadoop_readme.pdf | Bin 0 -> 82297 bytes .../fs/IgniteHadoopIgfsSecondaryFileSystem.java | 8 + .../hadoop/fs/v1/IgniteHadoopFileSystem.java | 9 +- .../internal/processors/hadoop/HadoopSetup.java | 33 +- .../hadoop/igfs/HadoopIgfsEndpoint.java | 5 +- .../processors/hadoop/igfs/HadoopIgfsIpcIo.java | 14 +- .../processors/hadoop/igfs/HadoopIgfsUtils.java | 7 +- .../ignite/igfs/Hadoop1DualAbstractTest.java | 105 + .../igfs/Hadoop1OverIgfsDualAsyncTest.java | 30 + .../igfs/Hadoop1OverIgfsDualSyncTest.java | 30 + ...oopFileSystemUniversalFileSystemAdapter.java | 113 + .../HadoopIgfs20FileSystemAbstractSelfTest.java | 8 +- ...Igfs20FileSystemLoopbackPrimarySelfTest.java | 14 +- ...oopIgfs20FileSystemShmemPrimarySelfTest.java | 14 +- .../igfs/HadoopIgfsDualAbstractSelfTest.java | 27 +- ...oopSecondaryFileSystemConfigurationTest.java | 41 +- .../apache/ignite/igfs/IgfsEventsTestSuite.java | 44 +- .../igfs/IgfsNearOnlyMultiNodeSelfTest.java | 11 +- .../IgniteHadoopFileSystemAbstractSelfTest.java | 18 +- .../IgniteHadoopFileSystemClientSelfTest.java | 13 +- ...IgniteHadoopFileSystemHandshakeSelfTest.java | 14 +- .../IgniteHadoopFileSystemIpcCacheSelfTest.java | 12 +- ...niteHadoopFileSystemLoggerStateSelfTest.java | 14 +- ...adoopFileSystemLoopbackAbstractSelfTest.java | 12 +- ...teHadoopFileSystemSecondaryModeSelfTest.java | 27 +- ...teHadoopFileSystemShmemAbstractSelfTest.java | 12 +- .../hadoop/HadoopCommandLineTest.java | 16 +- .../hadoop/HadoopPopularWordsTest.java | 4 +- .../testsuites/IgniteHadoopTestSuite.java | 4 +- .../processors/query/h2/IgniteH2Indexing.java | 701 +++--- .../query/h2/opt/GridH2AbstractKeyValueRow.java | 11 +- .../query/h2/opt/GridH2RowDescriptor.java | 16 +- .../query/h2/opt/GridLuceneIndex.java | 8 +- .../processors/query/h2/sql/GridSqlColumn.java | 6 + .../processors/query/h2/sql/GridSqlElement.java | 31 +- .../query/h2/sql/GridSqlFunction.java | 26 +- .../query/h2/sql/GridSqlFunctionType.java | 3 + .../processors/query/h2/sql/GridSqlJoin.java | 30 +- .../query/h2/sql/GridSqlOperationType.java | 6 +- .../query/h2/sql/GridSqlQueryParser.java | 78 +- .../query/h2/sql/GridSqlQuerySplitter.java | 183 +- .../processors/query/h2/sql/GridSqlSelect.java | 100 +- .../query/h2/sql/GridSqlSortColumn.java | 76 + .../query/h2/twostep/GridMapQueryExecutor.java | 423 +++- .../query/h2/twostep/GridMergeIndex.java | 104 +- .../h2/twostep/GridMergeIndexUnsorted.java | 20 +- .../h2/twostep/GridReduceQueryExecutor.java | 435 +++- .../query/h2/twostep/GridResultPage.java | 47 +- .../twostep/messages/GridNextPageRequest.java | 70 - .../twostep/messages/GridNextPageResponse.java | 191 -- .../query/h2/twostep/messages/GridQueryAck.java | 45 - .../twostep/messages/GridQueryFailResponse.java | 57 - .../h2/twostep/messages/GridQueryRequest.java | 72 - .../GridCacheAbstractFieldsQuerySelfTest.java | 12 +- .../cache/GridCacheAbstractQuerySelfTest.java | 2069 ------------------ .../cache/GridCacheCrossCacheQuerySelfTest.java | 154 +- .../GridCacheCrossCacheQuerySelfTestNewApi.java | 408 ---- .../cache/GridCacheOffHeapAndSwapSelfTest.java | 12 +- ...idCacheQueryEvictsMultiThreadedSelfTest.java | 28 - .../GridCacheQueryIndexDisabledSelfTest.java | 257 +++ .../cache/GridCacheQueryLoadSelfTest.java | 355 --- .../cache/GridCacheQueryMetricsSelfTest.java | 6 - .../GridCacheQueryMultiThreadedSelfTest.java | 868 -------- ...QueryOffheapEvictsMultiThreadedSelfTest.java | 28 - ...dCacheQueryOffheapMultiThreadedSelfTest.java | 28 - .../cache/GridCacheQueryTestValue.java | 2 +- ...idCacheReduceQueryMultithreadedSelfTest.java | 8 +- .../GridCacheSqlQueryMultiThreadedSelfTest.java | 141 -- .../processors/cache/GridCacheSwapSelfTest.java | 5 +- .../cache/GridIndexingWithNoopSwapSelfTest.java | 17 +- .../IgniteCacheAbstractFieldsQuerySelfTest.java | 778 +++++++ .../cache/IgniteCacheAbstractQuerySelfTest.java | 1565 +++++++++++++ .../IgniteCacheFieldsQueryNoDataSelfTest.java | 84 + ...hePartitionedQueryMultiThreadedSelfTest.java | 307 +++ ...teCacheQueryEvictsMultiThreadedSelfTest.java | 28 + .../cache/IgniteCacheQueryIndexSelfTest.java | 133 ++ .../cache/IgniteCacheQueryLoadSelfTest.java | 339 +++ .../IgniteCacheQueryMultiThreadedSelfTest.java | 746 +++++++ ...QueryOffheapEvictsMultiThreadedSelfTest.java | 28 + ...eCacheQueryOffheapMultiThreadedSelfTest.java | 28 + ...gniteCacheSqlQueryMultiThreadedSelfTest.java | 197 ++ .../GridCacheAtomicFieldsQuerySelfTest.java | 66 - ...cheAtomicNearEnabledFieldsQuerySelfTest.java | 30 - ...GridCacheAtomicNearEnabledQuerySelfTest.java | 38 - .../near/GridCacheAtomicQuerySelfTest.java | 38 - ...CachePartitionedQueryP2PEnabledSelfTest.java | 34 - .../near/GridCachePartitionedQuerySelfTest.java | 479 ---- .../near/GridCacheQueryNodeRestartSelfTest.java | 224 -- .../IgniteCacheAtomicFieldsQuerySelfTest.java | 59 + ...cheAtomicNearEnabledFieldsQuerySelfTest.java | 30 + ...niteCacheAtomicNearEnabledQuerySelfTest.java | 38 + .../near/IgniteCacheAtomicQuerySelfTest.java | 38 + ...rtitionedFieldsQueryP2PDisabledSelfTest.java | 34 + ...niteCachePartitionedFieldsQuerySelfTest.java | 57 + ...achePartitionedQueryP2PDisabledSelfTest.java | 34 + .../IgniteCachePartitionedQuerySelfTest.java | 133 ++ .../IgniteCacheQueryNodeRestartSelfTest.java | 216 ++ .../GridCacheReplicatedFieldsQuerySelfTest.java | 2 +- ...dCacheReplicatedQueryP2PEnabledSelfTest.java | 34 - .../GridCacheReplicatedQuerySelfTest.java | 686 ------ ...eplicatedFieldsQueryP2PDisabledSelfTest.java | 34 + ...gniteCacheReplicatedFieldsQuerySelfTest.java | 79 + ...CacheReplicatedQueryP2PDisabledSelfTest.java | 34 + .../IgniteCacheReplicatedQuerySelfTest.java | 576 +++++ .../GridCacheLocalAtomicQuerySelfTest.java | 32 - .../GridCacheLocalFieldsQuerySelfTest.java | 38 - .../local/GridCacheLocalQuerySelfTest.java | 107 - .../IgniteCacheLocalAtomicQuerySelfTest.java | 32 + .../IgniteCacheLocalFieldsQuerySelfTest.java | 38 + .../local/IgniteCacheLocalQuerySelfTest.java | 85 + ...dCacheAbstractReduceFieldsQuerySelfTest.java | 413 ++++ ...ridCacheReduceFieldsQueryAtomicSelfTest.java | 38 + ...GridCacheReduceFieldsQueryLocalSelfTest.java | 37 + ...cheReduceFieldsQueryPartitionedSelfTest.java | 59 + ...acheReduceFieldsQueryReplicatedSelfTest.java | 37 + .../query/h2/GridH2IndexRebuildTest.java | 8 + .../query/h2/GridH2IndexingOffheapSelfTest.java | 20 +- .../h2/GridIndexingSpiAbstractSelfTest.java | 98 +- .../query/h2/sql/GridQueryParsingTest.java | 71 +- .../tcp/GridOrderedMessageCancelSelfTest.java | 4 +- .../IgniteCacheQuerySelfTestSuite.java | 55 +- .../scala/org/apache/ignite/scalar/scalar.scala | 15 +- .../scalar/src/test/resources/spring-cache.xml | 7 +- modules/schema-import/pom.xml | 101 + modules/schema-import/readme.txt | 214 ++ .../main/java/media/data_connection_48x48.png | Bin 0 -> 4443 bytes .../src/main/java/media/error_48x48.png | Bin 0 -> 4349 bytes .../src/main/java/media/ignite_128x128.png | Bin 0 -> 4917 bytes .../src/main/java/media/ignite_16x16.png | Bin 0 -> 608 bytes .../src/main/java/media/ignite_24x24.png | Bin 0 -> 930 bytes .../src/main/java/media/ignite_32x32.png | Bin 0 -> 1203 bytes .../src/main/java/media/ignite_48x48.png | Bin 0 -> 1868 bytes .../src/main/java/media/ignite_64x64.png | Bin 0 -> 2453 bytes .../src/main/java/media/information_48x48.png | Bin 0 -> 4102 bytes .../src/main/java/media/question_48x48.png | Bin 0 -> 3857 bytes .../src/main/java/media/sign_warning_48x48.png | Bin 0 -> 2988 bytes .../schema-import/src/main/java/media/style.css | 134 ++ .../src/main/java/media/text_tree_48x48.png | Bin 0 -> 2567 bytes .../ignite/schema/generator/PojoGenerator.java | 414 ++++ .../schema/generator/SnippetGenerator.java | 138 ++ .../ignite/schema/generator/XmlGenerator.java | 345 +++ .../apache/ignite/schema/model/IndexItem.java | 54 + .../ignite/schema/model/PojoDescriptor.java | 509 +++++ .../apache/ignite/schema/model/PojoField.java | 420 ++++ .../schema/parser/DatabaseMetadataParser.java | 108 + .../apache/ignite/schema/parser/DbColumn.java | 76 + .../apache/ignite/schema/parser/DbTable.java | 105 + .../parser/dialect/DB2MetadataDialect.java | 30 + .../parser/dialect/DatabaseMetadataDialect.java | 78 + .../parser/dialect/JdbcMetadataDialect.java | 141 ++ .../parser/dialect/OracleMetadataDialect.java | 281 +++ .../ignite/schema/ui/ConfirmCallable.java | 81 + .../org/apache/ignite/schema/ui/Controls.java | 661 ++++++ .../org/apache/ignite/schema/ui/GridPaneEx.java | 177 ++ .../org/apache/ignite/schema/ui/MessageBox.java | 260 +++ .../apache/ignite/schema/ui/ModalDialog.java | 50 + .../ignite/schema/ui/SchemaImportApp.java | 1626 ++++++++++++++ .../ignite/schema/ui/TextColumnValidator.java | 32 + .../schema/test/AbstractSchemaImportTest.java | 147 ++ .../test/generator/PojoGeneratorTest.java | 70 + .../schema/test/generator/XmlGeneratorTest.java | 50 + .../apache/ignite/schema/test/model/Ignite.xml | 390 ++++ .../apache/ignite/schema/test/model/Objects.txt | 502 +++++ .../ignite/schema/test/model/ObjectsKey.txt | 96 + .../ignite/schema/test/model/Primitives.txt | 506 +++++ .../ignite/schema/test/model/PrimitivesKey.txt | 96 + .../test/parser/DbMetadataParserTest.java | 118 + .../testsuites/IgniteSchemaImportTestSuite.java | 41 + modules/schema-load/pom.xml | 107 - .../main/java/media/data_connection_48x48.png | Bin 4443 -> 0 bytes .../src/main/java/media/error_48x48.png | Bin 4349 -> 0 bytes .../src/main/java/media/ignite_128x128.png | Bin 4917 -> 0 bytes .../src/main/java/media/ignite_16x16.png | Bin 608 -> 0 bytes .../src/main/java/media/ignite_24x24.png | Bin 930 -> 0 bytes .../src/main/java/media/ignite_32x32.png | Bin 1203 -> 0 bytes .../src/main/java/media/ignite_48x48.png | Bin 1868 -> 0 bytes .../src/main/java/media/ignite_64x64.png | Bin 2453 -> 0 bytes .../src/main/java/media/information_48x48.png | Bin 4102 -> 0 bytes .../src/main/java/media/question_48x48.png | Bin 3857 -> 0 bytes .../src/main/java/media/sign_warning_48x48.png | Bin 2988 -> 0 bytes .../schema-load/src/main/java/media/style.css | 117 - .../src/main/java/media/text_tree_48x48.png | Bin 2567 -> 0 bytes .../ignite/schema/generator/PojoGenerator.java | 414 ---- .../schema/generator/SnippetGenerator.java | 138 -- .../ignite/schema/generator/XmlGenerator.java | 347 --- .../ignite/schema/model/PojoDescriptor.java | 510 ----- .../apache/ignite/schema/model/PojoField.java | 420 ---- .../schema/parser/DatabaseMetadataParser.java | 108 - .../apache/ignite/schema/parser/DbColumn.java | 76 - .../apache/ignite/schema/parser/DbTable.java | 105 - .../parser/dialect/DB2MetadataDialect.java | 30 - .../parser/dialect/DatabaseMetadataDialect.java | 78 - .../parser/dialect/JdbcMetadataDialect.java | 141 -- .../parser/dialect/OracleMetadataDialect.java | 281 --- .../ignite/schema/ui/ConfirmCallable.java | 81 - .../org/apache/ignite/schema/ui/Controls.java | 661 ------ .../org/apache/ignite/schema/ui/GridPaneEx.java | 177 -- .../org/apache/ignite/schema/ui/MessageBox.java | 246 --- .../apache/ignite/schema/ui/ModalDialog.java | 50 - .../apache/ignite/schema/ui/SchemaLoadApp.java | 1615 -------------- .../ignite/schema/ui/TextColumnValidator.java | 32 - .../schema/load/AbstractSchemaLoaderTest.java | 134 -- .../load/generator/PojoGeneratorTest.java | 70 - .../schema/load/generator/XmlGeneratorTest.java | 50 - .../apache/ignite/schema/load/model/Ignite.xml | 390 ---- .../apache/ignite/schema/load/model/Objects.txt | 502 ----- .../ignite/schema/load/model/ObjectsKey.txt | 96 - .../ignite/schema/load/model/Primitives.txt | 506 ----- .../ignite/schema/load/model/PrimitivesKey.txt | 96 - .../load/parser/DbMetadataParserTest.java | 118 - .../testsuites/IgniteSchemaLoadTestSuite.java | 41 - .../org/apache/ignite/IgniteSpringBean.java | 4 +- .../util/nodestart/IgniteNodeCallableImpl.java | 42 +- .../ignite/visor/commands/VisorConsole.scala | 3 +- .../commands/cache/VisorCacheCommand.scala | 77 +- .../cache/VisorCacheCompactCommand.scala | 151 -- .../config/VisorConfigurationCommand.scala | 15 - .../commands/events/VisorEventsCommand.scala | 4 +- .../commands/top/VisorTopologyCommand.scala | 7 +- .../scala/org/apache/ignite/visor/visor.scala | 12 +- .../commands/cache/VisorCacheCommandSpec.scala | 14 +- .../cache/VisorCacheCompactCommandSpec.scala | 103 - .../testsuites/VisorConsoleSelfTestSuite.scala | 3 +- .../apache/ignite/visor/plugin/VisorPlugin.java | 8 +- modules/winservice/IgniteService.sln | 22 - .../winservice/IgniteService/IgniteService.cs | 170 -- .../IgniteService/IgniteService.csproj | 90 - modules/winservice/README.md | 3 - modules/yardstick/README.md | 17 + modules/yardstick/config/ignite-base-config.xml | 46 +- .../yardstick/config/ignite-store-config.xml | 4 - modules/yardstick/pom.xml | 8 +- .../cache/IgniteSqlQueryBenchmark.java | 2 +- .../cache/IgniteSqlQueryJoinBenchmark.java | 2 +- pom.xml | 67 +- .../basic-concepts/async-support.md | 0 .../basic-concepts/getting-started.md | 0 .../basic-concepts/ignite-life-cycel.md | 0 .../documentation/basic-concepts/maven-setup.md | 0 .../basic-concepts/what-is-ignite.md | 0 .../basic-concepts/zero-deployment.md | 0 wiki/documentation/clustering/aws-config.md | 0 wiki/documentation/clustering/cluster-config.md | 0 wiki/documentation/clustering/cluster-groups.md | 0 wiki/documentation/clustering/cluster.md | 0 .../documentation/clustering/leader-election.md | 0 wiki/documentation/clustering/network-config.md | 0 wiki/documentation/clustering/node-local-map.md | 0 .../documentation/compute-grid/checkpointing.md | 0 .../compute-grid/collocate-compute-and-data.md | 0 wiki/documentation/compute-grid/compute-grid.md | 0 .../documentation/compute-grid/compute-tasks.md | 0 .../compute-grid/distributed-closures.md | 0 .../compute-grid/executor-service.md | 0 .../compute-grid/fault-tolerance.md | 0 .../compute-grid/job-scheduling.md | 0 .../compute-grid/load-balancing.md | 0 .../data-grid/affinity-collocation.md | 0 .../data-grid/automatic-db-integration.md | 0 wiki/documentation/data-grid/cache-modes.md | 0 wiki/documentation/data-grid/cache-queries.md | 0 wiki/documentation/data-grid/data-grid.md | 0 wiki/documentation/data-grid/data-loading.md | 0 wiki/documentation/data-grid/evictions.md | 0 .../data-grid/hibernate-l2-cache.md | 0 wiki/documentation/data-grid/jcache.md | 0 wiki/documentation/data-grid/off-heap-memory.md | 0 .../documentation/data-grid/persistent-store.md | 0 wiki/documentation/data-grid/rebalancing.md | 0 wiki/documentation/data-grid/transactions.md | 0 .../data-grid/web-session-clustering.md | 0 .../distributed-data-structures/atomic-types.md | 0 .../countdownlatch.md | 0 .../distributed-data-structures/id-generator.md | 0 .../queue-and-set.md | 0 .../distributed-events/automatic-batching.md | 0 wiki/documentation/distributed-events/events.md | 0 .../distributed-file-system/igfs.md | 0 .../distributed-messaging/messaging.md | 0 wiki/documentation/http/configuration.md | 0 wiki/documentation/http/rest-api.md | 0 .../release-notes/release-notes.md | 0 .../service-grid/cluster-singletons.md | 0 .../service-grid/service-configuration.md | 0 .../service-grid/service-example.md | 0 wiki/documentation/service-grid/service-grid.md | 0 690 files changed, 27997 insertions(+), 25774 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/examples/config/filesystem/example-igfs.xml ---------------------------------------------------------------------- diff --cc examples/config/filesystem/example-igfs.xml index b2fc17f,a559f53..07dc775 --- a/examples/config/filesystem/example-igfs.xml +++ b/examples/config/filesystem/example-igfs.xml @@@ -117,8 -113,8 +113,7 @@@ <property name="name" value="igfs-data"/> <property name="cacheMode" value="PARTITIONED"/> <property name="atomicityMode" value="TRANSACTIONAL"/> - <property name="queryIndexEnabled" value="false"/> <property name="writeSynchronizationMode" value="FULL_SYNC"/> - <property name="distributionMode" value="PARTITIONED_ONLY"/> <property name="backups" value="0"/> <property name="affinityMapper"> <bean class="org.apache.ignite.igfs.IgfsGroupDataBlocksKeyMapper"> http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataStreamerExample.java ---------------------------------------------------------------------- diff --cc examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataStreamerExample.java index 0000000,7a4e72d..0213928 mode 000000,100644..100644 --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataStreamerExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheDataStreamerExample.java @@@ -1,0 -1,85 +1,91 @@@ + /* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + package org.apache.ignite.examples.datagrid; + + import org.apache.ignite.*; ++import org.apache.ignite.cache.*; ++import org.apache.ignite.configuration.*; + import org.apache.ignite.examples.*; + + /** + * Demonstrates how cache can be populated with data utilizing {@link IgniteDataStreamer} API. + * {@link IgniteDataStreamer} is a lot more efficient to use than standard + * {@code put(...)} operation as it properly buffers cache requests + * together and properly manages load on remote nodes. + * <p> + * Remote nodes should always be started with special configuration file which - * enables P2P class loading: {@code 'ignite.{sh|bat} examples/config/example-cache.xml'}. ++ * enables P2P class loading: {@code 'ignite.{sh|bat} examples/config/example-compute.xml'}. + * <p> - * Alternatively you can run {@link CacheNodeStartup} in another JVM which will - * start node with {@code examples/config/example-cache.xml} configuration. ++ * Alternatively you can run {@link ExampleNodeStartup} in another JVM which will ++ * start node with {@code examples/config/example-compute.xml} configuration. + */ + public class CacheDataStreamerExample { + /** Cache name. */ - private static final String CACHE_NAME = "partitioned"; ++ private static final String CACHE_NAME = CacheDataStreamerExample.class.getSimpleName(); + + /** Number of entries to load. */ + private static final int ENTRY_COUNT = 500000; + + /** Heap size required to run this example. */ + public static final int MIN_MEMORY = 512 * 1024 * 1024; + + /** + * Executes example. + * + * @param args Command line arguments, none required. + * @throws IgniteException If example execution failed. + */ + public static void main(String[] args) throws IgniteException { + ExamplesUtils.checkMinMemory(MIN_MEMORY); + - try (Ignite ignite = Ignition.start("examples/config/example-cache.xml")) { ++ try (Ignite ignite = Ignition.start("examples/config/example-compute.xml")) { + System.out.println(); + System.out.println(">>> Cache data streamer example started."); + - // Clean up caches on all nodes before run. - ignite.jcache(CACHE_NAME).clear(); ++ CacheConfiguration<Integer, String> cfg = new CacheConfiguration<>(); + - System.out.println(); - System.out.println(">>> Cache clear finished."); ++ cfg.setCacheMode(CacheMode.PARTITIONED); ++ cfg.setName(CACHE_NAME); + - long start = System.currentTimeMillis(); ++ try (IgniteCache<Integer, String> cache = ignite.createCache(cfg)) { ++ System.out.println(); ++ System.out.println(">>> Cache clear finished."); + - try (IgniteDataStreamer<Integer, String> stmr = ignite.dataStreamer(CACHE_NAME)) { - // Configure loader. - stmr.perNodeBufferSize(1024); - stmr.perNodeParallelOperations(8); ++ try (IgniteDataStreamer<Integer, String> ldr = ignite.dataStreamer(CACHE_NAME)) { ++ long start = System.currentTimeMillis(); + - for (int i = 0; i < ENTRY_COUNT; i++) { - stmr.addData(i, Integer.toString(i)); ++ // Configure loader. ++ ldr.perNodeBufferSize(1024); ++ ldr.perNodeParallelOperations(8); + - // Print out progress while loading cache. - if (i > 0 && i % 10000 == 0) - System.out.println("Loaded " + i + " keys."); - } - } ++ for (int i = 0; i < ENTRY_COUNT; i++) { ++ ldr.addData(i, Integer.toString(i)); + - long end = System.currentTimeMillis(); ++ // Print out progress while loading cache. ++ if (i > 0 && i % 10000 == 0) ++ System.out.println("Loaded " + i + " keys."); ++ } + - System.out.println(">>> Loaded " + ENTRY_COUNT + " keys in " + (end - start) + "ms."); ++ long end = System.currentTimeMillis(); ++ ++ System.out.println(">>> Loaded " + ENTRY_COUNT + " keys in " + (end - start) + "ms."); ++ } ++ } + } + } + } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java ---------------------------------------------------------------------- diff --cc examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java index addca78,56e7521..9d3cd4c --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CachePopularNumbersExample.java @@@ -18,10 -18,8 +18,11 @@@ package org.apache.ignite.examples.datagrid; import org.apache.ignite.*; +import org.apache.ignite.cache.*; + import org.apache.ignite.cache.query.*; import org.apache.ignite.cluster.*; +import org.apache.ignite.configuration.*; +import org.apache.ignite.examples.*; import javax.cache.processor.*; import java.util.*; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java ---------------------------------------------------------------------- diff --cc examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java index 84c5dbf,f30c147..08acfec --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/CacheQueryExample.java @@@ -84,32 -79,30 +82,39 @@@ public class CacheQueryExample System.out.println(); System.out.println(">>> Cache query example started."); - // Clean up caches on all nodes before run. - ignite.jcache(CACHE_NAME).removeAll(); + CacheConfiguration<?, ?> cfg = new CacheConfiguration<>(); - // Populate cache. - initialize(); + cfg.setCacheMode(CacheMode.PARTITIONED); + cfg.setName(CACHE_NAME); + cfg.setQueryIndexEnabled(true); - // Example for SQL-based querying employees based on salary ranges. - sqlQuery(); + try (IgniteCache<?, ?> cache = ignite.createCache(cfg)) { + // Populate cache. + initialize(); - // Example for SQL-based querying employees for a given organization (includes SQL join). - sqlQueryWithJoin(); + // Example for SQL-based querying employees based on salary ranges. + sqlQuery(); - // Example for TEXT-based querying for a given string in peoples resumes. - textQuery(); + // Example for SQL-based querying employees for a given organization (includes SQL join). + sqlQueryWithJoin(); - // Example for SQL-based querying to calculate average salary among all employees within a company. - sqlQueryWithAggregation(); + // Example for TEXT-based querying for a given string in peoples resumes. + textQuery(); ++ ++ // Example for SQL-based querying to calculate average salary among all employees within a company. ++ sqlQueryWithAggregation(); ++ ++ // Example for SQL-based fields queries that return only required ++ // fields instead of whole key-value pairs. ++ sqlFieldsQuery(); - // Example for SQL-based fields queries that return only required - // fields instead of whole key-value pairs. - sqlFieldsQuery(); + // Example for SQL-based fields queries that return only required + // fields instead of whole key-value pairs. + sqlFieldsQuery(); - // Example for SQL-based fields queries that uses joins. - sqlFieldsQueryWithJoin(); + // Example for SQL-based fields queries that uses joins. + sqlFieldsQueryWithJoin(); + } print("Cache query example finished."); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java ---------------------------------------------------------------------- diff --cc examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java index f75052d,07f7554..539cf8d --- a/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java +++ b/examples/src/main/java/org/apache/ignite/examples/datagrid/starschema/CacheStarSchemaExample.java @@@ -71,33 -68,27 +69,34 @@@ public class CacheStarSchemaExample * Executes example. * * @param args Command line arguments, none required. + * @throws IgniteCheckedException If example execution failed. */ - public static void main(String[] args) throws Exception { + public static void main(String[] args) throws IgniteCheckedException { - Ignite ignite = Ignition.start("examples/config/example-cache.xml"); + try (Ignite ignite = Ignition.start("examples/config/example-compute.xml")) { - System.out.println(); - System.out.println(">>> Cache star schema example started."); + System.out.println(); + System.out.println(">>> Cache star schema example started."); - // Clean up caches on all nodes before run. - ignite.jcache(PARTITIONED_CACHE_NAME).clear(); - ignite.jcache(REPLICATED_CACHE_NAME).clear(); + CacheConfiguration<Integer, FactPurchase> factCacheCfg = new CacheConfiguration<>(); - try { - populateDimensions(); - populateFacts(); + factCacheCfg.setCacheMode(CacheMode.PARTITIONED); + factCacheCfg.setName(PARTITIONED_CACHE_NAME); + factCacheCfg.setQueryIndexEnabled(true); - queryStorePurchases(); - queryProductPurchases(); - } - finally { - Ignition.stop(false); + CacheConfiguration<Integer, Object> dimCacheCfg = new CacheConfiguration<>(); + + dimCacheCfg.setCacheMode(CacheMode.REPLICATED); + dimCacheCfg.setName(REPLICATED_CACHE_NAME); + dimCacheCfg.setQueryIndexEnabled(true); + + try (IgniteCache<Integer, FactPurchase> factCache = ignite.createCache(factCacheCfg); + IgniteCache<Integer, Object> dimCache = ignite.createCache(dimCacheCfg)) { + populateDimensions(dimCache); + populateFacts(factCache); + + queryStorePurchases(factCache); + queryProductPurchases(factCache); + } } } @@@ -158,9 -155,9 +161,9 @@@ // ======================== // Create cross cache query to get all purchases made at store1. - QueryCursor<Cache.Entry<Integer, FactPurchase>> storePurchases = factCache.query(sql( + QueryCursor<Cache.Entry<Integer, FactPurchase>> storePurchases = factCache.query(new SqlQuery( FactPurchase.class, - "from \"replicated\".DimStore, \"partitioned\".FactPurchase " + "from \"" + REPLICATED_CACHE_NAME + "\".DimStore, \"" + PARTITIONED_CACHE_NAME + "\".FactPurchase " + "where DimStore.id=FactPurchase.storeId and DimStore.name=?").setArgs("Store1")); printQueryResults("All purchases made at store1:", storePurchases.getAll()); @@@ -186,10 -185,9 +191,10 @@@ // Create cross cache query to get all purchases made at store2 // for specified products. - QueryCursor<Cache.Entry<Integer, FactPurchase>> prodPurchases = factCache.query(sql( + QueryCursor<Cache.Entry<Integer, FactPurchase>> prodPurchases = factCache.query(new SqlQuery( FactPurchase.class, - "from \"replicated\".DimStore, \"replicated\".DimProduct, \"partitioned\".FactPurchase " + "from \"" + REPLICATED_CACHE_NAME + "\".DimStore, \"" + REPLICATED_CACHE_NAME + "\".DimProduct, " + + "\"" + PARTITIONED_CACHE_NAME + "\".FactPurchase " + "where DimStore.id=FactPurchase.storeId and DimProduct.id=FactPurchase.productId " + "and DimStore.name=? and DimProduct.id in(?, ?, ?)") .setArgs("Store2", p1.getId(), p2.getId(), p3.getId())); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala ---------------------------------------------------------------------- diff --cc examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala index 1f67422,30565b5..e65a679 --- a/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala +++ b/examples/src/main/scala/org/apache/ignite/scalar/examples/ScalarCachePopularNumbersExample.scala @@@ -17,23 -17,27 +17,31 @@@ package org.apache.ignite.scalar.examples +import java.util.Timer + +import org.apache.ignite.IgniteException +import org.apache.ignite.examples.ExampleNodeStartup + import org.apache.ignite.examples.datagrid.CacheNodeStartup + import org.apache.ignite.internal.util.scala.impl import org.apache.ignite.scalar.scalar import org.apache.ignite.scalar.scalar._ + import org.apache.ignite.{IgniteCache, IgniteDataStreamer, IgniteException} + import javax.cache.processor.{EntryProcessor, MutableEntry} + import java.util + import java.util.Map.Entry + import java.util.Timer + + import scala.collection.JavaConversions._ import scala.util.Random - import collection.JavaConversions._ /** * Real time popular number counter. * <p> * Remote nodes should always be started with special configuration file which - * enables P2P class loading: `ignite.sh examples/config/example-cache.xml` + * enables P2P class streaming: `ignite.sh examples/config/example-cache.xml` * <p> - * Alternatively you can run [[CacheNodeStartup]] in another JVM which will + * Alternatively you can run [[ExampleNodeStartup]] in another JVM which will * start node with `examples/config/example-cache.xml` configuration. * <p> * The counts are kept in cache on all remote nodes. Top `10` counts from each node are then grabbed to produce http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java ---------------------------------------------------------------------- diff --cc modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java index dfd23d4,e52d0f4..0b876a7 --- a/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java +++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/JdbcComplexQuerySelfTest.java @@@ -57,7 -57,12 +57,11 @@@ public class JdbcComplexQuerySelfTest e cache.setCacheMode(PARTITIONED); cache.setBackups(1); cache.setWriteSynchronizationMode(FULL_SYNC); - cache.setDistributionMode(NEAR_PARTITIONED); cache.setAtomicityMode(TRANSACTIONAL); + cache.setIndexedTypes( + String.class, Organization.class, + CacheAffinityKey.class, Person.class + ); cfg.setCacheConfiguration(cache); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/codegen/src/main/java/org/apache/ignite/codegen/MessageCodeGenerator.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/main/java/org/apache/ignite/Ignite.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/cache/GridCache.java index f2d4005,71debac..d1936b9 --- a/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/GridCache.java @@@ -212,15 -212,10 +212,15 @@@ public interface GridCache<K, V> extend * {@link org.apache.ignite.cache.affinity.rendezvous.CacheRendezvousAffinityFunction#setHashIdResolver(CacheAffinityNodeHashResolver)} to make sure that * a node maps to the same hash ID if re-started. * <p> - * See {@link org.apache.ignite.configuration.CacheConfiguration#getPreloadPartitionedDelay()} for more information on how to configure - * preload re-partition delay. + * See {@link org.apache.ignite.configuration.CacheConfiguration#getRebalanceDelay()} for more information on how to configure + * rebalance re-partition delay. * <p> - * @return Future that will be completed when preloading is finished. + * @return Future that will be completed when rebalancing is finished. */ public IgniteInternalFuture<?> forceRepartition(); + + /** + * @return {@code True} if local node is affinity node. + */ + public boolean affinityNode(); } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java index ace1f94,cfcb39e..e461347 --- a/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java +++ b/modules/core/src/main/java/org/apache/ignite/configuration/CacheConfiguration.java @@@ -20,21 -20,14 +20,22 @@@ package org.apache.ignite.configuration import org.apache.ignite.*; import org.apache.ignite.cache.*; import org.apache.ignite.cache.affinity.*; +import org.apache.ignite.cache.affinity.rendezvous.CacheRendezvousAffinityFunction; import org.apache.ignite.cache.eviction.*; + import org.apache.ignite.cache.query.annotations.*; import org.apache.ignite.cache.store.*; +import org.apache.ignite.cluster.*; +import org.apache.ignite.internal.*; import org.apache.ignite.internal.processors.cache.*; +import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.lang.*; +import org.apache.ignite.spi.indexing.*; import org.jetbrains.annotations.*; +import javax.cache.Cache; import javax.cache.configuration.*; +import javax.cache.expiry.ExpiryPolicy; import java.util.*; /** @@@ -77,9 -70,9 +78,6 @@@ public class CacheConfiguration<K, V> e /** Default atomicity mode. */ public static final CacheAtomicityMode DFLT_CACHE_ATOMICITY_MODE = CacheAtomicityMode.ATOMIC; - /** Default query timeout. */ - public static final long DFLT_QUERY_TIMEOUT = 0; - /** Default value for cache distribution mode. */ - public static final CacheDistributionMode DFLT_DISTRIBUTION_MODE = CacheDistributionMode.PARTITIONED_ONLY; -- /** Default lock timeout. */ public static final long DFLT_LOCK_TIMEOUT = 0; @@@ -161,18 -151,12 +153,24 @@@ /** Default value for 'readFromBackup' flag. */ public static final boolean DFLT_READ_FROM_BACKUP = true; + /** Filter that accepts only server nodes. */ + public static final IgnitePredicate<ClusterNode> SERVER_NODES = new IgnitePredicate<ClusterNode>() { + @Override public boolean apply(ClusterNode n) { + Boolean attr = n.attribute(IgniteNodeAttributes.ATTR_CLIENT_MODE); + + return attr != null && !attr; + } + }; + + /** Filter that accepts all nodes. */ + public static final IgnitePredicate<ClusterNode> ALL_NODES = F.alwaysTrue(); + + /** Default timeout after which long query warning will be printed. */ + public static final long DFLT_LONG_QRY_WARN_TIMEOUT = 3000; + + /** Default size for onheap SQL row cache size. */ + public static final int DFLT_SQL_ONHEAP_ROW_CACHE_SIZE = 10 * 1024; + /** Cache name. */ private String name; @@@ -323,9 -307,15 +312,18 @@@ /** Collection of type metadata. */ private Collection<CacheTypeMetadata> typeMeta; + /** Node filter specifying nodes on which this cache should be deployed. */ + private IgnitePredicate<ClusterNode> nodeFilter; + + /** */ + private boolean sqlEscapeAll; + + /** */ + private Class<?>[] indexedTypes; + + /** */ + private int sqlOnheapRowCacheSize = DFLT_SQL_ONHEAP_ROW_CACHE_SIZE; + /** Copy on read flag. */ private boolean cpOnRead = DFLT_COPY_ON_READ; @@@ -361,7 -351,7 +359,6 @@@ cacheWriterFactory = cc.getCacheWriterFactory(); cpOnRead = cc.isCopyOnRead(); dfltLockTimeout = cc.getDefaultLockTimeout(); - dfltQryTimeout = cc.getDefaultQueryTimeout(); - distro = cc.getDistributionMode(); eagerTtl = cc.isEagerTtl(); evictFilter = cc.getEvictionFilter(); evictKeyBufSize = cc.getEvictSynchronizedKeyBufferSize(); @@@ -378,23 -369,24 +375,23 @@@ isWriteThrough = cc.isWriteThrough(); listenerConfigurations = cc.listenerConfigurations; loadPrevVal = cc.isLoadPreviousValue(); + longQryWarnTimeout = cc.getLongQueryWarningTimeout(); offHeapMaxMem = cc.getOffHeapMaxMemory(); maxConcurrentAsyncOps = cc.getMaxConcurrentAsyncOperations(); - maxQryIterCnt = cc.getMaximumQueryIteratorCount(); memMode = cc.getMemoryMode(); name = cc.getName(); - nearStartSize = cc.getNearStartSize(); - nearEvictPlc = cc.getNearEvictionPolicy(); + nearCfg = cc.getNearConfiguration(); - nodeFilter = cc.getNodeFilter(); - preloadMode = cc.getPreloadMode(); - preloadBatchSize = cc.getPreloadBatchSize(); - preloadDelay = cc.getPreloadPartitionedDelay(); - preloadOrder = cc.getPreloadOrder(); - preloadPoolSize = cc.getPreloadThreadPoolSize(); - preloadTimeout = cc.getPreloadTimeout(); - preloadThrottle = cc.getPreloadThrottle(); - qryCfg = cc.getQueryConfiguration(); - qryIdxEnabled = cc.isQueryIndexEnabled(); + rebalanceMode = cc.getRebalanceMode(); + rebalanceBatchSize = cc.getRebalanceBatchSize(); + rebalanceDelay = cc.getRebalanceDelay(); + rebalanceOrder = cc.getRebalanceOrder(); + rebalancePoolSize = cc.getRebalanceThreadPoolSize(); + rebalanceTimeout = cc.getRebalanceTimeout(); + rebalanceThrottle = cc.getRebalanceThrottle(); readFromBackup = cc.isReadFromBackup(); + sqlEscapeAll = cc.isSqlEscapeAll(); + sqlFuncCls = cc.getSqlFunctionClasses(); + sqlOnheapRowCacheSize = cc.getSqlOnheapRowCacheSize(); startSize = cc.getStartSize(); storeFactory = cc.getCacheStoreFactory(); swapEnabled = cc.isSwapEnabled(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java index deb7707,d181b39..3eef0e2 --- a/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/IgnitionEx.java @@@ -67,8 -68,9 +67,8 @@@ import java.util.logging.* import static org.apache.ignite.IgniteState.*; import static org.apache.ignite.IgniteSystemProperties.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.CacheDistributionMode.*; import static org.apache.ignite.cache.CacheMode.*; - import static org.apache.ignite.cache.CachePreloadMode.*; + import static org.apache.ignite.cache.CacheRebalanceMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; import static org.apache.ignite.configuration.IgniteConfiguration.*; import static org.apache.ignite.internal.IgniteComponentType.*; @@@ -1904,23 -1866,20 +1904,22 @@@ public class IgnitionEx * @return Marshaller system cache configuration. */ private static CacheConfiguration marshallerSystemCache(boolean client) { - CacheConfiguration cache = new CacheConfiguration(); - - cache.setName(CU.MARSH_CACHE_NAME); - cache.setCacheMode(REPLICATED); - cache.setAtomicityMode(TRANSACTIONAL); - cache.setSwapEnabled(false); - cache.setRebalanceMode(SYNC); - cache.setWriteSynchronizationMode(FULL_SYNC); - cache.setAffinity(new CacheRendezvousAffinityFunction(false, 100)); - - if (client) - cache.setDistributionMode(CLIENT_ONLY); + if (!client) { + CacheConfiguration cache = new CacheConfiguration(); + + cache.setName(CU.MARSH_CACHE_NAME); + cache.setCacheMode(REPLICATED); + cache.setAtomicityMode(TRANSACTIONAL); + cache.setSwapEnabled(false); - cache.setQueryIndexEnabled(false); - cache.setPreloadMode(SYNC); ++ cache.setRebalanceMode(SYNC); + cache.setWriteSynchronizationMode(FULL_SYNC); + cache.setAffinity(new CacheRendezvousAffinityFunction(false, 100)); + cache.setNodeFilter(CacheConfiguration.ALL_NODES); + + return cache; + } - return cache; + return null; } /** @@@ -1930,23 -1889,20 +1929,22 @@@ * @return Utility system cache configuration. */ private static CacheConfiguration utilitySystemCache(boolean client) { - CacheConfiguration cache = new CacheConfiguration(); - - cache.setName(CU.UTILITY_CACHE_NAME); - cache.setCacheMode(REPLICATED); - cache.setAtomicityMode(TRANSACTIONAL); - cache.setSwapEnabled(false); - cache.setRebalanceMode(SYNC); - cache.setWriteSynchronizationMode(FULL_SYNC); - cache.setAffinity(new CacheRendezvousAffinityFunction(false, 100)); - - if (client) - cache.setDistributionMode(CLIENT_ONLY); + if (!client) { + CacheConfiguration cache = new CacheConfiguration(); + + cache.setName(CU.UTILITY_CACHE_NAME); + cache.setCacheMode(REPLICATED); + cache.setAtomicityMode(TRANSACTIONAL); + cache.setSwapEnabled(false); - cache.setQueryIndexEnabled(false); - cache.setPreloadMode(SYNC); ++ cache.setRebalanceMode(SYNC); + cache.setWriteSynchronizationMode(FULL_SYNC); + cache.setAffinity(new CacheRendezvousAffinityFunction(false, 100)); + cache.setNodeFilter(CacheConfiguration.ALL_NODES); + + return cache; + } - return cache; + return null; } /** @@@ -1957,25 -1913,24 +1955,24 @@@ * @return Cache configuration for atomic data structures. */ private static CacheConfiguration atomicsSystemCache(AtomicConfiguration cfg, boolean client) { - CacheConfiguration ccfg = new CacheConfiguration(); + if (!client) { + CacheConfiguration ccfg = new CacheConfiguration(); - ccfg.setName(CU.ATOMICS_CACHE_NAME); - ccfg.setAtomicityMode(TRANSACTIONAL); - ccfg.setSwapEnabled(false); - ccfg.setRebalanceMode(SYNC); - ccfg.setWriteSynchronizationMode(FULL_SYNC); - ccfg.setCacheMode(cfg.getCacheMode()); + ccfg.setName(CU.ATOMICS_CACHE_NAME); + ccfg.setAtomicityMode(TRANSACTIONAL); + ccfg.setSwapEnabled(false); - ccfg.setQueryIndexEnabled(false); - ccfg.setPreloadMode(SYNC); ++ ccfg.setRebalanceMode(SYNC); + ccfg.setWriteSynchronizationMode(FULL_SYNC); + ccfg.setCacheMode(cfg.getCacheMode()); + ccfg.setNodeFilter(CacheConfiguration.ALL_NODES); - if (cfg.getCacheMode() == PARTITIONED) { - ccfg.setBackups(cfg.getBackups()); + if (cfg.getCacheMode() == PARTITIONED) + ccfg.setBackups(cfg.getBackups()); - ccfg.setDistributionMode(client ? NEAR_ONLY : NEAR_PARTITIONED); + return ccfg; } - else - ccfg.setDistributionMode(client ? NEAR_ONLY : PARTITIONED_ONLY); - return ccfg; + return null; } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java index 8c4583f,d69a809..0ffd0da --- a/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/managers/communication/GridIoMessageFactory.java @@@ -581,10 -581,30 +582,35 @@@ public class GridIoMessageFactory imple break; case 106: + msg = new GridQueryCancelRequest(); + + break; + + case 107: + msg = new GridQueryFailResponse(); + + break; + + case 108: + msg = new GridQueryNextPageRequest(); + + break; + + case 109: + msg = new GridQueryNextPageResponse(); + + break; + + case 110: + msg = new GridQueryRequest(); + + break; + ++ case 111: + msg = new AffinityTopologyVersion(); + + break; + default: if (ext != null) { for (MessageFactory factory : ext) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java index ea1c050,76faa39..f51b6c4 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheClearAllRunnable.java @@@ -18,8 -18,8 +18,9 @@@ package org.apache.ignite.internal.processors.cache; import org.apache.ignite.*; +import org.apache.ignite.internal.processors.affinity.*; import org.apache.ignite.internal.processors.cache.version.*; + import org.apache.ignite.internal.processors.query.*; import org.apache.ignite.internal.util.typedef.internal.*; import java.util.*; @@@ -80,9 -80,8 +81,9 @@@ public class GridCacheClearAllRunnable< // Clear swapped entries. if (!ctx.isNear()) { if (ctx.swap().offHeapEnabled()) { - if (ctx.config().isQueryIndexEnabled()) { + if (GridQueryProcessor.isEnabled(ctx.config())) { - for (Iterator<KeyCacheObject> it = ctx.swap().offHeapKeyIterator(true, true, -1L); it.hasNext();) { + for (Iterator<KeyCacheObject> it = + ctx.swap().offHeapKeyIterator(true, true, AffinityTopologyVersion.NONE); it.hasNext();) { KeyCacheObject key = it.next(); if (owns(key)) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheEvictionManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheMapEntry.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java index 421d4c6,39de6bf..f094e35 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCachePartitionExchangeManager.java @@@ -900,8 -850,8 +900,8 @@@ public class GridCachePartitionExchange } } - for (GridCacheContext<K, V> cacheCtx : cctx.cacheContexts()) { + for (GridCacheContext cacheCtx : cctx.cacheContexts()) { - long delay = cacheCtx.config().getPreloadPartitionedDelay(); + long delay = cacheCtx.config().getRebalanceDelay(); GridDhtPreloaderAssignments<K, V> assigns = null; http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java index 38bb5a8,e13177b..a9b054d --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProcessor.java @@@ -40,12 -40,11 +40,13 @@@ import org.apache.ignite.internal.proce import org.apache.ignite.internal.processors.cache.query.continuous.*; import org.apache.ignite.internal.processors.cache.transactions.*; import org.apache.ignite.internal.processors.cache.version.*; + import org.apache.ignite.internal.processors.query.*; import org.apache.ignite.internal.util.*; import org.apache.ignite.internal.util.future.*; +import org.apache.ignite.internal.util.lang.*; import org.apache.ignite.internal.util.typedef.*; import org.apache.ignite.internal.util.typedef.internal.*; +import org.apache.ignite.lang.*; import org.apache.ignite.lifecycle.*; import org.apache.ignite.spi.*; import org.jetbrains.annotations.*; @@@ -60,10 -56,11 +61,10 @@@ import java.util.concurrent.* import static org.apache.ignite.IgniteSystemProperties.*; import static org.apache.ignite.cache.CacheAtomicityMode.*; -import static org.apache.ignite.cache.CacheDistributionMode.*; +import static org.apache.ignite.configuration.CacheConfiguration.*; import static org.apache.ignite.cache.CacheMode.*; - import static org.apache.ignite.cache.CachePreloadMode.*; + import static org.apache.ignite.cache.CacheRebalanceMode.*; import static org.apache.ignite.cache.CacheWriteSynchronizationMode.*; -import static org.apache.ignite.configuration.CacheConfiguration.*; import static org.apache.ignite.configuration.DeploymentMode.*; import static org.apache.ignite.internal.IgniteComponentType.*; import static org.apache.ignite.internal.IgniteNodeAttributes.*; @@@ -555,15 -537,8 +546,15 @@@ public class GridCacheProcessor extend "Deployment mode for cache is not CONTINUOUS or SHARED."); } - maxPreloadOrder = validatePreloadOrder(ctx.config().getCacheConfiguration()); + maxRebalanceOrder = validatePreloadOrder(ctx.config().getCacheConfiguration()); + ctx.discovery().setCustomEventListener(new GridPlainInClosure<Serializable>() { + @Override public void apply(Serializable evt) { + if (evt instanceof DynamicCacheChangeBatch) + onCacheChangeRequested((DynamicCacheChangeBatch)evt); + } + }); + // Internal caches which should not be returned to user. FileSystemConfiguration[] igfsCfgs = ctx.grid().configuration().getFileSystemConfiguration(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheProxyImpl.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheSwapManager.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java index 52789c2,9e21d7c..24e2935 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheUtils.java @@@ -1484,11 -1549,9 +1484,10 @@@ public class GridCacheUtils cache.setEvictionPolicy(null); cache.setSwapEnabled(false); - cache.setQueryIndexEnabled(false); cache.setCacheStoreFactory(null); + cache.setNodeFilter(CacheConfiguration.ALL_NODES); cache.setEagerTtl(true); - cache.setPreloadMode(SYNC); + cache.setRebalanceMode(SYNC); return cache; } http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java index 93fca43,baea0d6..2539441 --- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/IgniteCacheProxy.java @@@ -278,14 -266,14 +278,14 @@@ public class IgniteCacheProxy<K, V> ext * @return Cursor. */ @SuppressWarnings("unchecked") - private QueryCursor<Entry<K, V>> doQuery(Query filter, @Nullable ClusterGroup grp) { - final CacheQuery<Map.Entry<K, V>> qry; - final CacheQueryFuture<Map.Entry<K, V>> fut; + private QueryCursor<Entry<K,V>> query(Query filter, @Nullable ClusterGroup grp) { + final CacheQuery<Map.Entry<K,V>> qry; + final CacheQueryFuture<Map.Entry<K,V>> fut; if (filter instanceof ScanQuery) { - IgniteBiPredicate<K,V> p = ((ScanQuery)filter).getFilter(); + IgniteBiPredicate<K, V> p = ((ScanQuery)filter).getFilter(); - qry = delegate.queries().createScanQuery(p != null ? p : acceptAll()); + qry = delegate.queries().createScanQuery(p != null ? p : ACCEPT_ALL); if (grp != null) qry.projection(grp); @@@ -394,17 -397,9 +409,9 @@@ } } - /** - * @param loc Enforce local. - * @return Local node cluster group. - */ - private ClusterGroup projection(boolean loc) { - return loc ? ctx.kernalContext().grid().cluster().forLocal() : null; - } - /** {@inheritDoc} */ @SuppressWarnings("unchecked") - @Override public QueryCursor<Entry<K,V>> query(Query qry) { + @Override public QueryCursor<Entry<K, V>> query(Query qry) { A.notNull(qry, "qry"); GridCacheProjectionImpl<K, V> prev = gate.enter(prj); @@@ -500,13 -497,13 +509,13 @@@ try { validate(qry); - if (qry instanceof SqlQuery) - return doLocalQuery((SqlQuery)qry); - if (qry instanceof ContinuousQuery) - return queryContinuous((ContinuousQuery<K,V>)qry, true); + return queryContinuous((ContinuousQuery<K, V>)qry, true); - return doQuery(qry, projection(true)); + if (qry instanceof SqlQuery) + return doLocalQuery((SqlQuery)qry); + + return query(qry, projection(true)); } catch (Exception e) { if (e instanceof CacheException) http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLocalPartition.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/c82d4d8e/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockFuture.java ----------------------------------------------------------------------
