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 A3DA918A73 for ; Mon, 1 Feb 2016 01:52:22 +0000 (UTC) Received: (qmail 13290 invoked by uid 500); 1 Feb 2016 01:52:22 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 13247 invoked by uid 500); 1 Feb 2016 01:52:22 -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 13233 invoked by uid 99); 1 Feb 2016 01:52:22 -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, 01 Feb 2016 01:52:22 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 73F16DFF70; Mon, 1 Feb 2016 01:52:22 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sergi@apache.org To: commits@ignite.apache.org Date: Mon, 01 Feb 2016 01:52:22 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] ignite git commit: sql-store-idx - fixes Repository: ignite Updated Branches: refs/heads/sql-store bb41f12cf -> 6ff77663b sql-store-idx - fixes Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/a83ac2c2 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/a83ac2c2 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/a83ac2c2 Branch: refs/heads/sql-store Commit: a83ac2c2a844ee37426e3da389e2a47eb0c18ac1 Parents: bb41f12 Author: S.Vladykin Authored: Sun Jan 31 23:30:44 2016 +0300 Committer: S.Vladykin Committed: Sun Jan 31 23:30:44 2016 +0300 ---------------------------------------------------------------------- .../ignite/internal/processors/query/h2/opt/GridH2Table.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/a83ac2c2/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java index c09081c..4a00296 100644 --- a/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java +++ b/modules/indexing/src/main/java/org/apache/ignite/internal/processors/query/h2/opt/GridH2Table.java @@ -25,7 +25,6 @@ import java.util.Collections; import java.util.Set; import java.util.concurrent.ConcurrentNavigableMap; import java.util.concurrent.TimeUnit; -import java.util.concurrent.locks.Lock; import java.util.concurrent.locks.ReadWriteLock; import java.util.concurrent.locks.ReentrantReadWriteLock; import org.apache.ignite.IgniteCheckedException; @@ -340,6 +339,9 @@ public class GridH2Table extends TableBase { GridH2Row row = desc.createRow(key, val, expirationTime); + row.key = key; + row.val = val; + return doUpdate(row, rmv); }