Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 06DAF200D61 for ; Mon, 4 Dec 2017 18:48:52 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 05A00160BF9; Mon, 4 Dec 2017 17:48:52 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 4C93D160C05 for ; Mon, 4 Dec 2017 18:48:51 +0100 (CET) Received: (qmail 72439 invoked by uid 500); 4 Dec 2017 17:48:47 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 71654 invoked by uid 99); 4 Dec 2017 17:48: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; Mon, 04 Dec 2017 17:48:46 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id C5F62F6100; Mon, 4 Dec 2017 17:48:45 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: ab@apache.org To: commits@lucene.apache.org Date: Mon, 04 Dec 2017 17:49:09 -0000 Message-Id: <9c08968e130844b2ba334fc53665b6cc@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [25/50] lucene-solr:jira/solr-11458-2: LUCENE-8062: GlobalOrdinalsQuery is no longer eligible for caching archived-at: Mon, 04 Dec 2017 17:48:52 -0000 LUCENE-8062: GlobalOrdinalsQuery is no longer eligible for caching Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a06e6856 Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a06e6856 Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a06e6856 Branch: refs/heads/jira/solr-11458-2 Commit: a06e685642a9615ad03816a1310db15ad752f0ca Parents: 207e546 Author: Jim Ferenczi Authored: Tue Nov 28 14:56:28 2017 +0100 Committer: Jim Ferenczi Committed: Tue Nov 28 14:56:28 2017 +0100 ---------------------------------------------------------------------- lucene/CHANGES.txt | 2 ++ .../java/org/apache/lucene/search/join/GlobalOrdinalsQuery.java | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a06e6856/lucene/CHANGES.txt ---------------------------------------------------------------------- diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index 7df88fc..084d0dd 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -121,6 +121,8 @@ Optimizations * LUCENE-7994: Use int/int scatter map to gather facet counts when the number of hits is small relative to the number of unique facet labels (Dawid Weiss, Robert Muir, Mike McCandless) + +* LUCENE-8062: GlobalOrdinalsQuery is no longer eligible for caching. (Jim Ferenczi) Tests http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a06e6856/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsQuery.java ---------------------------------------------------------------------- diff --git a/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsQuery.java b/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsQuery.java index 4b2d987..b1c0b91 100644 --- a/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsQuery.java +++ b/lucene/join/src/java/org/apache/lucene/search/join/GlobalOrdinalsQuery.java @@ -156,7 +156,10 @@ final class GlobalOrdinalsQuery extends Query { @Override public boolean isCacheable(LeafReaderContext ctx) { - return DocValues.isCacheable(ctx, joinField); + // disable caching because this query relies on a top reader context + // and holds a bitset of matching ordinals that cannot be accounted in + // the memory used by the cache + return false; } }