Return-Path: X-Original-To: apmail-lucene-commits-archive@www.apache.org Delivered-To: apmail-lucene-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 160A8CD0B for ; Sun, 13 May 2012 18:08:53 +0000 (UTC) Received: (qmail 61517 invoked by uid 500); 13 May 2012 18:08:52 -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 61510 invoked by uid 99); 13 May 2012 18:08:52 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 13 May 2012 18:08:52 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sun, 13 May 2012 18:08:50 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id D30B22388847; Sun, 13 May 2012 18:08:28 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1337955 - in /lucene/dev/trunk/solr: core/src/java/org/apache/solr/search/JoinQParserPlugin.java solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java Date: Sun, 13 May 2012 18:08:28 -0000 To: commits@lucene.apache.org From: yonik@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120513180828.D30B22388847@eris.apache.org> Author: yonik Date: Sun May 13 18:08:28 2012 New Revision: 1337955 URL: http://svn.apache.org/viewvc?rev=1337955&view=rev Log: SOLR-2824: don't rewrite join subquery Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java?rev=1337955&r1=1337954&r2=1337955&view=diff ============================================================================== --- lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java (original) +++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java Sun May 13 18:08:28 2012 @@ -84,11 +84,8 @@ class JoinQuery extends Query { @Override public Query rewrite(IndexReader reader) throws IOException { - Query newQ = q.rewrite(reader); - if (newQ == q) return this; - JoinQuery nq = (JoinQuery)this.clone(); - nq.q = newQ; - return nq; + // don't rewrite the subQuery + return this; } @Override Modified: lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java?rev=1337955&r1=1337954&r2=1337955&view=diff ============================================================================== --- lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java (original) +++ lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/MultiCoreExampleTestBase.java Sun May 13 18:08:28 2012 @@ -138,7 +138,18 @@ public abstract class MultiCoreExampleTe } catch( Exception ex ) {} resetExceptionIgnores(); - + + // in core0 + doc = new SolrInputDocument(); + doc.setField( "id", "BBB1" ); + doc.setField( "name", "AAA1" ); + doc.setField( "type", "BBB" ); + doc.setField( "core0", "AAA1" ); + + up.clear(); + up.add( doc ); + up.process( getSolrCore0() ); + // now Make sure AAA is in 0 and BBB in 1 SolrQuery q = new SolrQuery(); QueryRequest r = new QueryRequest( q ); @@ -155,9 +166,15 @@ public abstract class MultiCoreExampleTe // cross-core join assertEquals( 0, getSolrCore0().query( new SolrQuery( "{!join from=type to=name}*:*" ) ).getResults().size() ); // normal join - assertEquals( 1, getSolrCore0().query( new SolrQuery( "{!join from=type to=name fromIndex=core1}id:BBB" ) ).getResults().size() ); + assertEquals( 2, getSolrCore0().query( new SolrQuery( "{!join from=type to=name fromIndex=core1}id:BBB" ) ).getResults().size() ); assertEquals( 1, getSolrCore1().query( new SolrQuery( "{!join from=type to=name fromIndex=core0}id:AAA" ) ).getResults().size() ); + // test that no rewrite happens in core0 (if it does, it will rewrite to BBB1 and nothing will be found in core1) + assertEquals( 2, getSolrCore0().query( new SolrQuery( "{!join from=type to=name fromIndex=core1}id:BB~" ) ).getResults().size() ); + + // test that query is parsed in the fromCore - TODO + // assertEquals( 2, getSolrCore0().query( new SolrQuery( "{!join from=type to=name fromIndex=core1}core1:yup" ) ).getResults().size() ); + // Now test reloading it should have a newer open time String name = "core0";