Merge branch master into ignite-950
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/4f63227f Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/4f63227f Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/4f63227f Branch: refs/heads/ignite-950 Commit: 4f63227fb62eef6b2b58bff253c8508f08252527 Parents: 8c2d5cc f557728 Author: Alexey Goncharuk <agoncha...@gridgain.com> Authored: Fri Jul 17 16:56:31 2015 -0700 Committer: Alexey Goncharuk <agoncha...@gridgain.com> Committed: Fri Jul 17 16:56:31 2015 -0700 ---------------------------------------------------------------------- DEVNOTES.txt | 8 + RELEASE_NOTES.txt | 2 + assembly/LICENSE_FABRIC | 306 +++++ assembly/LICENSE_HADOOP | 259 ++++ assembly/NOTICE_FABRIC | 13 + assembly/NOTICE_HADOOP | 12 + assembly/dependencies-fabric.xml | 13 + assembly/dependencies-hadoop.xml | 12 + assembly/dependencies-visor-console.xml | 20 +- assembly/release-base.xml | 10 - assembly/release-fabric.xml | 12 + assembly/release-hadoop.xml | 12 + examples/pom.xml | 2 +- modules/aop/licenses/aspectj-epl-license.txt | 69 - modules/aop/pom.xml | 2 +- modules/apache-license-gen/pom.xml | 48 + .../src/main/resources/META-INF/licenses.txt.vm | 42 + modules/aws/pom.xml | 2 +- modules/clients/pom.xml | 2 +- modules/cloud/pom.xml | 2 +- modules/codegen/pom.xml | 2 +- modules/core/licenses/jsr166-license.txt | 3 + modules/core/licenses/snaptree-bsd-license.txt | 2 +- modules/core/pom.xml | 2 +- .../IgniteClientDisconnectedException.java | 61 + .../java/org/apache/ignite/IgniteCluster.java | 8 + .../apache/ignite/cache/CacheTypeMetadata.java | 53 +- .../apache/ignite/internal/GridComponent.java | 18 + .../ignite/internal/GridJobSiblingImpl.java | 2 +- .../ignite/internal/GridKernalContext.java | 5 + .../ignite/internal/GridKernalContextImpl.java | 31 +- .../ignite/internal/GridKernalGateway.java | 46 +- .../ignite/internal/GridKernalGatewayImpl.java | 85 +- .../apache/ignite/internal/GridKernalState.java | 3 + .../ignite/internal/GridPluginComponent.java | 11 + ...gniteClientDisconnectedCheckedException.java | 49 + .../apache/ignite/internal/IgniteKernal.java | 234 +++- .../cluster/IgniteClusterAsyncImpl.java | 5 + .../internal/cluster/IgniteClusterImpl.java | 18 + .../internal/managers/GridManagerAdapter.java | 19 +- .../deployment/GridDeploymentCommunication.java | 2 +- .../deployment/GridDeploymentManager.java | 95 +- .../discovery/GridDiscoveryManager.java | 188 ++- .../processors/GridProcessorAdapter.java | 11 + .../affinity/GridAffinityAssignmentCache.java | 26 +- .../cache/CacheOsConflictResolutionManager.java | 6 + .../cache/DynamicCacheChangeBatch.java | 17 + .../processors/cache/GridCacheAdapter.java | 25 +- .../cache/GridCacheAffinityManager.java | 21 +- .../cache/GridCacheConcurrentMap.java | 15 +- .../processors/cache/GridCacheContext.java | 55 +- .../processors/cache/GridCacheGateway.java | 116 +- .../processors/cache/GridCacheIoManager.java | 8 + .../processors/cache/GridCacheManager.java | 6 + .../cache/GridCacheManagerAdapter.java | 6 + .../processors/cache/GridCacheMvccManager.java | 43 +- .../GridCachePartitionExchangeManager.java | 134 +- .../processors/cache/GridCachePreloader.java | 5 + .../cache/GridCachePreloaderAdapter.java | 5 + .../processors/cache/GridCacheProcessor.java | 311 ++++- .../cache/GridCacheSharedContext.java | 113 +- .../cache/GridCacheSharedManager.java | 11 +- .../cache/GridCacheSharedManagerAdapter.java | 20 +- .../processors/cache/GridCacheUtils.java | 11 + .../processors/cache/IgniteCacheFutureImpl.java | 11 + .../processors/cache/IgniteCacheProxy.java | 57 +- .../CacheDataStructuresManager.java | 35 + .../distributed/GridCacheTxFinishSync.java | 46 + .../distributed/dht/GridDhtCacheAdapter.java | 14 +- .../dht/GridDhtPartitionTopologyImpl.java | 24 + .../distributed/dht/GridDhtTopologyFuture.java | 14 - .../dht/GridPartitionedGetFuture.java | 13 +- .../dht/atomic/GridDhtAtomicCache.java | 6 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 31 +- .../GridDhtPartitionsExchangeFuture.java | 31 +- .../dht/preloader/GridDhtPreloader.java | 16 +- .../distributed/near/GridNearCacheAdapter.java | 8 + .../distributed/near/GridNearGetFuture.java | 13 +- .../cache/dr/GridOsCacheDrManager.java | 7 +- .../query/GridCacheDistributedQueryManager.java | 22 + .../cache/query/GridCacheQueryAdapter.java | 11 +- .../query/GridCacheQueryFutureAdapter.java | 2 +- .../continuous/CacheContinuousQueryHandler.java | 5 + .../transactions/IgniteTransactionsImpl.java | 59 +- .../cache/transactions/IgniteTxManager.java | 23 +- .../transactions/TransactionProxyImpl.java | 2 +- .../cache/version/GridCacheVersionManager.java | 9 +- .../clock/GridClockSyncProcessor.java | 6 +- .../processors/cluster/ClusterProcessor.java | 11 + .../continuous/GridContinuousHandler.java | 9 +- .../continuous/GridContinuousProcessor.java | 127 +- .../datastreamer/DataStreamProcessor.java | 24 +- .../datastreamer/DataStreamerImpl.java | 90 +- .../datastructures/DataStructuresProcessor.java | 33 +- .../datastructures/GridCacheAtomicLongImpl.java | 33 +- .../GridCacheAtomicReferenceImpl.java | 34 +- .../GridCacheAtomicSequenceImpl.java | 33 +- .../GridCacheAtomicStampedImpl.java | 33 +- .../GridCacheCountDownLatchImpl.java | 51 +- .../datastructures/GridCacheRemovable.java | 6 +- .../datastructures/GridCacheSetImpl.java | 15 +- .../datastructures/GridCacheSetProxy.java | 47 +- .../processors/job/GridJobProcessor.java | 2 +- .../internal/processors/job/GridJobWorker.java | 2 +- .../processors/query/GridQueryIndexing.java | 7 + .../processors/query/GridQueryProcessor.java | 10 +- .../service/GridServiceProcessor.java | 45 +- .../processors/service/GridServiceProxy.java | 13 +- .../processors/task/GridTaskProcessor.java | 55 +- .../processors/task/GridTaskWorker.java | 59 +- .../ignite/internal/util/IgniteUtils.java | 28 + .../util/future/GridFutureChainListener.java | 4 - .../internal/util/future/IgniteFutureImpl.java | 12 +- .../shmem/IpcSharedMemoryClientEndpoint.java | 5 +- .../ignite/internal/util/lang/GridFunc.java | 2 + .../plugin/security/SecurityPermission.java | 7 +- .../plugin/security/SecuritySubjectType.java | 3 +- .../java/org/apache/ignite/spi/IgniteSpi.java | 15 + .../org/apache/ignite/spi/IgniteSpiAdapter.java | 51 +- .../communication/tcp/TcpCommunicationSpi.java | 356 ++++-- .../spi/discovery/DiscoverySpiDataExchange.java | 3 +- .../ignite/spi/discovery/tcp/ClientImpl.java | 408 ++++-- .../ignite/spi/discovery/tcp/ServerImpl.java | 177 ++- .../spi/discovery/tcp/TcpDiscoveryImpl.java | 9 +- .../spi/discovery/tcp/TcpDiscoverySpi.java | 33 +- .../tcp/internal/TcpDiscoveryNode.java | 19 + .../messages/TcpDiscoveryAbstractMessage.java | 3 + .../messages/TcpDiscoveryClientAckResponse.java | 64 + .../messages/TcpDiscoveryHandshakeResponse.java | 14 + .../spi/swapspace/file/FileSwapSpaceSpi.java | 2 +- .../META-INF/classnames-jdk.properties | 3 + .../core/src/main/resources/ignite.properties | 2 +- .../internal/GridUpdateNotifierSelfTest.java | 15 +- .../IgniteClientReconnectAbstractTest.java | 363 ++++++ .../IgniteClientReconnectApiExceptionTest.java | 846 ++++++++++++ .../IgniteClientReconnectAtomicsTest.java | 672 ++++++++++ .../IgniteClientReconnectCacheTest.java | 1202 ++++++++++++++++++ .../IgniteClientReconnectCollectionsTest.java | 443 +++++++ .../IgniteClientReconnectComputeTest.java | 192 +++ ...eClientReconnectContinuousProcessorTest.java | 372 ++++++ ...IgniteClientReconnectDiscoveryStateTest.java | 123 ++ ...niteClientReconnectFailoverAbstractTest.java | 231 ++++ .../IgniteClientReconnectFailoverTest.java | 212 +++ .../IgniteClientReconnectServicesTest.java | 260 ++++ .../internal/IgniteClientReconnectStopTest.java | 106 ++ .../IgniteClientReconnectStreamerTest.java | 233 ++++ .../IgniteSlowClientDetectionSelfTest.java | 1 + .../GridDeploymentManagerStopSelfTest.java | 7 + .../cache/GridCacheAbstractFullApiSelfTest.java | 32 + .../IgniteCacheAbstractStopBusySelfTest.java | 2 +- .../cache/IgniteCacheDynamicStopSelfTest.java | 6 +- .../IgniteTxExceptionAbstractSelfTest.java | 1 + .../GridCacheAbstractNodeRestartSelfTest.java | 12 +- .../distributed/IgniteCache150ClientsTest.java | 1 + .../IgniteCacheClientReconnectTest.java | 175 +++ .../IgniteCacheServerNodeConcurrentStart.java | 96 ++ .../IgniteCacheSystemTransactionsSelfTest.java | 2 +- ...eAtomicInvalidPartitionHandlingSelfTest.java | 2 +- .../GridCacheReplicatedInvalidateSelfTest.java | 3 +- ...acheAtomicReplicatedNodeRestartSelfTest.java | 14 +- .../loadtests/hashmap/GridCacheTestContext.java | 4 +- .../tcp/TcpClientDiscoverySpiSelfTest.java | 562 +++++++- .../tcp/TcpDiscoveryMultiThreadedTest.java | 140 +- .../testframework/junits/GridAbstractTest.java | 5 + .../multijvm/IgniteClusterProcessProxy.java | 5 + .../testsuites/IgniteCacheTestSuite2.java | 2 +- .../testsuites/IgniteCacheTestSuite4.java | 2 - .../testsuites/IgniteClientNodesTestSuite.java | 42 + .../IgniteClientReconnectTestSuite.java | 48 + modules/extdata/p2p/pom.xml | 2 +- .../extdata/uri/modules/uri-dependency/pom.xml | 6 +- modules/extdata/uri/pom.xml | 26 +- modules/gce/pom.xml | 2 +- .../geospatial/licenses/jts-lgpl-license.txt | 165 --- modules/geospatial/pom.xml | 2 +- modules/hadoop/pom.xml | 2 +- .../licenses/hibernate-lgpl-2.1-license.txt | 174 --- modules/hibernate/pom.xml | 2 +- modules/indexing/licenses/h2-epl-license.txt | 69 - modules/indexing/pom.xml | 2 +- .../processors/query/h2/IgniteH2Indexing.java | 5 + .../query/h2/twostep/GridMergeIndex.java | 45 +- .../h2/twostep/GridReduceQueryExecutor.java | 70 +- ...ClientReconnectCacheQueriesFailoverTest.java | 225 ++++ .../cache/IgniteClientReconnectQueriesTest.java | 427 +++++++ ...dCacheAbstractReduceFieldsQuerySelfTest.java | 4 + .../IgniteCacheWithIndexingTestSuite.java | 1 + modules/jcl/pom.xml | 2 +- modules/jta/licenses/jta-license.txt | 2 + modules/jta/pom.xml | 2 +- modules/kafka/pom.xml | 2 +- modules/log4j/pom.xml | 2 +- modules/mesos/licenses/jetty-epl-license.txt | 69 - modules/mesos/pom.xml | 3 +- .../apache/ignite/mesos/ClusterProperties.java | 14 + .../apache/ignite/mesos/IgniteScheduler.java | 26 +- modules/rest-http/pom.xml | 8 +- .../scalar-2.10/licenses/scala-bsd-license.txt | 18 - modules/scalar-2.10/pom.xml | 2 +- modules/scalar/licenses/scala-bsd-license.txt | 18 - modules/scalar/pom.xml | 2 +- .../licenses/cron4j-lgpl-2.1-license.txt | 174 --- modules/schedule/pom.xml | 2 +- modules/schema-import/pom.xml | 2 +- modules/slf4j/licenses/sl4j-mit-license.txt | 21 - modules/slf4j/pom.xml | 2 +- .../spark-2.10/licenses/scala-bsd-license.txt | 18 - modules/spark-2.10/pom.xml | 2 +- modules/spark/licenses/scala-bsd-license.txt | 18 - modules/spark/pom.xml | 2 +- modules/spring/pom.xml | 2 +- .../apache/ignite/cache/spring/SpringCache.java | 2 +- .../ignite/cache/spring/SpringCacheManager.java | 22 +- modules/ssh/licenses/jcraft-revised-bsd.txt | 28 - modules/ssh/pom.xml | 2 +- modules/tools/licenses/jodd-revised-bsd.txt | 21 - modules/tools/pom.xml | 2 +- .../urideploy/licenses/jtidy-mit-license.txt | 50 - modules/urideploy/pom.xml | 8 +- modules/visor-console-2.10/pom.xml | 2 +- .../licenses/jline-bsd-license.txt | 18 - .../licenses/scala-bsd-license.txt | 18 - modules/visor-console/pom.xml | 2 +- .../licenses/slf4j-mit-license.txt | 21 - modules/visor-plugins/pom.xml | 2 +- modules/web/pom.xml | 8 +- modules/yardstick/pom.xml | 2 +- modules/yarn/README.txt | 28 + modules/yarn/licenses/apache-2.0.txt | 202 +++ modules/yarn/pom.xml | 101 ++ .../apache/ignite/yarn/ApplicationMaster.java | 400 ++++++ .../apache/ignite/yarn/ClusterProperties.java | 432 +++++++ .../org/apache/ignite/yarn/IgniteContainer.java | 84 ++ .../org/apache/ignite/yarn/IgniteProvider.java | 339 +++++ .../apache/ignite/yarn/IgniteYarnClient.java | 178 +++ .../org/apache/ignite/yarn/package-info.java | 22 + .../ignite/yarn/utils/IgniteYarnUtils.java | 81 ++ .../main/resources/ignite-default-config.xml | 35 + .../org/apache/ignite/IgniteYarnTestSuite.java | 38 + .../yarn/IgniteApplicationMasterSelfTest.java | 532 ++++++++ parent/pom.xml | 55 + pom.xml | 18 +- 242 files changed, 13880 insertions(+), 2128 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f63227f/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java index 997383d,93ce9dd..49177c3 --- a/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java +++ b/modules/core/src/main/java/org/apache/ignite/cache/CacheTypeMetadata.java @@@ -17,7 -17,7 +17,8 @@@ package org.apache.ignite.cache; + import org.apache.ignite.cache.store.jdbc.*; +import org.apache.ignite.internal.processors.query.*; import org.apache.ignite.internal.util.tostring.*; import org.apache.ignite.internal.util.typedef.internal.*; import org.apache.ignite.lang.*; @@@ -45,10 -44,7 +46,10 @@@ public class CacheTypeMetadata implemen /** Value class used to store value in cache. */ private String valType; + /** Simple value type name that will be used as SQL table name.*/ + private String simpleValType; + - /** Key fields. */ + /** Optional persistent key fields (needed only if {@link CacheJdbcPojoStore} is used). */ @GridToStringInclude private Collection<CacheTypeFieldMetadata> keyFields; @@@ -286,15 -272,12 +287,15 @@@ } /** - * Sets ascending-indexed fields. + * Sets name-to-type map for ascending-indexed fields. * - * @param ascFlds Map of ascending-indexed fields. + * @param ascFlds Name-to-type map for ascending-indexed fields. */ public void setAscendingFields(Map<String, Class<?>> ascFlds) { - this.ascFlds = ascFlds; + if (ascFlds == null) + this.ascFlds = ascFlds; + else + this.ascFlds.putAll(ascFlds); } /** http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f63227f/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f63227f/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java ---------------------------------------------------------------------- diff --cc modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java index e486f3a,fd8b50c..c3cbafc --- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java +++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContextImpl.java @@@ -303,9 -304,12 +304,15 @@@ public class GridKernalContextImpl impl /** Marshaller context. */ private MarshallerContextImpl marshCtx; + /** Default class loader. */ + private ClassLoader dfltClsLdr; + + /** */ + private ClusterNode locNode; + + /** */ + private volatile boolean disconnected; + /** * No-arg constructor is required by externalization. */ http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f63227f/modules/core/src/main/java/org/apache/ignite/internal/IgniteKernal.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f63227f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f63227f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/GridCacheContext.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f63227f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearGetFuture.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f63227f/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/query/GridCacheQueryFutureAdapter.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f63227f/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryIndexing.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f63227f/modules/core/src/main/java/org/apache/ignite/internal/processors/query/GridQueryProcessor.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f63227f/modules/core/src/main/java/org/apache/ignite/internal/util/IgniteUtils.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f63227f/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/IgniteH2Indexing.java ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/4f63227f/modules/yardstick/pom.xml ----------------------------------------------------------------------
