Merge remote-tracking branch 'origin/ignite-1282' into ignite-1282
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0d56b41c Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0d56b41c Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0d56b41c Branch: refs/heads/ignite-1.5-tx-futs-opts Commit: 0d56b41ca0beee7929a2bd02293b84f42f34b8eb Parents: 462f833 c505f48 Author: vozerov-gridgain <[email protected]> Authored: Fri Nov 20 13:01:58 2015 +0300 Committer: vozerov-gridgain <[email protected]> Committed: Fri Nov 20 13:01:58 2015 +0300 ---------------------------------------------------------------------- .../config/binary/example-ignite-binary.xml | 2 +- .../java/org/apache/ignite/IgniteBinary.java | 9 +- .../java/org/apache/ignite/IgniteCache.java | 3 +- .../apache/ignite/binary/BinaryIdMapper.java | 4 +- .../org/apache/ignite/binary/BinaryObject.java | 5 +- .../apache/ignite/binary/BinarySerializer.java | 4 +- .../ignite/binary/BinaryTypeConfiguration.java | 47 +-- .../configuration/BinaryConfiguration.java | 139 +++++++ .../configuration/IgniteConfiguration.java | 29 +- .../apache/ignite/internal/IgniteKernal.java | 7 +- .../internal/portable/BinaryObjectImpl.java | 11 +- .../portable/PortableClassDescriptor.java | 16 +- .../internal/portable/PortableContext.java | 85 ++-- .../processors/cache/GridCacheProcessor.java | 4 +- .../CacheObjectBinaryProcessorImpl.java | 17 +- .../cache/store/CacheOsStoreManager.java | 4 +- .../cpp/PlatformCppConfigurationClosure.java | 30 +- .../PlatformDotNetConfigurationClosure.java | 34 +- .../marshaller/portable/BinaryMarshaller.java | 146 +++++++ .../marshaller/portable/PortableMarshaller.java | 299 -------------- .../resources/META-INF/classnames.properties | 31 +- .../portable/BinaryFieldsAbstractSelfTest.java | 33 +- .../portable/BinaryFieldsHeapSelfTest.java | 4 +- .../portable/BinaryFieldsOffheapSelfTest.java | 4 +- .../BinaryFooterOffsetsAbstractSelfTest.java | 27 +- .../BinaryFooterOffsetsHeapSelfTest.java | 4 +- .../BinaryFooterOffsetsOffheapSelfTest.java | 4 +- .../portable/BinaryMarshallerSelfTest.java | 402 +++++++------------ .../BinaryObjectBuilderAdditionalSelfTest.java | 13 +- .../portable/BinaryObjectBuilderSelfTest.java | 43 +- .../GridPortableAffinityKeySelfTest.java | 13 +- ...idPortableMarshallerCtxDisabledSelfTest.java | 10 +- .../portable/GridPortableMetaDataSelfTest.java | 13 +- .../portable/GridPortableWildcardsSelfTest.java | 243 ++++++----- .../BinaryFieldsHeapNonCompactSelfTest.java | 4 - ...IgniteCacheAbstractExecutionContextTest.java | 4 +- .../IgniteCacheTxExecutionContextTest.java | 2 - ...naryObjectsAbstractDataStreamerSelfTest.java | 10 +- ...aryObjectsAbstractMultiThreadedSelfTest.java | 10 +- .../GridCacheBinaryObjectsAbstractSelfTest.java | 4 +- ...ntNodeBinaryObjectMetadataMultinodeTest.java | 4 +- ...CacheClientNodeBinaryObjectMetadataTest.java | 19 +- .../GridCachePortableStoreAbstractSelfTest.java | 11 +- ...ridPortableCacheEntryMemorySizeSelfTest.java | 10 +- ...leDuplicateIndexObjectsAbstractSelfTest.java | 11 +- .../DataStreamProcessorPortableSelfTest.java | 4 +- .../GridDataStreamerImplSelfTest.java | 4 +- ...ridCacheAffinityRoutingPortableSelfTest.java | 13 +- .../GridCacheMemoryModePortableSelfTest.java | 4 +- ...acheOffHeapTieredAtomicPortableSelfTest.java | 9 +- ...eapTieredEvictionAtomicPortableSelfTest.java | 9 +- ...heOffHeapTieredEvictionPortableSelfTest.java | 9 +- .../GridCacheOffHeapTieredPortableSelfTest.java | 9 +- ...sNearPartitionedByteArrayValuesSelfTest.java | 4 +- ...sPartitionedOnlyByteArrayValuesSelfTest.java | 4 +- .../IgnitePortableCacheFullApiTestSuite.java | 4 +- .../IgnitePortableCacheTestSuite.java | 4 +- .../IgnitePortableObjectsTestSuite.java | 2 +- ...niteCacheP2pUnmarshallingQueryErrorTest.java | 6 +- .../IgnitePortableCacheQueryTestSuite.java | 4 +- .../Config/Compute/compute-grid1.xml | 46 ++- .../Config/marshaller-explicit.xml | 8 +- 62 files changed, 925 insertions(+), 1046 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0d56b41c/modules/core/src/main/java/org/apache/ignite/internal/portable/PortableClassDescriptor.java ----------------------------------------------------------------------
