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 91F4D17A7E for ; Tue, 3 Mar 2015 02:31:44 +0000 (UTC) Received: (qmail 32687 invoked by uid 500); 3 Mar 2015 02:31:44 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 32645 invoked by uid 500); 3 Mar 2015 02:31:44 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 32636 invoked by uid 99); 3 Mar 2015 02:31:44 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 03 Mar 2015 02:31:44 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 03 Mar 2015 02:31:23 +0000 Received: (qmail 29809 invoked by uid 99); 3 Mar 2015 02:31:16 -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, 03 Mar 2015 02:31:16 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C0726E0FCA; Tue, 3 Mar 2015 02:31:16 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: agoncharuk@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 03 Mar 2015 02:31:46 -0000 Message-Id: In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [31/50] incubator-ignite git commit: Merge branches 'ignite-339' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-339 X-Virus-Checked: Checked by ClamAV on apache.org Merge branches 'ignite-339' and 'sprint-2' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-339 Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/60e0ecb2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/60e0ecb2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/60e0ecb2 Branch: refs/heads/ignite-45 Commit: 60e0ecb2e269e6af2b0c04df2aed6f494657b03c Parents: 5d3a2be 13e2d1f Author: AKuznetsov Authored: Mon Mar 2 15:59:00 2015 +0700 Committer: AKuznetsov Committed: Mon Mar 2 15:59:00 2015 +0700 ---------------------------------------------------------------------- .../store/CacheNodeWithStoreStartup.java | 6 +- .../store/jdbc/CacheJdbcPersonStore.java | 115 ++++++---------- .../apache/ignite/cache/store/CacheStore.java | 4 +- .../ignite/cache/store/CacheStoreAdapter.java | 2 +- .../ignite/cache/store/CacheStoreSession.java | 17 ++- .../processors/cache/GridCacheStoreManager.java | 6 +- .../ignite/internal/util/IgniteUtils.java | 90 ++++++++++-- .../spi/discovery/tcp/TcpDiscoverySpi.java | 137 +++++++++++-------- .../discovery/tcp/TcpDiscoverySpiAdapter.java | 116 ++++++++++++++++ .../core/src/test/config/store/jdbc/Ignite.xml | 63 +++++++-- .../junits/cache/TestCacheSession.java | 5 + .../cache/TestThreadLocalCacheSession.java | 5 + .../ignite/schema/generator/XmlGenerator.java | 8 +- .../apache/ignite/schema/model/PojoField.java | 11 +- .../apache/ignite/schema/load/model/Ignite.xml | 133 +++++++++++++----- .../yardstick/config/ignite-store-config.xml | 15 +- 16 files changed, 521 insertions(+), 212 deletions(-) ----------------------------------------------------------------------