Merge branches 'ignite-1.5' and 'ignite-1.5.1' of https://git-wip-us.apache.org/repos/asf/ignite into ignite-1.5.1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/09b394e1 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/09b394e1 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/09b394e1 Branch: refs/heads/ignite-1.5.1 Commit: 09b394e1740a37e8833c91600be27a7ea0021366 Parents: c9b7149 478657b Author: Alexey Kuznetsov <[email protected]> Authored: Fri Dec 11 11:22:24 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Fri Dec 11 11:22:24 2015 +0700 ---------------------------------------------------------------------- ...ComputeClientBinaryTaskExecutionExample.java | 4 +- .../CacheClientBinaryPutGetExample.java | 2 +- .../datagrid/CacheClientBinaryQueryExample.java | 8 +- .../store/auto/CacheBinaryAutoStoreExample.java | 38 ++- .../datagrid/CacheTransactionExample.java | 4 +- .../store/auto/CacheAutoStoreExample.java | 32 +- .../ignite/examples/model/Organization.java | 16 +- .../apache/ignite/examples/model/Person.java | 40 ++- .../ignite/examples/util/DbH2ServerStartup.java | 31 +- .../main/java/org/apache/ignite/Ignition.java | 2 +- .../ignite/binary/BinaryCollectionFactory.java | 33 ++ .../apache/ignite/binary/BinaryMapFactory.java | 33 ++ .../apache/ignite/binary/BinaryRawReader.java | 8 +- .../org/apache/ignite/binary/BinaryReader.java | 9 +- .../configuration/IgniteConfiguration.java | 2 +- .../org/apache/ignite/internal/IgnitionEx.java | 24 +- .../internal/portable/BinaryFieldAccessor.java | 19 +- .../internal/portable/BinaryObjectImpl.java | 28 +- .../internal/portable/BinaryReaderExImpl.java | 107 +++--- .../internal/portable/BinaryWriteMode.java | 3 - .../internal/portable/BinaryWriterExImpl.java | 45 +-- .../portable/GridPortableMarshaller.java | 21 -- .../portable/PortableClassDescriptor.java | 21 +- .../internal/portable/PortableContext.java | 78 ++--- .../ignite/internal/portable/PortableUtils.java | 144 ++------ .../portable/builder/PortableBuilderReader.java | 12 - .../builder/PortableBuilderSerializer.java | 17 +- .../portable/builder/PortableLazyMapEntry.java | 68 ---- .../processors/cache/CacheLazyEntry.java | 12 +- .../processors/cache/GridCacheIoManager.java | 5 +- .../processors/cache/GridCacheProcessor.java | 17 + .../distributed/dht/GridDhtTxPrepareFuture.java | 2 +- .../ignite/internal/util/nio/GridNioServer.java | 11 +- .../marshaller/optimized/package-info.java | 2 +- .../ignite/spi/discovery/tcp/ServerImpl.java | 11 +- .../GridEventStorageCheckAllEventsSelfTest.java | 22 +- .../IgniteClientReconnectAbstractTest.java | 1 + .../IgniteClientReconnectCacheTest.java | 10 +- .../portable/BinaryMarshallerSelfTest.java | 325 ++++++++++++++++++- .../BinaryObjectBuilderAdditionalSelfTest.java | 101 +++--- .../GridPortableAffinityKeySelfTest.java | 2 +- .../mutabletest/GridPortableTestClasses.java | 77 ++++- ...eAtomicEntryProcessorDeploymentSelfTest.java | 69 ++-- .../IgniteCacheEntryListenerAbstractTest.java | 8 +- ...niteCacheClientNodeChangingTopologyTest.java | 125 ++++++- ...idCacheReplicatedUnswapAdvancedSelfTest.java | 42 +-- .../GridCacheReplicatedPreloadSelfTest.java | 44 +-- ...yAtomicEntryProcessorDeploymentSelfTest.java | 129 ++++++++ ...ctionalEntryProcessorDeploymentSelfTest.java | 31 ++ ...CacheClientNodeBinaryObjectMetadataTest.java | 2 +- ...ridCacheAffinityRoutingPortableSelfTest.java | 2 +- ...lientDiscoverySpiFailureTimeoutSelfTest.java | 5 +- .../spi/discovery/tcp/TcpDiscoverySelfTest.java | 63 +++- .../IgniteBinaryObjectsCacheTestSuite3.java | 9 +- ...cheDeploymentBinaryObjectEntryProcessor.java | 36 ++ .../tests/p2p/CacheDeploymentTestValue3.java | 41 +++ ...niteCacheP2pUnmarshallingQueryErrorTest.java | 4 - .../osgi-karaf/src/main/resources/features.xml | 11 +- .../ignite/osgi/classloaders/package-info.java | 21 ++ .../org/apache/ignite/osgi/package-info.java | 21 ++ .../IgniteKarafFeaturesInstallationTest.java | 2 +- .../src/binary_reader_writer_raw_test.cpp | 10 +- .../core-test/src/binary_reader_writer_test.cpp | 10 +- .../core/include/ignite/binary/binary_consts.h | 29 +- .../Impl/Binary/BinaryObjectBuilder.cs | 8 +- .../Impl/Binary/BinarySystemHandlers.cs | 27 +- .../Impl/Binary/BinaryUtils.cs | 93 +----- 67 files changed, 1446 insertions(+), 843 deletions(-) ----------------------------------------------------------------------
