Return-Path: X-Original-To: apmail-geode-commits-archive@minotaur.apache.org Delivered-To: apmail-geode-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 955CC175B7 for ; Tue, 20 Oct 2015 20:35:27 +0000 (UTC) Received: (qmail 48366 invoked by uid 500); 20 Oct 2015 20:35:27 -0000 Delivered-To: apmail-geode-commits-archive@geode.apache.org Received: (qmail 48342 invoked by uid 500); 20 Oct 2015 20:35:27 -0000 Mailing-List: contact commits-help@geode.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.incubator.apache.org Delivered-To: mailing list commits@geode.incubator.apache.org Received: (qmail 48331 invoked by uid 99); 20 Oct 2015 20:35:27 -0000 Received: from Unknown (HELO spamd1-us-west.apache.org) (209.188.14.142) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 20 Oct 2015 20:35:27 +0000 Received: from localhost (localhost [127.0.0.1]) by spamd1-us-west.apache.org (ASF Mail Server at spamd1-us-west.apache.org) with ESMTP id EA594C3A75 for ; Tue, 20 Oct 2015 20:35:26 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at spamd1-us-west.apache.org X-Spam-Flag: NO X-Spam-Score: 1.782 X-Spam-Level: * X-Spam-Status: No, score=1.782 tagged_above=-999 required=6.31 tests=[KAM_ASCII_DIVIDERS=0.8, KAM_LAZY_DOMAIN_SECURITY=1, RCVD_IN_MSPIKE_H3=-0.01, RCVD_IN_MSPIKE_WL=-0.01, RP_MATCHES_RCVD=0.001, URIBL_BLOCKED=0.001] autolearn=disabled Received: from mx1-us-east.apache.org ([10.40.0.8]) by localhost (spamd1-us-west.apache.org [10.40.0.7]) (amavisd-new, port 10024) with ESMTP id FIQMSyYnHjix for ; Tue, 20 Oct 2015 20:35:20 +0000 (UTC) Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx1-us-east.apache.org (ASF Mail Server at mx1-us-east.apache.org) with SMTP id 5C51C439E9 for ; Tue, 20 Oct 2015 20:35:20 +0000 (UTC) Received: (qmail 47478 invoked by uid 99); 20 Oct 2015 20:35:19 -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, 20 Oct 2015 20:35:19 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id B2562DFC7F; Tue, 20 Oct 2015 20:35:19 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jasonhuynh@apache.org To: commits@geode.incubator.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: incubator-geode git commit: [GEODE-440] RangeIndexAPIJUnitTest.testQueryMethod_2 Added a flag to ignore the update in progress calculation for querying Date: Tue, 20 Oct 2015 20:35:19 +0000 (UTC) Repository: incubator-geode Updated Branches: refs/heads/feature/GEODE-409 17d00616f -> f8935b3b8 [GEODE-440] RangeIndexAPIJUnitTest.testQueryMethod_2 Added a flag to ignore the update in progress calculation for querying Project: http://git-wip-us.apache.org/repos/asf/incubator-geode/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-geode/commit/f8935b3b Tree: http://git-wip-us.apache.org/repos/asf/incubator-geode/tree/f8935b3b Diff: http://git-wip-us.apache.org/repos/asf/incubator-geode/diff/f8935b3b Branch: refs/heads/feature/GEODE-409 Commit: f8935b3b81e3abc9a5e0a0a9d91f89a449aca251 Parents: 17d0061 Author: Jason Huynh Authored: Tue Oct 20 13:33:12 2015 -0700 Committer: Jason Huynh Committed: Tue Oct 20 13:33:12 2015 -0700 ---------------------------------------------------------------------- .../gemstone/gemfire/cache/query/internal/index/IndexManager.java | 3 ++- .../cache/query/internal/index/RangeIndexAPIJUnitTest.java | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8935b3b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexManager.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexManager.java b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexManager.java index 0a9b166..2c597a8 100644 --- a/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexManager.java +++ b/gemfire-core/src/main/java/com/gemstone/gemfire/cache/query/internal/index/IndexManager.java @@ -134,6 +134,7 @@ public class IndexManager { public static final int INDEX_ELEMARRAY_THRESHOLD = Integer.parseInt(System.getProperty(INDEX_ELEMARRAY_THRESHOLD_PROP,"100")); public static final int INDEX_ELEMARRAY_SIZE = Integer.parseInt(System.getProperty(INDEX_ELEMARRAY_SIZE_PROP,"5")); public final static AtomicLong SAFE_QUERY_TIME = new AtomicLong(0); + public static boolean ENABLE_UPDATE_IN_PROGRESS_INDEX_CALCULATION = true; /** The NULL constant */ public static final Object NULL = new NullToken(); @@ -205,7 +206,7 @@ public class IndexManager { * @param lastModifiedTime */ public static boolean needsRecalculation(long queryStartTime, long lastModifiedTime) { - return queryStartTime <= SAFE_QUERY_TIME.get() - queryStartTime + lastModifiedTime; + return ENABLE_UPDATE_IN_PROGRESS_INDEX_CALCULATION && queryStartTime <= SAFE_QUERY_TIME.get() - queryStartTime + lastModifiedTime; } /** http://git-wip-us.apache.org/repos/asf/incubator-geode/blob/f8935b3b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/RangeIndexAPIJUnitTest.java ---------------------------------------------------------------------- diff --git a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/RangeIndexAPIJUnitTest.java b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/RangeIndexAPIJUnitTest.java index b9f6ff8..430728c 100644 --- a/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/RangeIndexAPIJUnitTest.java +++ b/gemfire-core/src/test/java/com/gemstone/gemfire/cache/query/internal/index/RangeIndexAPIJUnitTest.java @@ -56,6 +56,7 @@ public class RangeIndexAPIJUnitTest { @Before public void setUp() throws java.lang.Exception { CacheUtils.startCache(); + IndexManager.ENABLE_UPDATE_IN_PROGRESS_INDEX_CALCULATION = false; region = CacheUtils.createRegion("portfolios", Portfolio.class); for (int i = 0; i < 12; i++) { //CacheUtils.log(new Portfolio(i)); @@ -71,6 +72,7 @@ public class RangeIndexAPIJUnitTest { @After public void tearDown() throws java.lang.Exception { + IndexManager.ENABLE_UPDATE_IN_PROGRESS_INDEX_CALCULATION = true; CacheUtils.closeCache(); }