Merge branches 'ignite-1.5' and 'ignite-843-rc2'
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c453b2d4 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c453b2d4 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c453b2d4 Branch: refs/heads/ignite-843-rc2 Commit: c453b2d40d28352b26111d2076b6025a407432a7 Parents: ef610b2 72e5b9a Author: Alexey Kuznetsov <akuznet...@apache.org> Authored: Mon Dec 14 15:38:50 2015 +0700 Committer: Alexey Kuznetsov <akuznet...@apache.org> Committed: Mon Dec 14 15:38:50 2015 +0700 ---------------------------------------------------------------------- .../examples/CacheClientBinaryExampleTest.java | 6 +- .../ComputeClientBinaryExampleTest.java | 4 +- .../testsuites/IgniteExamplesSelfTestSuite.java | 2 +- .../client/impl/ClientCacheFlagsCodecTest.java | 8 +- .../src/test/resources/spring-server-node.xml | 8 +- .../test/resources/spring-server-ssl-node.xml | 8 +- modules/core/pom.xml | 4 +- .../java/org/apache/ignite/IgniteBinary.java | 124 +++---- .../java/org/apache/ignite/IgniteCache.java | 8 +- .../org/apache/ignite/binary/BinaryReader.java | 4 +- .../affinity/AffinityNodeHashResolver.java | 6 +- .../configuration/BinaryConfiguration.java | 4 +- .../apache/ignite/internal/IgniteKernal.java | 26 +- .../ignite/internal/IgniteNodeAttributes.java | 4 +- .../internal/binary/BinaryClassDescriptor.java | 30 +- .../ignite/internal/binary/BinaryContext.java | 14 +- .../internal/binary/BinaryEnumObjectImpl.java | 2 +- .../internal/binary/BinaryFieldAccessor.java | 16 +- .../ignite/internal/binary/BinaryFieldImpl.java | 2 +- .../internal/binary/BinaryMarshaller.java | 6 +- .../ignite/internal/binary/BinaryMetadata.java | 4 +- .../internal/binary/BinaryMetadataHandler.java | 2 +- .../internal/binary/BinaryObjectExImpl.java | 4 +- .../internal/binary/BinaryObjectImpl.java | 8 +- .../binary/BinaryObjectOffheapImpl.java | 4 +- .../internal/binary/BinaryReaderExImpl.java | 20 +- .../ignite/internal/binary/BinarySchema.java | 2 +- .../internal/binary/BinarySchemaRegistry.java | 2 +- .../ignite/internal/binary/BinaryTypeImpl.java | 4 +- .../ignite/internal/binary/BinaryUtils.java | 123 +++---- .../ignite/internal/binary/BinaryWriteMode.java | 8 +- .../internal/binary/BinaryWriterExImpl.java | 20 +- .../internal/binary/GridBinaryMarshaller.java | 10 +- .../binary/builder/BinaryBuilderEnum.java | 6 +- .../binary/builder/BinaryBuilderReader.java | 22 +- .../binary/builder/BinaryBuilderSerializer.java | 10 +- .../builder/BinaryEnumArrayLazyValue.java | 4 +- .../binary/builder/BinaryLazyArrayList.java | 2 +- .../internal/binary/builder/BinaryLazyMap.java | 2 +- .../builder/BinaryObjectArrayLazyValue.java | 4 +- .../binary/builder/BinaryObjectBuilderImpl.java | 14 +- .../binary/builder/BinaryPlainBinaryObject.java | 14 +- .../internal/binary/builder/package-info.java | 2 +- .../ignite/internal/binary/package-info.java | 2 +- .../streams/BinaryAbstractInputStream.java | 2 +- .../streams/BinaryAbstractOutputStream.java | 2 +- .../binary/streams/BinaryAbstractStream.java | 2 +- .../binary/streams/BinaryHeapInputStream.java | 2 +- .../binary/streams/BinaryHeapOutputStream.java | 2 +- .../binary/streams/BinaryInputStream.java | 2 +- .../streams/BinaryOffheapInputStream.java | 2 +- .../streams/BinaryOffheapOutputStream.java | 2 +- .../binary/streams/BinaryOutputStream.java | 2 +- .../internal/binary/streams/BinaryStream.java | 2 +- .../internal/binary/streams/package-info.java | 2 +- .../internal/client/GridClientCacheFlag.java | 10 +- .../internal/client/GridClientCompute.java | 4 +- .../client/GridClientConfiguration.java | 4 +- .../client/impl/GridClientComputeImpl.java | 20 +- .../impl/connection/GridClientConnection.java | 6 +- .../GridClientConnectionManagerAdapter.java | 6 +- .../connection/GridClientNioTcpConnection.java | 34 +- .../internal/direct/DirectMessageWriter.java | 108 ++++-- .../CacheDefaultBinaryAffinityKeyMapper.java | 4 +- .../processors/cache/CacheInvokeEntry.java | 10 +- .../processors/cache/CacheLazyEntry.java | 28 +- .../processors/cache/CacheObjectContext.java | 68 ++-- .../processors/cache/CacheOperationContext.java | 12 +- .../processors/cache/GridCacheAdapter.java | 100 +++--- .../cache/GridCacheConcurrentMap.java | 2 +- .../processors/cache/GridCacheContext.java | 36 +- .../processors/cache/GridCacheEntryEx.java | 8 +- .../processors/cache/GridCacheEventManager.java | 24 +- .../processors/cache/GridCacheMapEntry.java | 54 +-- .../cache/GridCacheOffheapSwapEntry.java | 4 +- .../processors/cache/GridCacheProxyImpl.java | 2 +- .../processors/cache/GridCacheReturn.java | 10 +- .../processors/cache/IgniteCacheProxy.java | 36 +- .../processors/cache/IgniteInternalCache.java | 48 +-- .../cache/binary/BinaryMetadataKey.java | 2 +- .../CacheDefaultBinaryAffinityKeyMapper.java | 4 +- .../cache/binary/CacheObjectBinaryContext.java | 16 +- .../binary/CacheObjectBinaryProcessor.java | 14 +- .../binary/CacheObjectBinaryProcessorImpl.java | 132 ++++---- .../cache/binary/IgniteBinaryImpl.java | 8 +- .../processors/cache/binary/package-info.java | 2 +- .../CacheDataStructuresManager.java | 6 +- .../distributed/GridDistributedLockRequest.java | 2 +- .../dht/CacheDistributedGetFutureAdapter.java | 10 +- .../distributed/dht/GridDhtCacheAdapter.java | 8 +- .../cache/distributed/dht/GridDhtGetFuture.java | 4 +- .../dht/GridPartitionedGetFuture.java | 14 +- .../dht/GridPartitionedSingleGetFuture.java | 12 +- .../dht/atomic/GridDhtAtomicCache.java | 26 +- .../dht/atomic/GridDhtAtomicUpdateRequest.java | 4 +- .../dht/atomic/GridNearAtomicUpdateFuture.java | 4 +- .../dht/atomic/GridNearAtomicUpdateRequest.java | 4 +- .../dht/colocated/GridDhtColocatedCache.java | 36 +- .../distributed/near/GridNearAtomicCache.java | 10 +- .../distributed/near/GridNearCacheAdapter.java | 10 +- .../distributed/near/GridNearCacheEntry.java | 6 + .../distributed/near/GridNearGetFuture.java | 22 +- .../near/GridNearTransactionalCache.java | 12 +- .../cache/distributed/near/GridNearTxLocal.java | 6 +- .../local/atomic/GridLocalAtomicCache.java | 74 ++--- .../query/GridCacheDistributedQueryManager.java | 8 +- .../cache/query/GridCacheQueryAdapter.java | 32 +- .../query/GridCacheQueryFutureAdapter.java | 4 +- .../cache/query/GridCacheQueryManager.java | 64 ++-- .../cache/query/GridCacheQueryRequest.java | 22 +- .../continuous/CacheContinuousQueryEvent.java | 8 +- .../cache/store/CacheOsStoreManager.java | 8 +- .../cache/store/CacheStoreManager.java | 10 +- .../store/GridCacheStoreManagerAdapter.java | 18 +- .../transactions/IgniteTxLocalAdapter.java | 44 +-- .../cache/transactions/IgniteTxLocalEx.java | 6 +- .../cacheobject/IgniteCacheObjectProcessor.java | 16 +- .../IgniteCacheObjectProcessorImpl.java | 6 +- .../processors/cacheobject/NoOpBinary.java | 2 +- .../datastreamer/DataStreamerEntry.java | 6 +- .../platform/PlatformAbstractPredicate.java | 6 +- .../platform/PlatformAbstractTarget.java | 14 +- .../processors/platform/PlatformContext.java | 4 +- .../platform/PlatformContextImpl.java | 6 +- .../platform/PlatformNoopProcessor.java | 4 +- .../processors/platform/PlatformProcessor.java | 8 +- .../platform/PlatformProcessorImpl.java | 34 +- .../platform/cache/PlatformCache.java | 28 +- .../cache/PlatformCacheEntryFilterImpl.java | 2 +- .../cache/PlatformCacheEntryProcessorImpl.java | 10 +- .../PlatformCachePartialUpdateException.java | 12 +- .../callback/PlatformCallbackGateway.java | 8 +- .../callback/PlatformCallbackUtils.java | 6 +- .../cluster/PlatformClusterNodeFilterImpl.java | 2 +- .../platform/compute/PlatformCompute.java | 12 +- .../datastreamer/PlatformDataStreamer.java | 10 +- .../PlatformStreamReceiverImpl.java | 16 +- .../dotnet/PlatformDotNetCacheStore.java | 12 +- .../PlatformDotNetConfigurationClosure.java | 2 +- .../dotnet/PlatformDotNetServiceImpl.java | 8 +- .../events/PlatformEventFilterListenerImpl.java | 2 +- .../messaging/PlatformMessageFilterImpl.java | 2 +- .../services/PlatformAbstractService.java | 26 +- .../platform/services/PlatformService.java | 6 +- .../platform/services/PlatformServices.java | 26 +- .../query/GridQueryCacheObjectsIterator.java | 14 +- .../processors/query/GridQueryProcessor.java | 72 ++-- .../message/GridClientBinaryMetaData.java | 2 +- .../client/message/GridClientTaskRequest.java | 14 +- .../internal/visor/util/VisorMimeTypes.java | 10 +- .../marshaller/portable/package-info.java | 22 -- .../PlatformDotNetBinaryConfiguration.java | 6 +- .../dotnet/PlatformDotNetConfiguration.java | 8 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 4 +- .../TcpDiscoveryMulticastIpFinder.java | 106 ++++-- .../java/org/jsr166/ConcurrentHashMap8.java | 2 +- .../resources/META-INF/classnames.properties | 68 ++-- .../ignite/binary/test1/1.1/test1-1.1.jar | Bin 0 -> 2548 bytes .../ignite/binary/test1/1.1/test1-1.1.pom | 9 + .../binary/test1/maven-metadata-local.xml | 12 + .../ignite/binary/test2/1.1/test2-1.1.jar | Bin 0 -> 1361 bytes .../ignite/binary/test2/1.1/test2-1.1.pom | 9 + .../binary/test2/maven-metadata-local.xml | 12 + .../binary/BinaryFieldsAbstractSelfTest.java | 30 +- .../binary/BinaryFieldsHeapSelfTest.java | 6 +- .../binary/BinaryFieldsOffheapSelfTest.java | 6 +- .../BinaryFooterOffsetsAbstractSelfTest.java | 14 +- .../binary/BinaryFooterOffsetsHeapSelfTest.java | 4 +- .../BinaryFooterOffsetsOffheapSelfTest.java | 4 +- .../binary/BinaryMarshallerSelfTest.java | 330 +++++++++---------- .../BinaryObjectBuilderAdditionalSelfTest.java | 38 +-- .../binary/BinaryObjectBuilderSelfTest.java | 58 ++-- .../binary/GridBinaryAffinityKeySelfTest.java | 2 +- ...GridBinaryMarshallerCtxDisabledSelfTest.java | 12 +- .../binary/GridBinaryMetaDataSelfTest.java | 30 +- .../binary/GridBinaryWildcardsSelfTest.java | 138 ++++---- .../mutabletest/GridBinaryTestClasses.java | 12 +- .../BinaryFieldsHeapNonCompactSelfTest.java | 2 +- .../BinaryFieldsOffheapNonCompactSelfTest.java | 2 +- ...naryFooterOffsetsHeapNonCompactSelfTest.java | 2 +- ...yFooterOffsetsOffheapNonCompactSelfTest.java | 2 +- .../BinaryObjectBuilderNonCompactSelfTest.java | 2 +- .../cache/GridCacheAbstractFullApiSelfTest.java | 23 +- .../cache/GridCacheDeploymentSelfTest.java | 19 +- .../GridCacheOffHeapTieredAbstractSelfTest.java | 8 +- .../GridCacheOnCopyFlagAbstractSelfTest.java | 6 +- .../processors/cache/GridCacheTestEntryEx.java | 8 +- .../GridBinaryCacheEntryMemorySizeSelfTest.java | 2 +- ...ryDuplicateIndexObjectsAbstractSelfTest.java | 20 +- ...naryObjectsAbstractDataStreamerSelfTest.java | 2 +- ...aryObjectsAbstractMultiThreadedSelfTest.java | 10 +- .../GridCacheBinaryObjectsAbstractSelfTest.java | 56 ++-- .../GridCacheBinaryStoreAbstractSelfTest.java | 4 +- .../GridCacheBinaryStoreBinariesSelfTest.java | 10 +- .../GridCacheBinaryStoreObjectsSelfTest.java | 2 +- ...ntNodeBinaryObjectMetadataMultinodeTest.java | 28 +- ...CacheClientNodeBinaryObjectMetadataTest.java | 2 +- .../GridDataStreamerImplSelfTest.java | 22 +- ...BinaryObjectsAtomicNearDisabledSelfTest.java | 2 +- .../GridCacheBinaryObjectsAtomicSelfTest.java | 2 +- ...yObjectsPartitionedNearDisabledSelfTest.java | 2 +- ...idCacheBinaryObjectsPartitionedSelfTest.java | 2 +- ...dCacheOffHeapTieredAtomicBinarySelfTest.java | 2 +- .../GridCacheOffHeapTieredBinarySelfTest.java | 2 +- ...fHeapTieredEvictionAtomicBinarySelfTest.java | 12 +- ...acheOffHeapTieredEvictionBinarySelfTest.java | 12 +- ...ridCacheBinaryObjectsReplicatedSelfTest.java | 2 +- .../GridCacheBinaryObjectsLocalSelfTest.java | 2 +- .../platform/PlatformComputeEchoTask.java | 20 +- .../session/GridSessionCheckpointSelfTest.java | 2 +- .../tcp/TcpClientDiscoverySpiMulticastTest.java | 97 +++++- .../TcpDiscoveryIpFinderAbstractSelfTest.java | 2 +- .../TcpDiscoveryMulticastIpFinderSelfTest.java | 16 +- .../junits/IgniteTestResources.java | 2 +- .../IgniteBinaryCacheFullApiTestSuite.java | 2 +- .../testsuites/IgniteBinaryCacheTestSuite.java | 8 +- .../IgniteBinaryObjectsCacheTestSuite3.java | 2 +- .../IgniteBinaryObjectsTestSuite.java | 2 +- .../ignite/util/GridMessageCollectionTest.java | 34 +- .../ignite/binary/test1/1.1/test1-1.1.jar | Bin 2548 -> 0 bytes .../ignite/binary/test1/1.1/test1-1.1.pom | 9 - .../binary/test1/maven-metadata-local.xml | 12 - .../ignite/binary/test2/1.1/test2-1.1.jar | Bin 1361 -> 0 bytes .../ignite/binary/test2/1.1/test2-1.1.pom | 9 - .../binary/test2/maven-metadata-local.xml | 12 - .../processors/query/h2/IgniteH2Indexing.java | 10 +- .../h2/twostep/GridReduceQueryExecutor.java | 8 +- ...niteCacheP2pUnmarshallingQueryErrorTest.java | 14 +- .../query/IgniteSqlSplitterSelfTest.java | 4 +- .../IgniteBinaryCacheQueryTestSuite.java | 8 +- .../ignite/internal/GridFactorySelfTest.java | 16 + parent/pom.xml | 12 +- 232 files changed, 2055 insertions(+), 1779 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/c453b2d4/parent/pom.xml ---------------------------------------------------------------------- diff --cc parent/pom.xml index 6f377c8,486fc0d..a979f72 --- a/parent/pom.xml +++ b/parent/pom.xml @@@ -846,11 -846,10 +846,11 @@@ <exclude>dev-tools/.gradle/**/*</exclude> <exclude>dev-tools/gradle/wrapper/**/*</exclude> <exclude>dev-tools/gradlew</exclude> - <exclude>src/test/portables/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom</exclude> - <exclude>src/test/portables/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml</exclude> - <exclude>src/test/portables/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom</exclude> - <exclude>src/test/portables/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml</exclude> + <exclude>src/test/binaries/repo/org/apache/ignite/binary/test2/1.1/test2-1.1.pom</exclude> + <exclude>src/test/binaries/repo/org/apache/ignite/binary/test2/maven-metadata-local.xml</exclude> + <exclude>src/test/binaries/repo/org/apache/ignite/binary/test1/1.1/test1-1.1.pom</exclude> + <exclude>src/test/binaries/repo/org/apache/ignite/binary/test1/maven-metadata-local.xml</exclude> + <exclude>src/main/js/package.json</exclude> <!--shmem--> <exclude>ipc/shmem/**/Makefile.in</exclude><!--auto generated files--> <exclude>ipc/shmem/**/Makefile</exclude><!--auto generated files-->
