Mikhail: something doesn't make sense about the CHANGES.txt entry for this after the merge (I noticed doing a subsequent merge)
On the 5x branch SOLR-6234 is in the "New Features" section of 5.3, but on trunk it's in "Other Changes" of 6.0. : Date: Tue, 28 Jul 2015 14:44:17 -0000 : From: [email protected] : Reply-To: [email protected] : To: [email protected] : Subject: svn commit: r1693101 - in /lucene/dev/branches/branch_5x: ./ : dev-tools/ lucene/ : lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/ : lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/ : lucene/analysis/common/... : : Author: mkhl : Date: Tue Jul 28 14:44:15 2015 : New Revision: 1693101 : : URL: http://svn.apache.org/r1693101 : Log: : SOLR-6234: Scoring for query time join : : Added: : lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/ScoreJoinQParserPlugin.java : - copied unchanged from r1693092, lucene/dev/trunk/solr/core/src/java/org/apache/solr/search/join/ScoreJoinQParserPlugin.java : lucene/dev/branches/branch_5x/solr/core/src/test-files/solr/collection1/conf/schema-docValuesJoin.xml : - copied unchanged from r1693092, lucene/dev/trunk/solr/core/src/test-files/solr/collection1/conf/schema-docValuesJoin.xml : lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/TestCrossCoreJoin.java : - copied unchanged from r1693092, lucene/dev/trunk/solr/core/src/test/org/apache/solr/TestCrossCoreJoin.java : lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPNoScore.java : - copied unchanged from r1693092, lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPNoScore.java : lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPScore.java : - copied unchanged from r1693092, lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/join/TestScoreJoinQPScore.java : Modified: : lucene/dev/branches/branch_5x/ (props changed) : lucene/dev/branches/branch_5x/dev-tools/ (props changed) : lucene/dev/branches/branch_5x/lucene/ (props changed) : lucene/dev/branches/branch_5x/lucene/BUILD.txt (props changed) : lucene/dev/branches/branch_5x/lucene/CHANGES.txt (props changed) : lucene/dev/branches/branch_5x/lucene/JRE_VERSION_MIGRATION.txt (props changed) : lucene/dev/branches/branch_5x/lucene/LICENSE.txt (props changed) : lucene/dev/branches/branch_5x/lucene/MIGRATE.txt (props changed) : lucene/dev/branches/branch_5x/lucene/NOTICE.txt (props changed) : lucene/dev/branches/branch_5x/lucene/README.txt (props changed) : lucene/dev/branches/branch_5x/lucene/SYSTEM_REQUIREMENTS.txt (props changed) : lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/miscellaneous/Lucene47WordDelimiterFilter.java (props changed) : lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/ASCIITLD.jflex-macro (props changed) : lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/SUPPLEMENTARY.jflex-macro (props changed) : lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.java (props changed) : lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/StandardTokenizerImpl40.jflex (props changed) : lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.java (props changed) : lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/UAX29URLEmailTokenizerImpl40.jflex (props changed) : lucene/dev/branches/branch_5x/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/std40/package.html (props changed) : lucene/dev/branches/branch_5x/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestLucene47WordDelimiterFilter.java (props changed) : lucene/dev/branches/branch_5x/lucene/backward-codecs/ (props changed) : lucene/dev/branches/branch_5x/lucene/benchmark/ (props changed) : lucene/dev/branches/branch_5x/lucene/build.xml (props changed) : lucene/dev/branches/branch_5x/lucene/classification/ (props changed) : lucene/dev/branches/branch_5x/lucene/classification/build.xml (props changed) : lucene/dev/branches/branch_5x/lucene/classification/ivy.xml (props changed) : lucene/dev/branches/branch_5x/lucene/classification/src/ (props changed) : lucene/dev/branches/branch_5x/lucene/codecs/ (props changed) : lucene/dev/branches/branch_5x/lucene/common-build.xml (props changed) : lucene/dev/branches/branch_5x/lucene/core/ (props changed) : lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java (props changed) : lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestSort.java (props changed) : lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestSortRandom.java (props changed) : lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestTopFieldCollector.java (props changed) : lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestTotalHitCountCollector.java (props changed) : lucene/dev/branches/branch_5x/lucene/demo/ (props changed) : lucene/dev/branches/branch_5x/lucene/expressions/ (props changed) : lucene/dev/branches/branch_5x/lucene/facet/ (props changed) : lucene/dev/branches/branch_5x/lucene/grouping/ (props changed) : lucene/dev/branches/branch_5x/lucene/highlighter/ (props changed) : lucene/dev/branches/branch_5x/lucene/ivy-ignore-conflicts.properties (props changed) : lucene/dev/branches/branch_5x/lucene/ivy-settings.xml (props changed) : lucene/dev/branches/branch_5x/lucene/ivy-versions.properties (props changed) : lucene/dev/branches/branch_5x/lucene/join/ (props changed) : lucene/dev/branches/branch_5x/lucene/licenses/ (props changed) : lucene/dev/branches/branch_5x/lucene/memory/ (props changed) : lucene/dev/branches/branch_5x/lucene/misc/ (props changed) : lucene/dev/branches/branch_5x/lucene/module-build.xml (props changed) : lucene/dev/branches/branch_5x/lucene/queries/ (props changed) : lucene/dev/branches/branch_5x/lucene/queries/src/test/org/apache/lucene/queries/function/TestFunctionQuerySort.java (props changed) : lucene/dev/branches/branch_5x/lucene/queryparser/ (props changed) : lucene/dev/branches/branch_5x/lucene/replicator/ (props changed) : lucene/dev/branches/branch_5x/lucene/sandbox/ (props changed) : lucene/dev/branches/branch_5x/lucene/site/ (props changed) : lucene/dev/branches/branch_5x/lucene/spatial/ (props changed) : lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/bbox/ (props changed) : lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/prefix/PrefixTreeFacetCounter.java (props changed) : lucene/dev/branches/branch_5x/lucene/spatial/src/java/org/apache/lucene/spatial/util/ShapeAreaValueSource.java (props changed) : lucene/dev/branches/branch_5x/lucene/spatial/src/test-files/data/simple-bbox.txt (props changed) : lucene/dev/branches/branch_5x/lucene/spatial/src/test-files/simple-Queries-BBox.txt (props changed) : lucene/dev/branches/branch_5x/lucene/spatial/src/test/org/apache/lucene/spatial/bbox/ (props changed) : lucene/dev/branches/branch_5x/lucene/spatial3d/ (props changed) : lucene/dev/branches/branch_5x/lucene/suggest/ (props changed) : lucene/dev/branches/branch_5x/lucene/test-framework/ (props changed) : lucene/dev/branches/branch_5x/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/ (props changed) : lucene/dev/branches/branch_5x/lucene/tools/ (props changed) : lucene/dev/branches/branch_5x/lucene/version.properties (props changed) : lucene/dev/branches/branch_5x/solr/ (props changed) : lucene/dev/branches/branch_5x/solr/CHANGES.txt (contents, props changed) : lucene/dev/branches/branch_5x/solr/LICENSE.txt (props changed) : lucene/dev/branches/branch_5x/solr/NOTICE.txt (props changed) : lucene/dev/branches/branch_5x/solr/README.txt (props changed) : lucene/dev/branches/branch_5x/solr/bin/ (props changed) : lucene/dev/branches/branch_5x/solr/build.xml (props changed) : lucene/dev/branches/branch_5x/solr/cloud-dev/ (props changed) : lucene/dev/branches/branch_5x/solr/common-build.xml (contents, props changed) : lucene/dev/branches/branch_5x/solr/contrib/ (props changed) : lucene/dev/branches/branch_5x/solr/core/ (props changed) : lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/request/DocValuesStats.java (props changed) : lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/SchemaManager.java (props changed) : lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/ (props changed) : lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java : lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/core/TestConfig.java (props changed) : lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java : lucene/dev/branches/branch_5x/solr/example/ (props changed) : lucene/dev/branches/branch_5x/solr/licenses/ (props changed) : lucene/dev/branches/branch_5x/solr/licenses/httpclient-LICENSE-ASL.txt (props changed) : lucene/dev/branches/branch_5x/solr/licenses/httpclient-NOTICE.txt (props changed) : lucene/dev/branches/branch_5x/solr/licenses/httpcore-LICENSE-ASL.txt (props changed) : lucene/dev/branches/branch_5x/solr/licenses/httpcore-NOTICE.txt (props changed) : lucene/dev/branches/branch_5x/solr/licenses/httpmime-LICENSE-ASL.txt (props changed) : lucene/dev/branches/branch_5x/solr/licenses/httpmime-NOTICE.txt (props changed) : lucene/dev/branches/branch_5x/solr/scripts/ (props changed) : lucene/dev/branches/branch_5x/solr/server/ (props changed) : lucene/dev/branches/branch_5x/solr/site/ (props changed) : lucene/dev/branches/branch_5x/solr/site/SYSTEM_REQUIREMENTS.mdtext (props changed) : lucene/dev/branches/branch_5x/solr/solrj/ (props changed) : lucene/dev/branches/branch_5x/solr/test-framework/ (props changed) : lucene/dev/branches/branch_5x/solr/webapp/ (props changed) : : Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt : URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1693101&r1=1693100&r2=1693101&view=diff : ============================================================================== : --- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original) : +++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Tue Jul 28 14:44:15 2015 : @@ -101,6 +101,8 @@ New Features : : * SOLR-7742: Support for Immutable ConfigSets (Gregory Chanan) : : +* SOLR-6234: Scoring for query time join (Mikhail Khludnev) : + : Bug Fixes : ---------------------- : : : Modified: lucene/dev/branches/branch_5x/solr/common-build.xml : URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/common-build.xml?rev=1693101&r1=1693100&r2=1693101&view=diff : ============================================================================== : --- lucene/dev/branches/branch_5x/solr/common-build.xml (original) : +++ lucene/dev/branches/branch_5x/solr/common-build.xml Tue Jul 28 14:44:15 2015 : @@ -319,6 +319,7 @@ : <link offline="true" href="${lucene.javadoc.url}expressions" packagelistloc="${lucenedocs}/expressions"/> : <link offline="true" href="${lucene.javadoc.url}suggest" packagelistloc="${lucenedocs}/suggest"/> : <link offline="true" href="${lucene.javadoc.url}grouping" packagelistloc="${lucenedocs}/grouping"/> : + <link offline="true" href="${lucene.javadoc.url}join" packagelistloc="${lucenedocs}/join"/> : <link offline="true" href="${lucene.javadoc.url}queries" packagelistloc="${lucenedocs}/queries"/> : <link offline="true" href="${lucene.javadoc.url}queryparser" packagelistloc="${lucenedocs}/queryparser"/> : <link offline="true" href="${lucene.javadoc.url}highlighter" packagelistloc="${lucenedocs}/highlighter"/> : : Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java : URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java?rev=1693101&r1=1693100&r2=1693101&view=diff : ============================================================================== : --- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java (original) : +++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/JoinQParserPlugin.java Tue Jul 28 14:44:15 2015 : @@ -60,6 +60,7 @@ import org.apache.solr.request.LocalSolr : import org.apache.solr.request.SolrQueryRequest; : import org.apache.solr.request.SolrRequestInfo; : import org.apache.solr.schema.TrieField; : +import org.apache.solr.search.join.ScoreJoinQParserPlugin; : import org.apache.solr.util.RefCounted; : : public class JoinQParserPlugin extends QParserPlugin { : @@ -72,8 +73,17 @@ public class JoinQParserPlugin extends Q : @Override : public QParser createParser(String qstr, SolrParams localParams, SolrParams params, SolrQueryRequest req) { : return new QParser(qstr, localParams, params, req) { : + : @Override : public Query parse() throws SyntaxError { : + if(localParams!=null && localParams.get(ScoreJoinQParserPlugin.SCORE)!=null){ : + return new ScoreJoinQParserPlugin().createParser(qstr, localParams, params, req).parse(); : + }else{ : + return parseJoin(); : + } : + } : + : + Query parseJoin() throws SyntaxError { : String fromField = getParam("from"); : String fromIndex = getParam("fromIndex"); : String toField = getParam("to"); : : Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java : URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java?rev=1693101&r1=1693100&r2=1693101&view=diff : ============================================================================== : --- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java (original) : +++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/QueryEqualityTest.java Tue Jul 28 14:44:15 2015 : @@ -384,6 +384,23 @@ public class QueryEqualityTest extends S : } : } : : + public void testQueryScoreJoin() throws Exception { : + SolrQueryRequest req = req("myVar", "5", : + "df", "text", : + "ff", "foo_s", : + "tt", "bar_s", : + "scoreavg","avg"); : + : + try { : + assertQueryEquals("join", req, : + "{!join from=foo_s to=bar_s score=avg}asdf", : + "{!join from=$ff to=$tt score=Avg}asdf", : + "{!join from=$ff to='bar_s' score=$scoreavg}text:asdf"); : + } finally { : + req.close(); : + } : + } : + : public void testTerms() throws Exception { : assertQueryEquals("terms", "{!terms f=foo_i}10,20,30,-10,-20,-30", "{!terms f=foo_i}10,20,30,-10,-20,-30"); : } : : : -Hoss http://www.lucidworks.com/ --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
