You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ag...@apache.org on 2015/09/03 03:03:38 UTC
[29/50] [abbrv] ignite git commit: Merge remote-tracking branch
'upstream/master' into ignite-264
Merge remote-tracking branch 'upstream/master' into ignite-264
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d97a340c
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d97a340c
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d97a340c
Branch: refs/heads/ignite-264
Commit: d97a340c36c0f559e29fd65437f43c4e4a905cd8
Parents: 9278d80 89e94b6
Author: Alexey Goncharuk <ag...@gridgain.com>
Authored: Tue Aug 25 17:01:09 2015 -0700
Committer: Alexey Goncharuk <ag...@gridgain.com>
Committed: Tue Aug 25 17:01:09 2015 -0700
----------------------------------------------------------------------
examples/config/example-cache.xml | 2 -
.../examples/igfs/IgfsMapReduceExample.java | 3 +
.../examples/servicegrid/ServicesExample.java | 13 +-
.../ignite/codegen/MessageCodeGenerator.java | 25 +-
modules/core/pom.xml | 21 +
.../src/main/java/org/apache/ignite/Ignite.java | 7 +
.../java/org/apache/ignite/IgniteCache.java | 41 +
.../java/org/apache/ignite/IgnitePortables.java | 362 ++
.../apache/ignite/IgniteSystemProperties.java | 3 +
.../store/jdbc/CacheAbstractJdbcStore.java | 45 +-
.../cache/store/jdbc/CacheJdbcPojoStore.java | 32 +-
.../store/jdbc/CacheJdbcPojoStoreFactory.java | 2 +-
.../store/jdbc/dialect/BasicJdbcDialect.java | 3 +
.../cache/store/jdbc/dialect/DB2Dialect.java | 3 +
.../cache/store/jdbc/dialect/H2Dialect.java | 3 +
.../cache/store/jdbc/dialect/JdbcDialect.java | 3 +-
.../cache/store/jdbc/dialect/MySQLDialect.java | 3 +
.../cache/store/jdbc/dialect/OracleDialect.java | 3 +
.../store/jdbc/dialect/SQLServerDialect.java | 3 +
.../cluster/ClusterTopologyException.java | 18 +
.../configuration/CacheConfiguration.java | 40 +
.../configuration/IgniteConfiguration.java | 27 +-
.../configuration/PlatformConfiguration.java | 25 +
.../internal/GridEventConsumeHandler.java | 14 +-
.../ignite/internal/GridJobCancelRequest.java | 2 +-
.../ignite/internal/GridJobExecuteRequest.java | 2 +-
.../ignite/internal/GridJobExecuteResponse.java | 2 +-
.../ignite/internal/GridJobSiblingsRequest.java | 2 +-
.../internal/GridJobSiblingsResponse.java | 2 +-
.../ignite/internal/GridKernalContext.java | 6 +
.../ignite/internal/GridKernalContextImpl.java | 15 +-
.../ignite/internal/GridTaskCancelRequest.java | 2 +-
.../ignite/internal/GridTaskSessionRequest.java | 2 +-
.../org/apache/ignite/internal/IgniteEx.java | 1 +
.../apache/ignite/internal/IgniteKernal.java | 13 +-
.../ignite/internal/MarshallerContextImpl.java | 24 +-
.../ClusterTopologyCheckedException.java | 18 +
.../internal/direct/DirectByteBufferStream.java | 2 +-
.../internal/direct/DirectMessageReader.java | 6 +
.../interop/InteropAwareEventFilter.java | 37 -
.../internal/interop/InteropBootstrap.java | 35 -
.../interop/InteropBootstrapFactory.java | 39 -
.../internal/interop/InteropException.java | 71 -
.../internal/interop/InteropIgnition.java | 241 --
.../interop/InteropLocalEventListener.java | 28 -
.../interop/InteropNoCallbackException.java | 50 -
.../internal/interop/InteropProcessor.java | 51 -
.../checkpoint/GridCheckpointRequest.java | 2 +-
.../managers/communication/GridIoManager.java | 2 +-
.../managers/communication/GridIoMessage.java | 2 +-
.../communication/GridIoMessageFactory.java | 6 +
.../communication/GridIoUserMessage.java | 2 +-
.../deployment/GridDeploymentInfoBean.java | 2 +-
.../deployment/GridDeploymentRequest.java | 2 +-
.../deployment/GridDeploymentResponse.java | 2 +-
.../eventstorage/GridEventStorageManager.java | 10 +-
.../eventstorage/GridEventStorageMessage.java | 2 +-
.../platform/PlatformAwareEventFilter.java | 37 +
.../platform/PlatformLocalEventListener.java | 28 +
.../portable/GridPortableMarshaller.java | 304 ++
.../portable/PortableAbstractLazyValue.java | 57 +
.../internal/portable/PortableBuilderEnum.java | 114 +
.../internal/portable/PortableBuilderImpl.java | 519 +++
.../portable/PortableBuilderReader.java | 775 ++++
.../PortableBuilderSerializationAware.java | 29 +
.../portable/PortableBuilderSerializer.java | 210 +
.../portable/PortableClassDescriptor.java | 1344 +++++++
.../internal/portable/PortableContext.java | 1089 ++++++
.../portable/PortableEnumArrayLazyValue.java | 111 +
.../portable/PortableLazyArrayList.java | 156 +
.../portable/PortableLazyLinkedList.java | 210 +
.../internal/portable/PortableLazyMap.java | 214 +
.../internal/portable/PortableLazyMapEntry.java | 66 +
.../internal/portable/PortableLazySet.java | 89 +
.../internal/portable/PortableLazyValue.java | 28 +
.../portable/PortableMetaDataCollector.java | 253 ++
.../portable/PortableMetaDataHandler.java | 43 +
.../internal/portable/PortableMetaDataImpl.java | 140 +
.../portable/PortableObjectArrayLazyValue.java | 89 +
.../internal/portable/PortableObjectEx.java | 213 +
.../internal/portable/PortableObjectImpl.java | 383 ++
.../portable/PortableObjectOffheapImpl.java | 238 ++
.../portable/PortablePlainLazyValue.java | 47 +
.../portable/PortablePlainPortableObject.java | 50 +
.../internal/portable/PortablePrimitives.java | 773 ++++
.../internal/portable/PortableRawReaderEx.java | 33 +
.../internal/portable/PortableRawWriterEx.java | 60 +
.../portable/PortableReaderContext.java | 83 +
.../internal/portable/PortableReaderExImpl.java | 2949 ++++++++++++++
.../PortableThreadLocalMemoryAllocator.java | 163 +
.../ignite/internal/portable/PortableUtils.java | 419 ++
.../portable/PortableValueWithType.java | 74 +
.../internal/portable/PortableWriterExImpl.java | 1759 +++++++++
.../ignite/internal/portable/package-info.java | 22 +
.../streams/PortableAbstractInputStream.java | 343 ++
.../streams/PortableAbstractOutputStream.java | 323 ++
.../streams/PortableAbstractStream.java | 82 +
.../streams/PortableHeapInputStream.java | 134 +
.../streams/PortableHeapOutputStream.java | 155 +
.../portable/streams/PortableInputStream.java | 168 +
.../streams/PortableMemoryAllocator.java | 76 +
.../streams/PortableOffheapInputStream.java | 129 +
.../streams/PortableOffheapOutputStream.java | 169 +
.../portable/streams/PortableOutputStream.java | 165 +
.../streams/PortableSimpleMemoryAllocator.java | 67 +
.../portable/streams/PortableStream.java | 53 +
.../internal/portable/streams/package-info.java | 22 +
.../affinity/AffinityTopologyVersion.java | 2 +-
.../cache/CacheEntryInfoCollection.java | 2 +-
.../cache/CacheEntryPredicateAdapter.java | 2 +-
.../cache/CacheEntryPredicateContainsValue.java | 2 +-
.../cache/CacheEntrySerializablePredicate.java | 2 +-
.../processors/cache/CacheEvictionEntry.java | 2 +-
.../cache/CacheInvokeDirectResult.java | 2 +-
.../processors/cache/CacheObjectAdapter.java | 2 +-
.../cache/CacheObjectByteArrayImpl.java | 2 +-
.../CachePartialUpdateCheckedException.java | 34 +-
.../processors/cache/GridCacheAdapter.java | 246 +-
.../processors/cache/GridCacheEntryInfo.java | 2 +-
.../cache/GridCacheEvictionManager.java | 2 +-
.../cache/GridCacheEvictionRequest.java | 2 +-
.../cache/GridCacheEvictionResponse.java | 2 +-
.../processors/cache/GridCacheIoManager.java | 1 -
.../processors/cache/GridCacheMapEntry.java | 4 +-
.../processors/cache/GridCacheMessage.java | 2 +-
.../processors/cache/GridCacheProcessor.java | 70 +-
.../processors/cache/GridCacheReturn.java | 2 +-
.../cache/GridCacheSharedContext.java | 17 +
.../processors/cache/GridCacheUtils.java | 23 +
.../processors/cache/IgniteCacheProxy.java | 5 +
.../distributed/GridCacheTtlUpdateRequest.java | 3 +-
.../distributed/GridCacheTxRecoveryRequest.java | 2 +-
.../GridCacheTxRecoveryResponse.java | 2 +-
.../distributed/GridDistributedBaseMessage.java | 2 +-
.../distributed/GridDistributedCacheEntry.java | 11 +-
.../distributed/GridDistributedLockRequest.java | 2 +-
.../GridDistributedLockResponse.java | 2 +-
.../GridDistributedTxFinishRequest.java | 2 +-
.../GridDistributedTxFinishResponse.java | 2 +-
.../GridDistributedTxPrepareRequest.java | 2 +-
.../GridDistributedTxPrepareResponse.java | 2 +-
.../GridDistributedUnlockRequest.java | 2 +-
.../dht/GridDhtAffinityAssignmentRequest.java | 2 +-
.../dht/GridDhtAffinityAssignmentResponse.java | 2 +-
.../distributed/dht/GridDhtCacheAdapter.java | 12 +-
.../cache/distributed/dht/GridDhtGetFuture.java | 12 +-
.../distributed/dht/GridDhtLockRequest.java | 2 +-
.../distributed/dht/GridDhtLockResponse.java | 2 +-
.../distributed/dht/GridDhtTxFinishRequest.java | 2 +-
.../dht/GridDhtTxFinishResponse.java | 2 +-
.../cache/distributed/dht/GridDhtTxLocal.java | 4 +-
.../distributed/dht/GridDhtTxPrepareFuture.java | 150 +-
.../dht/GridDhtTxPrepareRequest.java | 2 +-
.../dht/GridDhtTxPrepareResponse.java | 20 +-
.../distributed/dht/GridDhtUnlockRequest.java | 2 +-
.../GridDhtUnreservedPartitionException.java | 66 +
.../dht/GridPartitionedGetFuture.java | 104 +-
.../dht/atomic/GridDhtAtomicCache.java | 16 +-
.../GridDhtAtomicDeferredUpdateResponse.java | 2 +-
.../dht/atomic/GridDhtAtomicUpdateRequest.java | 2 +-
.../dht/atomic/GridDhtAtomicUpdateResponse.java | 2 +-
.../dht/atomic/GridNearAtomicUpdateFuture.java | 66 +-
.../dht/atomic/GridNearAtomicUpdateRequest.java | 2 +-
.../atomic/GridNearAtomicUpdateResponse.java | 2 +-
.../dht/colocated/GridDhtColocatedCache.java | 19 +-
.../colocated/GridDhtColocatedLockFuture.java | 8 +-
.../dht/preloader/GridDhtForceKeysRequest.java | 3 +-
.../dht/preloader/GridDhtForceKeysResponse.java | 4 +-
.../GridDhtPartitionDemandMessage.java | 2 +-
.../preloader/GridDhtPartitionExchangeId.java | 2 +-
.../GridDhtPartitionSupplyMessage.java | 2 +-
.../GridDhtPartitionsAbstractMessage.java | 2 +-
.../GridDhtPartitionsExchangeFuture.java | 40 +-
.../preloader/GridDhtPartitionsFullMessage.java | 2 +-
.../GridDhtPartitionsSingleMessage.java | 2 +-
.../GridDhtPartitionsSingleRequest.java | 2 +-
.../distributed/near/CacheVersionedValue.java | 2 +-
.../distributed/near/GridNearAtomicCache.java | 6 +-
.../distributed/near/GridNearCacheAdapter.java | 15 +-
.../distributed/near/GridNearCacheEntry.java | 10 +-
.../distributed/near/GridNearGetFuture.java | 120 +-
.../distributed/near/GridNearGetRequest.java | 2 +-
.../distributed/near/GridNearGetResponse.java | 2 +-
.../distributed/near/GridNearLockFuture.java | 12 +-
.../distributed/near/GridNearLockRequest.java | 2 +-
.../distributed/near/GridNearLockResponse.java | 2 +-
.../near/GridNearOptimisticTxPrepareFuture.java | 15 +-
.../GridNearPessimisticTxPrepareFuture.java | 9 +-
.../near/GridNearTransactionalCache.java | 9 +-
.../near/GridNearTxFinishRequest.java | 2 +-
.../near/GridNearTxFinishResponse.java | 2 +-
.../cache/distributed/near/GridNearTxLocal.java | 7 +-
.../near/GridNearTxPrepareRequest.java | 2 +-
.../near/GridNearTxPrepareResponse.java | 5 +-
.../distributed/near/GridNearUnlockRequest.java | 2 +-
.../cache/local/GridLocalCacheEntry.java | 4 +-
.../local/atomic/GridLocalAtomicCache.java | 17 +-
.../CacheDefaultPortableAffinityKeyMapper.java | 51 +
.../portable/CacheObjectPortableContext.java | 187 +
.../portable/CacheObjectPortableProcessor.java | 101 +
.../CacheObjectPortableProcessorImpl.java | 956 +++++
.../cache/portable/IgnitePortablesImpl.java | 176 +
.../cache/portable/PortableMetaDataKey.java | 80 +
.../processors/cache/portable/package-info.java | 22 +
.../cache/query/GridCacheQueryAdapter.java | 56 +-
.../cache/query/GridCacheQueryManager.java | 71 +-
.../cache/query/GridCacheQueryRequest.java | 2 +-
.../cache/query/GridCacheQueryResponse.java | 2 +-
.../cache/query/GridCacheSqlQuery.java | 9 +-
.../continuous/CacheContinuousQueryEntry.java | 2 +-
.../cache/store/CacheOsStoreManager.java | 3 +-
.../cache/transactions/IgniteInternalTx.java | 2 +-
.../cache/transactions/IgniteTxAdapter.java | 19 +-
.../cache/transactions/IgniteTxEntry.java | 2 +-
.../cache/transactions/IgniteTxHandler.java | 5 +-
.../cache/transactions/IgniteTxKey.java | 2 +-
.../transactions/IgniteTxLocalAdapter.java | 4 +-
.../cache/transactions/TxEntryValueHolder.java | 2 +-
.../version/GridCacheRawVersionedEntry.java | 2 +-
.../cache/version/GridCacheVersion.java | 2 +-
.../cache/version/GridCacheVersionEx.java | 2 +-
.../clock/GridClockDeltaSnapshotMessage.java | 2 +-
.../processors/clock/GridClockDeltaVersion.java | 2 +-
.../continuous/GridContinuousMessage.java | 2 +-
.../datastreamer/DataStreamerEntry.java | 2 +-
.../datastreamer/DataStreamerRequest.java | 2 +-
.../datastreamer/DataStreamerResponse.java | 2 +-
.../processors/igfs/IgfsAckMessage.java | 2 +-
.../internal/processors/igfs/IgfsBlockKey.java | 2 +-
.../processors/igfs/IgfsBlocksMessage.java | 2 +-
.../igfs/IgfsCommunicationMessage.java | 2 +-
.../processors/igfs/IgfsDeleteMessage.java | 2 +-
.../processors/igfs/IgfsFileAffinityRange.java | 9 +-
.../igfs/IgfsFragmentizerRequest.java | 2 +-
.../igfs/IgfsFragmentizerResponse.java | 2 +-
.../processors/igfs/IgfsSyncMessage.java | 2 +-
.../platform/PlatformNoopProcessor.java | 41 +
.../processors/platform/PlatformProcessor.java | 40 +
.../portable/GridPortableInputStream.java | 168 -
.../portable/GridPortableOutputStream.java | 165 -
.../processors/portable/GridPortableStream.java | 53 -
.../processors/portable/package-info.java | 22 -
.../messages/GridQueryCancelRequest.java | 2 +-
.../twostep/messages/GridQueryFailResponse.java | 2 +-
.../messages/GridQueryNextPageRequest.java | 2 +-
.../messages/GridQueryNextPageResponse.java | 3 +-
.../h2/twostep/messages/GridQueryRequest.java | 5 +-
.../handlers/task/GridTaskResultRequest.java | 2 +-
.../handlers/task/GridTaskResultResponse.java | 2 +-
.../service/GridServiceProcessor.java | 5 +
.../ignite/internal/util/GridArgumentCheck.java | 17 +
.../ignite/internal/util/GridByteArrayList.java | 2 +-
.../ignite/internal/util/GridLongList.java | 2 +-
.../ignite/internal/util/IgniteUtils.java | 10 +-
.../ignite/internal/util/lang/GridFunc.java | 14 +
.../internal/util/nio/GridDirectParser.java | 2 +-
.../util/nio/ssl/BlockingSslHandler.java | 2 +-
.../visor/cache/VisorCacheClearTask.java | 11 +-
.../marshaller/portable/PortableMarshaller.java | 347 ++
.../marshaller/portable/package-info.java | 22 +
.../communication/MessageFormatter.java | 3 +-
.../extensions/communication/MessageReader.java | 13 +
.../apache/ignite/portable/PortableBuilder.java | 138 +
.../ignite/portable/PortableException.java | 58 +
.../ignite/portable/PortableIdMapper.java | 56 +
.../portable/PortableInvalidClassException.java | 58 +
.../ignite/portable/PortableMarshalAware.java | 48 +
.../ignite/portable/PortableMetadata.java | 63 +
.../apache/ignite/portable/PortableObject.java | 153 +
.../portable/PortableProtocolVersion.java | 41 +
.../ignite/portable/PortableRawReader.java | 233 ++
.../ignite/portable/PortableRawWriter.java | 218 ++
.../apache/ignite/portable/PortableReader.java | 283 ++
.../ignite/portable/PortableSerializer.java | 49 +
.../portable/PortableTypeConfiguration.java | 197 +
.../apache/ignite/portable/PortableWriter.java | 265 ++
.../apache/ignite/portable/package-info.java | 22 +
.../org/apache/ignite/spi/IgniteSpiAdapter.java | 2 +-
.../jobstealing/JobStealingRequest.java | 2 +-
.../communication/tcp/TcpCommunicationSpi.java | 8 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 85 +-
.../spi/discovery/tcp/TcpDiscoveryImpl.java | 4 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 58 +-
.../tcp/internal/TcpDiscoveryNode.java | 18 +-
.../tcp/internal/TcpDiscoveryNodesRing.java | 23 +
.../TcpDiscoveryMulticastIpFinder.java | 38 +
.../resources/META-INF/classnames.properties | 287 +-
.../config/store/jdbc/ignite-type-metadata.xml | 8 +
.../store/jdbc/CacheJdbcPojoStoreTest.java | 33 +-
...eJdbcStoreAbstractMultithreadedSelfTest.java | 16 +-
.../ignite/cache/store/jdbc/model/Person.java | 26 +-
.../GridPortableAffinityKeySelfTest.java | 215 +
.../GridPortableBuilderAdditionalSelfTest.java | 1001 +++++
.../portable/GridPortableBuilderSelfTest.java | 1007 +++++
...eBuilderStringAsCharsAdditionalSelfTest.java | 28 +
...ridPortableBuilderStringAsCharsSelfTest.java | 28 +
...idPortableMarshallerCtxDisabledSelfTest.java | 128 +
.../GridPortableMarshallerSelfTest.java | 3691 ++++++++++++++++++
.../GridPortableMetaDataDisabledSelfTest.java | 218 ++
.../portable/GridPortableMetaDataSelfTest.java | 343 ++
.../portable/GridPortableWildcardsSelfTest.java | 480 +++
.../GridPortableMarshalerAwareTestClass.java | 62 +
.../mutabletest/GridPortableTestClasses.java | 425 ++
.../portable/mutabletest/package-info.java | 22 +
.../ignite/internal/portable/package-info.java | 22 +
.../portable/test/GridPortableTestClass1.java | 28 +
.../portable/test/GridPortableTestClass2.java | 24 +
.../internal/portable/test/package-info.java | 22 +
.../test/subpackage/GridPortableTestClass3.java | 24 +
.../portable/test/subpackage/package-info.java | 22 +
...cheDhtLocalPartitionAfterRemoveSelfTest.java | 33 +-
.../cache/CrossCacheTxRandomOperationsTest.java | 534 +++
.../cache/GridCacheAbstractFullApiSelfTest.java | 1 -
.../GridCacheDaemonNodeAbstractSelfTest.java | 9 +-
...teAtomicCacheEntryProcessorNodeJoinTest.java | 32 +
.../IgniteCacheEntryProcessorNodeJoinTest.java | 225 ++
.../IgniteCacheTopologySafeGetSelfTest.java | 218 ++
.../GridCacheMultiNodeLockAbstractTest.java | 41 +-
.../IgniteCacheSizeFailoverTest.java | 115 +
.../IgniteCacheCrossCacheTxFailoverTest.java | 433 ++
.../IgniteCachePutRetryAbstractSelfTest.java | 121 +-
...gniteCachePutRetryTransactionalSelfTest.java | 187 +
...PutRetryAtomicPrimaryWriteOrderSelfTest.java | 32 +
.../near/GridCacheNearOnlyTopologySelfTest.java | 4 +-
.../near/GridCacheNearTxForceKeyTest.java | 76 +
...idCachePartitionedHitsAndMissesSelfTest.java | 20 +-
...idCachePartitionedMultiNodeLockSelfTest.java | 8 +-
.../near/IgniteCacheNearOnlyTxTest.java | 82 +-
...ridCacheReplicatedMultiNodeLockSelfTest.java | 8 +-
.../lru/LruNearEvictionPolicySelfTest.java | 29 +-
.../LruNearOnlyNearEvictionPolicySelfTest.java | 55 +-
.../local/GridCacheDaemonNodeLocalSelfTest.java | 30 -
...ClientNodePortableMetadataMultinodeTest.java | 277 ++
...GridCacheClientNodePortableMetadataTest.java | 280 ++
...ableObjectsAbstractDataStreamerSelfTest.java | 183 +
...bleObjectsAbstractMultiThreadedSelfTest.java | 222 ++
...ridCachePortableObjectsAbstractSelfTest.java | 958 +++++
.../GridCachePortableStoreAbstractSelfTest.java | 294 ++
.../GridCachePortableStoreObjectsSelfTest.java | 55 +
...GridCachePortableStorePortablesSelfTest.java | 67 +
...ridPortableCacheEntryMemorySizeSelfTest.java | 52 +
...leDuplicateIndexObjectsAbstractSelfTest.java | 153 +
.../DataStreamProcessorPortableSelfTest.java | 67 +
.../GridDataStreamerImplSelfTest.java | 338 ++
...ridCacheAffinityRoutingPortableSelfTest.java | 48 +
...lyPortableDataStreamerMultiNodeSelfTest.java | 29 +
...rtableDataStreamerMultithreadedSelfTest.java | 46 +
...artitionedOnlyPortableMultiNodeSelfTest.java | 28 +
...tionedOnlyPortableMultithreadedSelfTest.java | 46 +
.../GridCacheMemoryModePortableSelfTest.java | 36 +
...acheOffHeapTieredAtomicPortableSelfTest.java | 48 +
...eapTieredEvictionAtomicPortableSelfTest.java | 96 +
...heOffHeapTieredEvictionPortableSelfTest.java | 96 +
.../GridCacheOffHeapTieredPortableSelfTest.java | 48 +
...ateIndexObjectPartitionedAtomicSelfTest.java | 37 +
...xObjectPartitionedTransactionalSelfTest.java | 40 +
...AtomicNearDisabledOffheapTieredSelfTest.java | 29 +
...rtableObjectsAtomicNearDisabledSelfTest.java | 50 +
...tableObjectsAtomicOffheapTieredSelfTest.java | 29 +
.../GridCachePortableObjectsAtomicSelfTest.java | 50 +
...tionedNearDisabledOffheapTieredSelfTest.java | 30 +
...eObjectsPartitionedNearDisabledSelfTest.java | 50 +
...ObjectsPartitionedOffheapTieredSelfTest.java | 30 +
...CachePortableObjectsPartitionedSelfTest.java | 50 +
...sNearPartitionedByteArrayValuesSelfTest.java | 41 +
...sPartitionedOnlyByteArrayValuesSelfTest.java | 42 +
...dCachePortableObjectsReplicatedSelfTest.java | 50 +
...CachePortableObjectsAtomicLocalSelfTest.java | 32 +
...rtableObjectsLocalOffheapTieredSelfTest.java | 29 +
.../GridCachePortableObjectsLocalSelfTest.java | 50 +
.../OptimizedMarshallerNodeFailoverTest.java | 97 +-
.../tcp/IgniteCacheSslStartStopSelfTest.java | 1 +
.../spi/discovery/tcp/TcpDiscoverySelfTest.java | 152 +-
.../TcpDiscoverySpiFailureTimeoutSelfTest.java | 8 +-
.../tcp/TcpDiscoverySpiStartStopSelfTest.java | 2 +-
.../testframework/GridSpiTestContext.java | 2 +-
.../ignite/testframework/GridTestUtils.java | 2 +-
.../ignite/testframework/junits/IgniteMock.java | 5 +
.../multijvm/IgniteCacheProcessProxy.java | 5 +
.../junits/multijvm/IgniteProcessProxy.java | 5 +
.../IgniteCacheFailoverTestSuite.java | 5 +
.../IgniteCacheFailoverTestSuite2.java | 2 +
.../testsuites/IgniteCacheTestSuite2.java | 6 +
.../IgnitePortableCacheFullApiTestSuite.java | 38 +
.../IgnitePortableCacheTestSuite.java | 86 +
.../IgnitePortableObjectsTestSuite.java | 74 +
.../ignite/portable/test1/1.1/test1-1.1.jar | Bin 0 -> 2548 bytes
.../ignite/portable/test1/1.1/test1-1.1.pom | 9 +
.../portable/test1/maven-metadata-local.xml | 12 +
.../ignite/portable/test2/1.1/test2-1.1.jar | Bin 0 -> 1361 bytes
.../ignite/portable/test2/1.1/test2-1.1.pom | 9 +
.../portable/test2/maven-metadata-local.xml | 12 +
.../query/h2/sql/GridSqlQuerySplitter.java | 3 +
.../query/h2/twostep/GridMergeTable.java | 7 +-
.../query/h2/twostep/GridThreadLocalTable.java | 22 +-
...CacheScanPartitionQueryFallbackSelfTest.java | 96 +
.../query/IgniteSqlSplitterSelfTest.java | 215 +
.../IgniteCacheQuerySelfTestSuite.java | 2 +
.../IgnitePortableCacheQueryTestSuite.java | 95 +
modules/jms11/pom.xml | 98 +
.../apache/ignite/stream/jms11/JmsStreamer.java | 524 +++
.../ignite/stream/jms11/MessageTransformer.java | 43 +
.../stream/jms11/IgniteJmsStreamerTest.java | 551 +++
.../jms11/IgniteJmsStreamerTestSuite.java | 34 +
.../ignite/stream/jms11/TestTransformers.java | 123 +
.../apache/ignite/logger/log4j/Log4JLogger.java | 4 +
modules/platform/pom.xml | 65 +
.../Apache.Ignite.Core.csproj | 72 +
.../main/dotnet/Apache.Ignite.Core/Ignition.cs | 23 +
.../Impl/Memory/IPlatformMemory.cs | 62 +
.../Memory/PlatformBigEndianMemoryStream.cs | 483 +++
.../Impl/Memory/PlatformMemory.cs | 77 +
.../Impl/Memory/PlatformMemoryManager.cs | 106 +
.../Impl/Memory/PlatformMemoryPool.cs | 105 +
.../Impl/Memory/PlatformMemoryStream.cs | 676 ++++
.../Impl/Memory/PlatformMemoryUtils.cs | 462 +++
.../Impl/Memory/PlatformPooledMemory.cs | 70 +
.../Impl/Memory/PlatformRawMemory.cs | 88 +
.../Impl/Memory/PlatformUnpooledMemory.cs | 52 +
.../Impl/Portable/Io/IPortableStream.cs | 320 ++
.../Properties/AssemblyInfo.cs | 45 +
.../platform/src/main/dotnet/Apache.Ignite.sln | 35 +
.../main/dotnet/Apache.Ignite.sln.DotSettings | 4 +
.../internal/platform/PlatformBootstrap.java | 36 +
.../platform/PlatformBootstrapFactory.java | 37 +
.../internal/platform/PlatformException.java | 71 +
.../internal/platform/PlatformIgnition.java | 187 +
.../platform/PlatformNoCallbackException.java | 50 +
.../callback/PlatformCallbackGateway.java | 869 +++++
.../callback/PlatformCallbackUtils.java | 468 +++
.../platform/memory/PlatformAbstractMemory.java | 121 +
.../PlatformBigEndianInputStreamImpl.java | 126 +
.../PlatformBigEndianOutputStreamImpl.java | 162 +
.../platform/memory/PlatformExternalMemory.java | 55 +
.../platform/memory/PlatformInputStream.java | 30 +
.../memory/PlatformInputStreamImpl.java | 323 ++
.../platform/memory/PlatformMemory.java | 77 +
.../platform/memory/PlatformMemoryManager.java | 46 +
.../memory/PlatformMemoryManagerImpl.java | 83 +
.../platform/memory/PlatformMemoryPool.java | 133 +
.../platform/memory/PlatformMemoryUtils.java | 468 +++
.../platform/memory/PlatformOutputStream.java | 30 +
.../memory/PlatformOutputStreamImpl.java | 259 ++
.../platform/memory/PlatformPooledMemory.java | 63 +
.../platform/memory/PlatformUnpooledMemory.java | 51 +
.../Apache.Ignite.Core.Tests.csproj | 65 +
.../Apache.Ignite.Core.Tests/IgnitionTest.cs | 30 +
.../Memory/InteropMemoryTest.cs | 213 +
.../Properties/AssemblyInfo.cs | 35 +
.../Apache.Ignite.Core.Tests/TestRunner.cs | 70 +
.../ignite/schema/model/PojoDescriptor.java | 4 +-
.../ignite/schema/model/SchemaDescriptor.java | 61 +
.../schema/parser/DatabaseMetadataParser.java | 54 +-
.../parser/dialect/DB2MetadataDialect.java | 3 +-
.../parser/dialect/DatabaseMetadataDialect.java | 13 +-
.../parser/dialect/JdbcMetadataDialect.java | 129 +-
.../parser/dialect/MySQLMetadataDialect.java | 57 +
.../parser/dialect/OracleMetadataDialect.java | 212 +-
.../org/apache/ignite/schema/ui/Controls.java | 25 +-
.../ignite/schema/ui/SchemaImportApp.java | 157 +-
.../schema/test/AbstractSchemaImportTest.java | 10 +-
.../org/apache/ignite/IgniteSpringBean.java | 7 +
.../util/spring/IgniteSpringHelperImpl.java | 4 +-
.../jdbc/CacheJdbcPojoStoreFactorySelfTest.java | 14 +-
modules/zookeeper/pom.xml | 89 +
.../zk/TcpDiscoveryZookeeperIpFinder.java | 350 ++
.../tcp/ipfinder/zk/ZookeeperIpFinderTest.java | 390 ++
parent/pom.xml | 12 +
pom.xml | 9 +-
scripts/apply-pull-request.sh | 141 +
470 files changed, 46160 insertions(+), 1982 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridCacheTxRecoveryResponse.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedBaseMessage.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedCacheEntry.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedLockResponse.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxFinishRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedTxPrepareResponse.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/GridDistributedUnlockRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtLockResponse.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxFinishResponse.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxLocal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtTxPrepareResponse.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/GridDhtUnlockRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/dht/colocated/GridDhtColocatedCache.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
index 79f8dc0,110501b..5418dd1
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearLockResponse.java
@@@ -266,9 -297,17 +266,9 @@@ public class GridNearLockResponse exten
reader.incrementState();
- case 15:
- pending = reader.readCollection("pending", MessageCollectionItemType.MSG);
-
- if (!reader.isLastRead())
- return false;
-
- reader.incrementState();
-
}
- return true;
+ return reader.afterMessageRead(GridNearLockResponse.class);
}
/** {@inheritDoc} */
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearOptimisticTxPrepareFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearPessimisticTxPrepareFuture.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTransactionalCache.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxFinishRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxLocal.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearTxPrepareResponse.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/distributed/near/GridNearUnlockRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java
index 3f0afc2,4e43d97..c572575
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteInternalTx.java
@@@ -302,9 -302,17 +302,9 @@@ public interface IgniteInternalTx exten
/**
* @return Invalid partitions.
*/
- public Set<Integer> invalidPartitions();
+ public Map<Integer, Set<Integer>> invalidPartitions();
/**
- * Gets owned version for near remote transaction.
- *
- * @param key Key to get version for.
- * @return Owned version, if any.
- */
- @Nullable public GridCacheVersion ownedVersion(IgniteTxKey key);
-
- /**
* Gets ID of additional node involved. For example, in DHT case, other node is
* near node ID.
*
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
index 2606a5e,b8beb15..badcd46
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxAdapter.java
@@@ -162,8 -162,7 +162,8 @@@ public abstract class IgniteTxAdapter e
private AtomicBoolean preparing = new AtomicBoolean();
/** */
+ @GridToStringInclude
- private Set<Integer> invalidParts = new GridLeanSet<>();
+ private Map<Integer, Set<Integer>> invalidParts = new HashMap<>(3);
/**
* Transaction state. Note that state is not protected, as we want to
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
index 9e927a9,227cb34..6b5d850
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxHandler.java
@@@ -1145,16 -1150,10 +1144,16 @@@ public class IgniteTxHandler
// in prepare phase will get properly ordered as well.
tx.prepare();
- if (req.last())
+ if (req.last()) {
+ assert !F.isEmpty(req.transactionNodes()) :
+ "Received last prepare request with empty transaction nodes: " + req;
+
+ tx.transactionNodes(req.transactionNodes());
+
tx.state(PREPARED);
+ }
- res.invalidPartitions(tx.invalidPartitions());
+ res.invalidPartitionsByCacheId(tx.invalidPartitions());
if (tx.empty() && req.last()) {
tx.rollback();
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/cache/transactions/IgniteTxLocalAdapter.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryNextPageResponse.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/main/java/org/apache/ignite/internal/processors/query/h2/twostep/messages/GridQueryRequest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d97a340c/modules/core/src/test/java/org/apache/ignite/internal/processors/cache/GridCacheAbstractFullApiSelfTest.java
----------------------------------------------------------------------