Merge remote-tracking branch 'origin/ignite-1.5' into ignite-1.5
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/f80637fd Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/f80637fd Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/f80637fd Branch: refs/heads/ignite-1537 Commit: f80637fdbfa2027722d5dea7bac1ce7475a92ff7 Parents: 959c4d0 6d7a6ea Author: Anton Vinogradov <[email protected]> Authored: Thu Dec 10 12:34:56 2015 +0300 Committer: Anton Vinogradov <[email protected]> Committed: Thu Dec 10 12:34:56 2015 +0300 ---------------------------------------------------------------------- .../ignite/binary/BinaryCollectionFactory.java | 33 +++++ .../apache/ignite/binary/BinaryMapFactory.java | 33 +++++ .../apache/ignite/binary/BinaryRawReader.java | 8 +- .../org/apache/ignite/binary/BinaryReader.java | 9 +- .../internal/portable/BinaryFieldAccessor.java | 19 +-- .../internal/portable/BinaryReaderExImpl.java | 107 +++++++------- .../internal/portable/BinaryWriteMode.java | 3 - .../internal/portable/BinaryWriterExImpl.java | 45 ++---- .../portable/GridPortableMarshaller.java | 21 --- .../portable/PortableClassDescriptor.java | 7 +- .../internal/portable/PortableContext.java | 71 ++++----- .../ignite/internal/portable/PortableUtils.java | 144 +++++-------------- .../portable/builder/PortableBuilderReader.java | 12 -- .../builder/PortableBuilderSerializer.java | 17 +-- .../portable/builder/PortableLazyMapEntry.java | 68 --------- .../portable/BinaryMarshallerSelfTest.java | 127 +++++++++++++++- .../BinaryObjectBuilderAdditionalSelfTest.java | 101 ++++++------- .../mutabletest/GridPortableTestClasses.java | 77 +++++++--- ...niteCacheClientNodeChangingTopologyTest.java | 125 ++++++++++++++-- .../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 ++---------- 25 files changed, 580 insertions(+), 624 deletions(-) ----------------------------------------------------------------------
