You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by vo...@apache.org on 2016/03/09 10:28:05 UTC

[50/50] [abbrv] ignite git commit: Merge branch 'master' into ignite-1786

Merge branch 'master' into ignite-1786


Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f78b2eac
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f78b2eac
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f78b2eac

Branch: refs/heads/ignite-1786
Commit: f78b2eac59f107660a4c0bc4f6ddeeb3d5f0c3d9
Parents: 0229baa f687ba2
Author: vozerov-gridgain <vo...@gridgain.com>
Authored: Wed Mar 9 12:26:54 2016 +0300
Committer: vozerov-gridgain <vo...@gridgain.com>
Committed: Wed Mar 9 12:26:54 2016 +0300

----------------------------------------------------------------------
 bin/ignite.bat                                  |    7 +-
 bin/ignite.sh                                   |    6 +-
 modules/aws/pom.xml                             |   18 +
 .../java/org/apache/ignite/IgniteQueue.java     |   27 +-
 .../main/java/org/apache/ignite/IgniteSet.java  |   26 +-
 .../apache/ignite/IgniteSystemProperties.java   |    3 +
 .../ignite/cache/query/ContinuousQuery.java     |   35 +
 .../configuration/IgniteConfiguration.java      |   14 +
 .../internal/GridEventConsumeHandler.java       |    4 +-
 .../internal/GridMessageListenHandler.java      |    4 +-
 .../ignite/internal/IgniteComputeImpl.java      |    4 +-
 .../internal/binary/BinaryClassDescriptor.java  |    2 +-
 .../internal/binary/BinaryEnumObjectImpl.java   |   43 +-
 .../ignite/internal/binary/BinaryUtils.java     |    9 +-
 .../ignite/internal/jdbc/JdbcStatement.java     |    9 +-
 .../ignite/internal/jdbc2/JdbcStatement.java    |    7 +-
 .../internal/managers/GridManagerAdapter.java   |    4 +-
 .../checkpoint/GridCheckpointManager.java       |    2 +-
 .../managers/communication/GridIoManager.java   |  192 +-
 .../deployment/GridDeploymentCommunication.java |    2 +-
 .../deployment/GridDeploymentLocalStore.java    |    2 +-
 .../discovery/GridDiscoveryManager.java         |   18 +-
 .../eventstorage/GridEventStorageManager.java   |   10 +-
 .../processors/affinity/GridAffinityUtils.java  |    3 +-
 .../cache/CacheEntryPredicateAdapter.java       |    3 +
 .../cache/CacheEntrySerializablePredicate.java  |    3 +-
 .../cache/CacheInvokeDirectResult.java          |    3 +-
 .../processors/cache/CacheLazyEntry.java        |    3 +-
 .../internal/processors/cache/CacheObject.java  |    3 +
 .../processors/cache/GridCacheAdapter.java      |    5 +-
 .../cache/GridCacheDeploymentManager.java       |    5 +
 .../processors/cache/GridCacheMessage.java      |    4 +-
 .../processors/cache/GridCacheMvccManager.java  |  144 +-
 .../processors/cache/GridCacheProcessor.java    |   25 +-
 .../processors/cache/GridCacheUtils.java        |   28 +
 .../processors/cache/IgniteCacheProxy.java      |    4 +
 .../cache/affinity/GridCacheAffinityImpl.java   |    7 +-
 .../binary/CacheObjectBinaryProcessorImpl.java  |    3 +-
 .../GridDistributedLockResponse.java            |    3 +-
 .../GridDistributedTxPrepareRequest.java        |    2 +-
 .../GridDistributedTxPrepareResponse.java       |    3 +-
 .../dht/GridDhtAffinityAssignmentResponse.java  |    3 +-
 .../distributed/dht/GridDhtLockFuture.java      |   17 +-
 .../dht/GridDhtPartitionTopologyImpl.java       |   12 +-
 .../dht/GridDhtTxFinishResponse.java            |    3 +-
 .../cache/distributed/dht/GridDhtTxRemote.java  |   11 +-
 .../dht/atomic/GridDhtAtomicUpdateResponse.java |    3 +-
 .../dht/atomic/GridNearAtomicUpdateRequest.java |    3 +-
 .../atomic/GridNearAtomicUpdateResponse.java    |    3 +-
 .../dht/preloader/GridDhtForceKeysResponse.java |    3 +-
 .../GridDhtPartitionDemandMessage.java          |    3 +-
 .../preloader/GridDhtPartitionsFullMessage.java |    5 +-
 .../GridDhtPartitionsSingleMessage.java         |    5 +-
 .../distributed/near/GridNearGetResponse.java   |    3 +-
 .../near/GridNearSingleGetResponse.java         |    3 +-
 .../near/GridNearTxFinishResponse.java          |    3 +-
 .../distributed/near/GridNearTxRemote.java      |    9 +-
 .../cache/query/GridCacheLocalQueryFuture.java  |    7 +-
 .../cache/query/GridCacheQueryRequest.java      |   13 +-
 .../cache/query/GridCacheQueryResponse.java     |    3 +-
 .../cache/query/GridCacheSqlQuery.java          |    6 +-
 .../CacheContinuousQueryBatchAck.java           |    4 +
 .../continuous/CacheContinuousQueryHandler.java |  139 +-
 .../CacheContinuousQueryHandlerV2.java          |  176 +
 .../continuous/CacheContinuousQueryManager.java |  238 +-
 .../cache/transactions/IgniteTxEntry.java       |    6 +-
 .../IgniteTxImplicitSingleStateImpl.java        |    5 +-
 .../transactions/IgniteTxLocalAdapter.java      |    4 +
 .../IgniteTxRemoteSingleStateImpl.java          |    6 +-
 .../version/GridCacheRawVersionedEntry.java     |    5 +-
 .../IgniteCacheObjectProcessorImpl.java         |    3 +-
 .../closure/GridClosureProcessor.java           |    6 +-
 .../continuous/GridContinuousProcessor.java     |   14 +-
 .../datastreamer/DataStreamProcessor.java       |    4 +-
 .../datastreamer/DataStreamerImpl.java          |   21 +-
 .../datastructures/GridCacheQueueAdapter.java   |   25 +
 .../datastructures/GridCacheQueueProxy.java     |   14 +-
 .../datastructures/GridCacheSetImpl.java        |   38 +-
 .../datastructures/GridCacheSetProxy.java       |   14 +-
 .../internal/processors/igfs/IgfsFileImpl.java  |   23 +
 .../internal/processors/igfs/IgfsFileInfo.java  |   54 +-
 .../internal/processors/igfs/IgfsImpl.java      |   23 +-
 .../processors/igfs/IgfsMetaManager.java        |  238 +-
 .../processors/job/GridJobProcessor.java        |   10 +-
 .../internal/processors/job/GridJobWorker.java  |    2 +-
 .../offheap/GridOffHeapProcessor.java           |    2 +-
 .../processors/platform/PlatformContext.java    |    9 +-
 .../platform/PlatformContextImpl.java           |   13 +-
 .../platform/PlatformProcessorImpl.java         |   14 +-
 .../platform/compute/PlatformCompute.java       |   23 +-
 .../utils/PlatformConfigurationUtils.java       |    6 +-
 .../processors/query/GridQueryProcessor.java    |   13 +-
 .../handlers/log/GridLogCommandHandler.java     |   32 +-
 .../handlers/task/GridTaskCommandHandler.java   |    6 +-
 .../service/GridServiceProcessor.java           |    5 +-
 .../processors/service/GridServiceProxy.java    |  110 +-
 .../processors/task/GridTaskProcessor.java      |    5 +-
 .../processors/task/GridTaskWorker.java         |    9 +-
 .../ignite/internal/util/GridHandleTable.java   |    7 +-
 .../ignite/internal/util/IgniteUtils.java       |   65 +-
 .../util/StripedCompositeReadWriteLock.java     |  174 +
 .../ignite/internal/visor/cache/VisorCache.java |    2 +-
 .../cache/VisorCacheAggregatedMetrics.java      |  113 +-
 .../internal/visor/cache/VisorCacheMetrics.java |   88 +-
 .../cache/VisorCacheMetricsCollectorTask.java   |   21 +-
 .../visor/cache/VisorCacheMetricsV2.java        |   66 +
 .../internal/visor/cache/VisorCacheV2.java      |    2 +-
 .../internal/visor/util/VisorTaskUtils.java     |    4 +-
 .../ignite/logger/java/JavaLoggerFormatter.java |    4 +-
 .../OptimizedObjectStreamRegistry.java          |  145 +-
 .../ignite/resources/JobContextResource.java    |    4 +-
 .../org/apache/ignite/spi/IgniteSpiAdapter.java |   15 +
 .../ignite/spi/IgniteSpiConsistencyChecked.java |    8 +
 .../ignite/spi/discovery/tcp/ClientImpl.java    |   31 +-
 .../ignite/spi/discovery/tcp/ServerImpl.java    |   18 +-
 .../spi/discovery/tcp/TcpDiscoverySpi.java      |    3 +-
 .../tcp/internal/TcpDiscoveryNode.java          |   41 +-
 .../TcpDiscoveryMulticastIpFinder.java          |    1 +
 .../sharedfs/TcpDiscoverySharedFsIpFinder.java  |   35 +-
 .../TcpDiscoveryCustomEventMessage.java         |    2 +-
 .../spi/swapspace/file/FileSwapSpaceSpi.java    |    2 +
 .../spi/swapspace/noop/NoopSwapSpaceSpi.java    |    2 +
 .../org/apache/ignite/thread/IgniteThread.java  |   34 +-
 .../ignite/thread/IgniteThreadFactory.java      |    7 +-
 .../GridTaskCancelSingleNodeSelfTest.java       |   37 +-
 .../internal/binary/BinaryEnumsSelfTest.java    |   51 +-
 .../cache/CacheEntryProcessorCopySelfTest.java  |  213 +
 .../cache/CacheEnumOperationsAbstractTest.java  |   32 +
 .../cache/GridCacheAbstractFullApiSelfTest.java |   75 +-
 .../cache/GridCacheAbstractSelfTest.java        |   19 +
 .../GridCacheOnCopyFlagAbstractSelfTest.java    |  479 +-
 ...ridCacheSwapSpaceSpiConsistencySelfTest.java |  146 +
 .../IgniteCacheConfigVariationsFullApiTest.java | 5851 ++++++++++++++++++
 .../IgniteCacheEntryListenerAbstractTest.java   |   75 +-
 .../cache/IgniteCacheEntryListenerTxTest.java   |    5 -
 .../IgniteCachePutStackOverflowSelfTest.java    |  133 +
 .../GridCacheBinaryObjectsAbstractSelfTest.java |   40 +
 .../GridCacheQueueApiSelfAbstractTest.java      |  104 +-
 .../GridCacheSetAbstractSelfTest.java           |  103 +-
 ...idCacheReplicatedPreloadOffHeapSelfTest.java |    3 +-
 .../GridCacheReplicatedPreloadSelfTest.java     |  216 +-
 .../CacheContinuousQueryFactoryFilterTest.java  |  714 +++
 ...ContinuousQueryFailoverAbstractSelfTest.java |    2 +-
 .../CacheContinuousQueryOperationP2PTest.java   |  326 +
 ...acheContinuousQueryRandomOperationsTest.java |   63 +-
 .../igfs/IgfsDataManagerSelfTest.java           |   24 +-
 .../igfs/IgfsDualAbstractSelfTest.java          |   74 +-
 .../processors/igfs/IgfsFileInfoSelfTest.java   |   11 +-
 .../handlers/log/GridLogCommandHandlerTest.java |   97 +-
 .../GridServiceProxyNodeStopSelfTest.java       |  105 +
 .../processors/service/inner/MyService.java     |   11 +
 .../processors/service/inner/MyServiceImpl.java |   10 +
 .../internal/util/GridHandleTableSelfTest.java  |   50 +
 ...namicProxySerializationMultiJvmSelfTest.java |  106 +-
 .../OptimizedMarshallerPooledSelfTest.java      |   44 +
 .../platform/PlatformStartIgniteTask.java       |   77 +
 .../ignite/platform/PlatformStopIgniteTask.java |   74 +
 .../TcpDiscoveryIpFinderAbstractSelfTest.java   |   15 +-
 .../GridSwapSpaceSpiConsistencySelfTest.java    |  131 +
 .../configvariations/CacheStartMode.java        |   29 +
 .../configvariations/ConfigFactory.java         |   39 +
 .../configvariations/ConfigParameter.java       |   34 +
 .../configvariations/ConfigVariations.java      |  346 ++
 .../ConfigVariationsFactory.java                |  197 +
 .../ConfigVariationsTestSuiteBuilder.java       |  382 ++
 .../IgniteConfigVariationsTestSuite.java        |   50 +
 .../configvariations/Parameters.java            |  377 ++
 .../configvariations/VariationsIterator.java    |  174 +
 .../configvariations/VariationsTestsConfig.java |  161 +
 .../testframework/junits/GridAbstractTest.java  |   51 +-
 .../junits/GridTestKernalContext.java           |   34 +-
 ...IgniteCacheConfigVariationsAbstractTest.java |  583 ++
 .../IgniteConfigVariationsAbstractTest.java     |  420 ++
 .../ConfigVariationsTestSuiteBuilderTest.java   |  112 +
 .../testframework/test/ParametersTest.java      |   87 +
 .../test/VariationsIteratorTest.java            |  156 +
 .../ignite/testsuites/IgniteBasicTestSuite.java |    8 +
 .../testsuites/IgniteBinaryBasicTestSuite.java  |    4 +
 ...heBasicConfigVariationsFullApiTestSuite.java |   41 +
 .../ignite/testsuites/IgniteCacheTestSuite.java |    2 +
 .../testsuites/IgniteCacheTestSuite5.java       |    4 +
 .../testsuites/IgniteKernalSelfTestSuite.java   |    4 +-
 .../IgniteMarshallerSelfTestSuite.java          |    8 +-
 .../IgniteSpiSwapSpaceSelfTestSuite.java        |    2 +
 .../p2p/CacheDeploymentEntryEventFilter.java    |   33 +
 .../CacheDeploymentEntryEventFilterFactory.java |   31 +
 .../CacheDeploymentExternalizableTestValue.java |   69 +
 .../fs/IgniteHadoopIgfsSecondaryFileSystem.java |    7 +-
 .../processors/query/h2/IgniteH2Indexing.java   |  116 +-
 .../query/h2/twostep/GridMapQueryExecutor.java  |    2 +-
 .../cache/CacheQueryNewClientSelfTest.java      |  115 +
 .../IgniteCacheQuerySelfTestSuite.java          |   10 +-
 .../Apache.Ignite.Core.Tests.csproj             |    2 +
 .../Binary/BinarySelfTest.cs                    |  110 +-
 .../Compute/MixedClusterTest.cs                 |  123 +
 .../Config/Compute/compute-grid1.xml            |    1 -
 .../Config/Compute/compute-grid2.xml            |   15 +-
 .../IgniteConfigurationTest.cs                  |   17 +-
 .../ProjectFilesTest.cs                         |   94 +
 .../Apache.Ignite.Core.Tests/TestUtils.cs       |   33 +-
 .../Apache.Ignite.Core.csproj                   |    2 +-
 .../Binary/BinaryReflectiveSerializer.cs        |  241 +
 .../Multicast/TcpDiscoveryMulticastIpFinder.cs  |    2 +-
 .../Impl/Binary/BinaryReflectiveActions.cs      |  576 +-
 .../Impl/Binary/BinaryReflectiveSerializer.cs   |  218 -
 .../Impl/Binary/BinaryWriter.cs                 |   28 +-
 .../ignite/schema/ui/SchemaImportApp.java       |  205 +-
 .../commands/cache/VisorCacheCommand.scala      |   30 +-
 .../ignite/cache/websession/WebSession.java     |   52 +-
 .../cache/websession/WebSessionFilter.java      |   21 +-
 .../IgniteWebSessionSelfTestSuite.java          |    5 +
 .../internal/websession/WebSessionSelfTest.java |  124 +-
 .../yardstick/IgniteBenchmarkArguments.java     |   11 +
 .../org/apache/ignite/yardstick/IgniteNode.java |    2 +
 .../cache/IgniteCacheAbstractBenchmark.java     |   54 +
 modules/zookeeper/pom.xml                       |   50 +-
 .../tcp/ipfinder/zk/ZookeeperIpFinderTest.java  |   24 +-
 217 files changed, 16675 insertions(+), 1599 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ignite/blob/f78b2eac/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------