Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 0468C18FA7 for ; Mon, 9 Nov 2015 11:48:35 +0000 (UTC) Received: (qmail 70916 invoked by uid 500); 9 Nov 2015 11:48:35 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 70824 invoked by uid 500); 9 Nov 2015 11:48:34 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 70675 invoked by uid 99); 9 Nov 2015 11:48:34 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 09 Nov 2015 11:48:34 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id BCA17E041F; Mon, 9 Nov 2015 11:48:34 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: vozerov@apache.org To: commits@ignite.apache.org Date: Mon, 09 Nov 2015 11:48:50 -0000 Message-Id: <0af35e2f9354424eb5b2d9eaee53b018@git.apache.org> In-Reply-To: <46de277833be4a9c9116d5dd0713f0d7@git.apache.org> References: <46de277833be4a9c9116d5dd0713f0d7@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [18/18] ignite git commit: Merge branch 'ignite-1282' into ignite-1803-final Merge branch 'ignite-1282' into ignite-1803-final Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/71770d88 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/71770d88 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/71770d88 Branch: refs/heads/ignite-1803-final Commit: 71770d88520a5e77d43d405810b5395bd55891c5 Parents: f88c92c 37a2a9f Author: vozerov-gridgain Authored: Mon Nov 9 14:49:03 2015 +0300 Committer: vozerov-gridgain Committed: Mon Nov 9 14:49:03 2015 +0300 ---------------------------------------------------------------------- .../java/org/apache/ignite/IgniteBinary.java | 8 - .../ignite/binary/BinaryObjectBuilder.java | 1 - .../internal/portable/BinaryObjectImpl.java | 14 +- .../portable/BinaryObjectOffheapImpl.java | 16 +- .../internal/portable/BinaryReaderExImpl.java | 18 +- .../internal/portable/BinaryWriterExImpl.java | 19 +- .../internal/portable/PortableContext.java | 11 - .../builder/BinaryObjectBuilderImpl.java | 13 +- .../portable/builder/PortableBuilderReader.java | 20 +- .../portable/CacheObjectBinaryProcessor.java | 6 - .../CacheObjectBinaryProcessorImpl.java | 5 - .../cache/portable/IgniteBinaryImpl.java | 12 - .../processors/cacheobject/NoOpBinary.java | 5 - .../marshaller/portable/PortableMarshaller.java | 25 - .../portable/BinaryFieldsAbstractSelfTest.java | 19 +- ...idBinaryObjectBuilderAdditionalSelfTest.java | 9 - .../GridBinaryObjectBuilderSelfTest.java | 16 - ...tBuilderStringAsCharsAdditionalSelfTest.java | 28 - ...inaryObjectBuilderStringAsCharsSelfTest.java | 28 - .../IgnitePortableObjectsTestSuite.java | 4 - modules/platforms/cpp/README.txt | 2 +- modules/platforms/cpp/core-test/Makefile.am | 8 +- .../platforms/cpp/core-test/include/Makefile.am | 4 +- .../core-test/include/ignite/binary_test_defs.h | 320 +++ .../include/ignite/binary_test_utils.h | 516 ++++ .../include/ignite/portable_test_defs.h | 320 --- .../include/ignite/portable_test_utils.h | 516 ---- .../cpp/core-test/project/vs/core-test.vcxproj | 12 +- .../project/vs/core-test.vcxproj.filters | 32 +- .../src/binary_reader_writer_raw_test.cpp | 1593 ++++++++++++ .../core-test/src/binary_reader_writer_test.cpp | 2373 ++++++++++++++++++ .../cpp/core-test/src/binary_session_test.cpp | 257 ++ .../cpp/core-test/src/binary_test_defs.cpp | 65 + .../cpp/core-test/src/cache_query_test.cpp | 26 +- .../platforms/cpp/core-test/src/cache_test.cpp | 24 +- .../src/portable_reader_writer_raw_test.cpp | 1593 ------------ .../src/portable_reader_writer_test.cpp | 2373 ------------------ .../cpp/core-test/src/portable_session_test.cpp | 257 -- .../cpp/core-test/src/portable_test_defs.cpp | 65 - modules/platforms/cpp/core/Makefile.am | 30 +- modules/platforms/cpp/core/include/Makefile.am | 38 +- .../cpp/core/include/ignite/binary/binary.h | 29 + .../core/include/ignite/binary/binary_consts.h | 106 + .../include/ignite/binary/binary_containers.h | 525 ++++ .../include/ignite/binary/binary_raw_reader.h | 350 +++ .../include/ignite/binary/binary_raw_writer.h | 326 +++ .../core/include/ignite/binary/binary_reader.h | 384 +++ .../core/include/ignite/binary/binary_type.h | 293 +++ .../core/include/ignite/binary/binary_writer.h | 362 +++ .../include/ignite/cache/query/query_argument.h | 6 +- .../include/ignite/cache/query/query_scan.h | 4 +- .../core/include/ignite/cache/query/query_sql.h | 4 +- .../ignite/cache/query/query_sql_fields.h | 4 +- .../include/ignite/cache/query/query_text.h | 4 +- .../cpp/core/include/ignite/ignite_error.h | 4 +- .../include/ignite/impl/binary/binary_common.h | 182 ++ .../ignite/impl/binary/binary_id_resolver.h | 106 + .../ignite/impl/binary/binary_reader_impl.h | 1311 ++++++++++ .../include/ignite/impl/binary/binary_schema.h | 136 + .../ignite/impl/binary/binary_type_handler.h | 102 + .../ignite/impl/binary/binary_type_manager.h | 120 + .../ignite/impl/binary/binary_type_snapshot.h | 122 + .../ignite/impl/binary/binary_type_updater.h | 53 + .../impl/binary/binary_type_updater_impl.h | 65 + .../include/ignite/impl/binary/binary_utils.h | 344 +++ .../ignite/impl/binary/binary_writer_impl.h | 913 +++++++ .../core/include/ignite/impl/cache/cache_impl.h | 4 +- .../impl/cache/query/query_fields_row_impl.h | 2 +- .../include/ignite/impl/ignite_environment.h | 12 +- .../cpp/core/include/ignite/impl/operations.h | 30 +- .../ignite/impl/portable/portable_common.h | 182 -- .../ignite/impl/portable/portable_id_resolver.h | 106 - .../impl/portable/portable_metadata_handler.h | 102 - .../impl/portable/portable_metadata_manager.h | 120 - .../impl/portable/portable_metadata_snapshot.h | 122 - .../impl/portable/portable_metadata_updater.h | 53 - .../portable/portable_metadata_updater_impl.h | 65 - .../ignite/impl/portable/portable_reader_impl.h | 1320 ---------- .../ignite/impl/portable/portable_schema.h | 136 - .../ignite/impl/portable/portable_utils.h | 344 --- .../ignite/impl/portable/portable_writer_impl.h | 912 ------- .../cpp/core/include/ignite/portable/portable.h | 29 - .../include/ignite/portable/portable_consts.h | 106 - .../ignite/portable/portable_containers.h | 525 ---- .../ignite/portable/portable_raw_reader.h | 350 --- .../ignite/portable/portable_raw_writer.h | 326 --- .../include/ignite/portable/portable_reader.h | 384 --- .../include/ignite/portable/portable_type.h | 293 --- .../include/ignite/portable/portable_writer.h | 362 --- .../platforms/cpp/core/project/vs/core.vcxproj | 68 +- .../cpp/core/project/vs/core.vcxproj.filters | 200 +- .../cpp/core/src/binary/binary_containers.cpp | 76 + .../cpp/core/src/binary/binary_raw_reader.cpp | 145 ++ .../cpp/core/src/binary/binary_raw_writer.cpp | 147 ++ .../cpp/core/src/binary/binary_reader.cpp | 152 ++ .../cpp/core/src/binary/binary_type.cpp | 51 + .../cpp/core/src/binary/binary_writer.cpp | 154 ++ .../core/src/impl/binary/binary_reader_impl.cpp | 760 ++++++ .../cpp/core/src/impl/binary/binary_schema.cpp | 135 + .../src/impl/binary/binary_type_handler.cpp | 78 + .../src/impl/binary/binary_type_manager.cpp | 201 ++ .../src/impl/binary/binary_type_snapshot.cpp | 70 + .../src/impl/binary/binary_type_updater.cpp | 32 + .../impl/binary/binary_type_updater_impl.cpp | 94 + .../cpp/core/src/impl/binary/binary_utils.cpp | 211 ++ .../core/src/impl/binary/binary_writer_impl.cpp | 622 +++++ .../cpp/core/src/impl/cache/cache_impl.cpp | 18 +- .../core/src/impl/cache/query/query_impl.cpp | 6 +- .../cpp/core/src/impl/ignite_environment.cpp | 14 +- .../src/impl/interop/interop_input_stream.cpp | 8 +- .../src/impl/interop/interop_output_stream.cpp | 8 +- .../impl/portable/portable_metadata_handler.cpp | 78 - .../impl/portable/portable_metadata_manager.cpp | 201 -- .../portable/portable_metadata_snapshot.cpp | 70 - .../impl/portable/portable_metadata_updater.cpp | 32 - .../portable/portable_metadata_updater_impl.cpp | 94 - .../src/impl/portable/portable_reader_impl.cpp | 773 ------ .../core/src/impl/portable/portable_schema.cpp | 135 - .../core/src/impl/portable/portable_utils.cpp | 214 -- .../src/impl/portable/portable_writer_impl.cpp | 627 ----- .../core/src/portable/portable_containers.cpp | 76 - .../core/src/portable/portable_raw_reader.cpp | 145 -- .../core/src/portable/portable_raw_writer.cpp | 147 -- .../cpp/core/src/portable/portable_reader.cpp | 152 -- .../cpp/core/src/portable/portable_type.cpp | 51 - .../cpp/core/src/portable/portable_writer.cpp | 154 -- .../cpp/examples/config/example-cache.xml | 2 +- .../examples/include/ignite/examples/address.h | 14 +- .../include/ignite/examples/organization.h | 14 +- .../Impl/Portable/PortableUtils.cs | 13 +- 130 files changed, 14208 insertions(+), 14475 deletions(-) ----------------------------------------------------------------------