Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 2A692200D0C for ; Tue, 5 Sep 2017 10:33:22 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id 2952A1655A9; Tue, 5 Sep 2017 08:33:22 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 8A193165451 for ; Tue, 5 Sep 2017 10:33:21 +0200 (CEST) Received: (qmail 28636 invoked by uid 500); 5 Sep 2017 08:33:20 -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 27656 invoked by uid 99); 5 Sep 2017 08:33:18 -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; Tue, 05 Sep 2017 08:33:18 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B4865F5670; Tue, 5 Sep 2017 08:33:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Tue, 05 Sep 2017 08:33:35 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [21/27] ignite git commit: Merge remote-tracking branch 'origin/master' archived-at: Tue, 05 Sep 2017 08:33:22 -0000 Merge remote-tracking branch 'origin/master' Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/872a9599 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/872a9599 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/872a9599 Branch: refs/heads/ignite-3478-1 Commit: 872a959987ad154a4627ea5b4d91c6e965e3d694 Parents: 3a33095 075f48d Author: devozerov Authored: Mon Sep 4 17:41:44 2017 +0300 Committer: devozerov Committed: Mon Sep 4 17:41:44 2017 +0300 ---------------------------------------------------------------------- .../internal/DuplicateTypeIdException.java | 74 +++++++++++++++++++ .../ignite/internal/MarshallerContextImpl.java | 24 +------ .../ignite/internal/binary/BinaryContext.java | 52 ++++++++++---- .../binary/builder/BinaryObjectBuilderImpl.java | 2 + .../odbc/odbc/OdbcRequestHandler.java | 17 ++--- .../processors/odbc/odbc/OdbcUtils.java | 22 ++++++ .../BinaryObjectBuilderAdditionalSelfTest.java | 22 ++++++ modules/platforms/cpp/odbc-test/Makefile.am | 3 +- .../cpp/odbc-test/project/vs/odbc-test.vcxproj | 8 +-- .../cpp/odbc-test/src/queries_test.cpp | 75 +++++++++++++++++++- .../cpp/odbc/include/ignite/odbc/cursor.h | 7 ++ modules/platforms/cpp/odbc/src/cursor.cpp | 5 ++ .../platforms/cpp/odbc/src/query/data_query.cpp | 2 +- 13 files changed, 260 insertions(+), 53 deletions(-) ----------------------------------------------------------------------