Merge remote-tracking branch 'remotes/origin/sprint-2' into ignite-410
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e1224251 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e1224251 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e1224251 Branch: refs/heads/ignite-410 Commit: e1224251c713b959c2200958a8bcb504cb3afe42 Parents: 735f09e dc941c6 Author: ivasilinets <ivasilin...@gridgain.com> Authored: Thu Mar 12 14:21:06 2015 +0300 Committer: ivasilinets <ivasilin...@gridgain.com> Committed: Thu Mar 12 14:21:06 2015 +0300 ---------------------------------------------------------------------- DEVNOTES.txt | 13 +- LICENSE.txt | 54 +- NOTICE.txt | 11 + assembly/dependencies-optional-fabric.xml | 2 +- assembly/dependencies-optional-hadoop.xml | 2 +- assembly/dependencies-schema-import.xml | 56 + assembly/dependencies-schema-load.xml | 56 - bin/ignite-schema-import.bat | 116 ++ bin/ignite-schema-import.sh | 78 + bin/ignite-schema-load.bat | 116 -- bin/ignite-schema-load.sh | 78 - docs/hadoop_readme.md | 17 + examples/config/example-cache.xml | 4 +- examples/config/store/example-database.script | 12 + .../config/store/example-jdbc-pojo-store.xml | 142 ++ .../datagrid/CachePopularNumbersExample.java | 4 +- .../store/CacheNodeWithStoreStartup.java | 33 + .../datagrid/store/CacheStoreExample.java | 1 + .../store/CacheStoreLoadDataExample.java | 10 +- .../ignite/examples/datagrid/store/Person.java | 103 -- .../store/dummy/CacheDummyPersonStore.java | 2 +- .../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 | 5 +- .../ScalarCachePopularNumbersExample.scala | 43 +- 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 + .../clients/src/test/resources/spring-cache.xml | 8 +- .../java/org/apache/ignite/IgniteCache.java | 24 + .../apache/ignite/cache/CachePreloadMode.java | 67 - .../apache/ignite/cache/CacheRebalanceMode.java | 67 + .../java/org/apache/ignite/cache/GridCache.java | 12 +- .../store/jdbc/CacheAbstractJdbcStore.java | 33 +- .../cache/store/jdbc/CacheJdbcPojoStore.java | 52 +- .../configuration/CacheConfiguration.java | 231 ++- .../ignite/events/CachePreloadingEvent.java | 172 -- .../ignite/events/CacheRebalancingEvent.java | 172 ++ .../java/org/apache/ignite/events/Event.java | 2 +- .../org/apache/ignite/events/EventType.java | 44 +- .../ignite/internal/AsyncSupportAdapter.java | 15 +- .../ignite/internal/GridTaskSessionImpl.java | 3 +- .../org/apache/ignite/internal/IgnitionEx.java | 8 +- .../processors/cache/CachePeekModes.java | 28 + .../processors/cache/GridCacheAdapter.java | 25 + .../processors/cache/GridCacheAttributes.java | 32 +- .../processors/cache/GridCacheContext.java | 8 +- .../processors/cache/GridCacheEventManager.java | 12 +- .../cache/GridCacheEvictionManager.java | 6 +- .../GridCachePartitionExchangeManager.java | 6 +- .../processors/cache/GridCacheProcessor.java | 74 +- .../processors/cache/GridCacheUtils.java | 4 +- .../processors/cache/IgniteCacheProxy.java | 7 + .../distributed/dht/GridDhtLocalPartition.java | 4 +- .../distributed/dht/GridDhtLockFuture.java | 4 +- .../dht/GridDhtPartitionTopologyImpl.java | 14 +- .../distributed/dht/GridDhtTxPrepareFuture.java | 4 +- .../dht/preloader/GridDhtForceKeysFuture.java | 30 +- .../preloader/GridDhtPartitionDemandPool.java | 78 +- .../preloader/GridDhtPartitionSupplyPool.java | 22 +- .../dht/preloader/GridDhtPreloader.java | 14 +- .../cache/query/GridCacheQueryManager.java | 4 +- .../closure/GridClosureProcessor.java | 79 +- .../resource/GridNoImplicitInjection.java | 25 + .../processors/resource/GridResourceField.java | 15 +- .../processors/resource/GridResourceIoc.java | 90 +- .../processors/resource/GridResourceMethod.java | 3 + .../resource/GridResourceProcessor.java | 55 +- .../processors/task/GridTaskProcessor.java | 31 +- .../internal/util/GridConcurrentFactory.java | 59 - .../internal/util/GridIdentityHashSet.java | 63 - .../internal/util/GridLeanIdentitySet.java | 117 ++ .../ignite/internal/util/GridLeanMap.java | 2 +- .../ignite/internal/util/IgniteUtils.java | 2 +- .../ignite/internal/util/lang/GridFunc.java | 2 +- .../visor/cache/VisorCacheCompactTask.java | 66 - .../cache/VisorCachePreloadConfiguration.java | 16 +- .../org/jdk8/backport/ConcurrentHashMap8.java | 14 +- .../resources/META-INF/classnames.properties | 34 +- .../core/src/main/resources/ignite.properties | 2 +- .../core/src/test/config/discovery-stress.xml | 2 +- modules/core/src/test/config/example-cache.xml | 4 +- .../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 +- .../core/src/test/config/spring-cache-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 +- .../internal/GridUpdateNotifierSelfTest.java | 16 + .../GridCommunicationSendMessageSelfTest.java | 2 +- .../GridDiscoveryManagerAliveCacheSelfTest.java | 4 +- .../GridCacheAbstractFailoverSelfTest.java | 4 +- .../GridCacheAbstractLocalStoreSelfTest.java | 8 +- ...acheAbstractUsersAffinityMapperSelfTest.java | 4 +- .../cache/GridCacheBasicStoreAbstractTest.java | 4 +- .../GridCacheConcurrentTxMultiNodeTest.java | 4 +- ...idCacheConfigurationConsistencySelfTest.java | 6 +- ...ridCacheConfigurationValidationSelfTest.java | 8 +- .../cache/GridCacheDeploymentSelfTest.java | 4 +- ...idCacheGetAndTransformStoreAbstractTest.java | 4 +- .../cache/GridCacheIncrementTransformTest.java | 4 +- .../cache/GridCacheMultiUpdateLockSelfTest.java | 4 +- .../GridCacheOnCopyFlagAbstractSelfTest.java | 2 + .../GridCacheOnCopyFlagAtomicSelfTest.java | 3 +- .../cache/GridCacheOnCopyFlagLocalSelfTest.java | 3 +- .../GridCacheOnCopyFlagReplicatedSelfTest.java | 3 +- ...ridCacheOnCopyFlagTxPartitionedSelfTest.java | 3 +- .../GridCacheOrderedPreloadingSelfTest.java | 6 +- .../cache/GridCacheP2PUndeploySelfTest.java | 8 +- .../cache/GridCachePartitionedGetSelfTest.java | 4 +- ...hePartitionedProjectionAffinitySelfTest.java | 4 +- .../GridCachePreloadingEvictionsSelfTest.java | 6 +- .../GridCacheQueryInternalKeysSelfTest.java | 4 +- .../cache/GridCacheSwapPreloadSelfTest.java | 4 +- .../GridCacheValueBytesPreloadingSelfTest.java | 2 +- ...idCacheValueConsistencyAbstractSelfTest.java | 4 +- .../IgniteCacheAbstractStopBusySelfTest.java | 2 +- ...IgniteCacheAtomicCopyOnReadDisabledTest.java | 32 + ...niteCacheCopyOnReadDisabledAbstractTest.java | 123 ++ .../IgniteCacheTxCopyOnReadDisabledTest.java | 32 + ...tAllUpdateNonPreloadedPartitionSelfTest.java | 4 +- ...dCacheQueueMultiNodeConsistencySelfTest.java | 3 +- .../IgniteCollectionAbstractTest.java | 4 +- ...GridCachePartitionedNodeRestartSelfTest.java | 4 +- ...idCachePartitionedNodeRestartTxSelfTest.java | 4 +- ...PartitionedQueueCreateMultiNodeSelfTest.java | 4 +- .../GridCacheAbstractNodeRestartSelfTest.java | 6 +- .../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 | 4 +- .../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/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 | 4 +- ...idCacheAtomicPartitionedMetricsSelfTest.java | 4 +- .../near/GridCacheNearEvictionSelfTest.java | 7 +- .../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 | 2 +- .../GridCachePartitionedMetricsSelfTest.java | 4 +- ...achePartitionedMultiNodeCounterSelfTest.java | 4 +- ...achePartitionedMultiNodeFullApiSelfTest.java | 4 +- .../GridCachePartitionedNodeRestartTest.java | 4 +- ...ePartitionedOptimisticTxNodeRestartTest.java | 4 +- ...achePartitionedPreloadLifecycleSelfTest.java | 4 +- ...hePartitionedQueryMultiThreadedSelfTest.java | 2 +- .../GridCachePartitionedTxSalvageSelfTest.java | 2 +- ...achePartitionedTxSingleThreadedSelfTest.java | 4 +- .../GridCacheReplicatedInvalidateSelfTest.java | 4 +- .../GridCacheReplicatedNodeRestartSelfTest.java | 6 +- .../GridCacheSyncReplicatedPreloadSelfTest.java | 6 +- ...CacheReplicatedPreloadLifecycleSelfTest.java | 4 +- .../GridCacheReplicatedPreloadSelfTest.java | 16 +- ...eplicatedPreloadStartStopEventsSelfTest.java | 6 +- .../GridCacheEvictionFilterSelfTest.java | 4 +- .../GridCacheLruNearEvictionPolicySelfTest.java | 4 +- ...heNearOnlyLruNearEvictionPolicySelfTest.java | 4 +- ...ridCacheContinuousQueryAbstractSelfTest.java | 4 +- ...dCacheAbstractReduceFieldsQuerySelfTest.java | 4 +- .../processors/igfs/IgfsSizeSelfTest.java | 7 +- .../ignite/jvmtest/ConcurrentMapTest.java | 5 +- .../lang/utils/GridLeanIdentitySetSelfTest.java | 62 + .../loadtests/GridCacheMultiNodeLoadTest.java | 4 +- .../capacity/spring-capacity-cache.xml | 4 +- .../loadtests/colocation/spring-colocation.xml | 4 +- .../GridCachePartitionedAtomicLongLoadTest.java | 2 +- .../GridP2PContinuousDeploymentSelfTest.java | 4 +- .../tcp/GridCacheDhtLockBackupSelfTest.java | 4 +- .../ignite/testframework/GridTestUtils.java | 50 + .../testframework/junits/GridAbstractTest.java | 1 + .../junits/common/GridCommonAbstractTest.java | 4 +- .../ignite/testsuites/IgniteCacheTestSuite.java | 2 + .../testsuites/IgniteLangSelfTestSuite.java | 1 + .../webapp/META-INF/ignite-webapp-config.xml | 12 +- .../hadoop/fs/v1/IgniteHadoopFileSystem.java | 2 +- .../GridCacheAbstractFieldsQuerySelfTest.java | 4 +- .../cache/GridCacheAbstractQuerySelfTest.java | 4 +- .../cache/GridCacheCrossCacheQuerySelfTest.java | 4 +- .../GridCacheCrossCacheQuerySelfTestNewApi.java | 4 +- .../cache/GridIndexingWithNoopSwapSelfTest.java | 4 +- .../near/GridCacheQueryNodeRestartSelfTest.java | 6 +- .../query/h2/sql/GridQueryParsingTest.java | 5 +- .../tcp/GridOrderedMessageCancelSelfTest.java | 4 +- modules/schema-import/pom.xml | 107 ++ 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 | 117 ++ .../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 | 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 + .../ignite/schema/ui/SchemaImportApp.java | 1615 ++++++++++++++++++ .../ignite/schema/ui/TextColumnValidator.java | 32 + .../schema/test/AbstractSchemaImportTest.java | 134 ++ .../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 - .../ignite/visor/commands/VisorConsole.scala | 3 +- .../commands/cache/VisorCacheCommand.scala | 30 +- .../cache/VisorCacheCompactCommand.scala | 151 -- .../commands/events/VisorEventsCommand.scala | 4 +- .../scala/org/apache/ignite/visor/visor.scala | 4 +- .../cache/VisorCacheCompactCommandSpec.scala | 103 -- .../testsuites/VisorConsoleSelfTestSuite.scala | 3 +- .../apache/ignite/visor/plugin/VisorPlugin.java | 8 +- modules/winservice/README.md | 17 + modules/yardstick/README.md | 17 + pom.xml | 29 +- 325 files changed, 10652 insertions(+), 9712 deletions(-) ----------------------------------------------------------------------
