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 EA00718E27 for ; Wed, 13 Jan 2016 13:55:00 +0000 (UTC) Received: (qmail 78200 invoked by uid 500); 13 Jan 2016 13:54:53 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 77079 invoked by uid 500); 13 Jan 2016 13:54:48 -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 75590 invoked by uid 99); 13 Jan 2016 13:54:46 -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; Wed, 13 Jan 2016 13:54:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id E73F5E3828; Wed, 13 Jan 2016 13:54:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ntikhonov@apache.org To: commits@ignite.apache.org Date: Wed, 13 Jan 2016 13:54:48 -0000 Message-Id: In-Reply-To: <70a4f4d9b0ba4eab84cec08f89173b1b@git.apache.org> References: <70a4f4d9b0ba4eab84cec08f89173b1b@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [04/50] [abbrv] ignite git commit: Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2 Merge remote-tracking branch 'remotes/origin/ignite-1.5' into ignite-1.5.1-2 Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/9f1f6601 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/9f1f6601 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/9f1f6601 Branch: refs/heads/ignite-gg-10837 Commit: 9f1f6601e3b77010c57186fb6e041a58a0fce550 Parents: 0482316 d4687d9 Author: Anton Vinogradov Authored: Mon Dec 21 11:51:36 2015 +0300 Committer: Anton Vinogradov Committed: Mon Dec 21 11:51:36 2015 +0300 ---------------------------------------------------------------------- .../discovery/GridDiscoveryManager.java | 4 +- .../processors/cache/CacheObjectAdapter.java | 3 + .../dht/preloader/GridDhtPreloader.java | 29 -- .../ignite/spi/discovery/tcp/ClientImpl.java | 48 +- .../IgniteClientReconnectCacheTest.java | 26 +- .../cache/IgniteCachePutAllRestartTest.java | 2 +- .../IgniteCacheAbstractFieldsQuerySelfTest.java | 68 ++- modules/platforms/cpp/core/impl/doxygen.h | 53 -- .../cpp/core/include/ignite/binary/binary.h | 5 + .../core/include/ignite/binary/binary_consts.h | 5 + .../include/ignite/binary/binary_containers.h | 5 + .../include/ignite/binary/binary_raw_reader.h | 5 + .../include/ignite/binary/binary_raw_writer.h | 5 + .../core/include/ignite/binary/binary_reader.h | 5 + .../core/include/ignite/binary/binary_type.h | 17 + .../core/include/ignite/binary/binary_writer.h | 5 + .../cpp/core/include/ignite/cache/cache.h | 5 + .../cpp/core/include/ignite/cache/cache_entry.h | 5 + .../core/include/ignite/cache/cache_peek_mode.h | 5 + .../cpp/core/include/ignite/cache/query/query.h | 5 + .../include/ignite/cache/query/query_argument.h | 6 + .../include/ignite/cache/query/query_cursor.h | 5 + .../ignite/cache/query/query_fields_cursor.h | 5 + .../ignite/cache/query/query_fields_row.h | 5 + .../include/ignite/cache/query/query_scan.h | 5 + .../core/include/ignite/cache/query/query_sql.h | 5 + .../ignite/cache/query/query_sql_fields.h | 5 + .../include/ignite/cache/query/query_text.h | 5 + .../platforms/cpp/core/include/ignite/guid.h | 5 + .../platforms/cpp/core/include/ignite/ignite.h | 5 + .../core/include/ignite/ignite_configuration.h | 5 + .../cpp/core/include/ignite/ignite_error.h | 5 + .../cpp/core/include/ignite/ignition.h | 5 + modules/platforms/cpp/core/namespaces.dox | 53 ++ .../ignite/schema/generator/CodeGenerator.java | 7 +- .../schema/test/AbstractSchemaImportTest.java | 18 + .../org/apache/ignite/schema/test/model/Tst.txt | 506 +++++++++++++++++++ .../apache/ignite/schema/test/model/TstKey.txt | 96 ++++ .../schema/test/model/ignite-type-metadata.xml | 180 +++++++ .../test/parser/DbMetadataParserTest.java | 17 +- 40 files changed, 1119 insertions(+), 129 deletions(-) ----------------------------------------------------------------------