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 D304EC54C for ; Tue, 30 Dec 2014 09:39:58 +0000 (UTC) Received: (qmail 21584 invoked by uid 500); 30 Dec 2014 09:39:59 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 21518 invoked by uid 500); 30 Dec 2014 09:39:59 -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 21504 invoked by uid 99); 30 Dec 2014 09:39:59 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Dec 2014 09:39:59 +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, 30 Dec 2014 09:39:35 +0000 Received: (qmail 21101 invoked by uid 99); 30 Dec 2014 09:39:32 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 30 Dec 2014 09:39:32 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 69700A39682; Tue, 30 Dec 2014 09:39:32 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Date: Tue, 30 Dec 2014 09:39:32 -0000 Message-Id: <01d2362e2be74d9db8d83558444dc987@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [01/10] incubator-ignite git commit: # SS-3 fix performance problem: cache values returned from readFromCache(). X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-ignite Updated Branches: refs/heads/ignite-32 477325dee -> 6c7da2cde # SS-3 fix performance problem: cache values returned from readFromCache(). Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/794e0541 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/794e0541 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/794e0541 Branch: refs/heads/ignite-32 Commit: 794e05412e2f9cb600ae15d74f7636a889284dc0 Parents: c541d65 Author: sevdokimov Authored: Mon Dec 29 20:30:14 2014 +0300 Committer: sevdokimov Committed: Mon Dec 29 20:30:14 2014 +0300 ---------------------------------------------------------------------- .../processors/query/h2/opt/GridH2AbstractKeyValueRow.java | 4 ++-- .../kernal/processors/query/h2/opt/GridH2KeyValueRowOffheap.java | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/794e0541/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java b/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java index 6d526a7..f3c0f41 100644 --- a/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java +++ b/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/opt/GridH2AbstractKeyValueRow.java @@ -219,9 +219,9 @@ public abstract class GridH2AbstractKeyValueRow extends GridH2Row { if (valObj != null) { Value upd = wrap(valObj, desc.valueType()); - Value res = updateWeakValue(v, upd); + Value res = updateWeakValue(null, upd); - if (res == v) { + if (res == null) { if (super.getValue(KEY_COL) == null) cache(); http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/794e0541/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/opt/GridH2KeyValueRowOffheap.java ---------------------------------------------------------------------- diff --git a/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/opt/GridH2KeyValueRowOffheap.java b/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/opt/GridH2KeyValueRowOffheap.java index 7f386f0..7f567ee 100644 --- a/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/opt/GridH2KeyValueRowOffheap.java +++ b/modules/indexing/src/main/java/org/gridgain/grid/kernal/processors/query/h2/opt/GridH2KeyValueRowOffheap.java @@ -207,6 +207,8 @@ public class GridH2KeyValueRowOffheap extends GridH2AbstractKeyValueRow { /** {@inheritDoc} */ @SuppressWarnings("NonSynchronizedMethodOverridesSynchronizedMethod") @Override protected Value updateWeakValue(Value exp, Value upd) { + setValue(VAL_COL, upd); + return exp; }