You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2018/05/18 19:36:52 UTC
[1/4] lucene-solr:branch_7x: SOLR-11941: add @since javadoc
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7x 59f2b7aec -> 507781493
SOLR-11941: add @since javadoc
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ac7b344a
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ac7b344a
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ac7b344a
Branch: refs/heads/branch_7x
Commit: ac7b344acda2f3412f4e3da3df0ab8f4f8fcc7ec
Parents: 59f2b7a
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri May 18 19:54:45 2018 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri May 18 20:20:03 2018 +0100
----------------------------------------------------------------------
.../ltr/src/java/org/apache/solr/ltr/model/AdapterModel.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ac7b344a/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/AdapterModel.java
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/AdapterModel.java b/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/AdapterModel.java
index e9ca3ea..262a47f 100644
--- a/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/AdapterModel.java
+++ b/solr/contrib/ltr/src/java/org/apache/solr/ltr/model/AdapterModel.java
@@ -26,6 +26,8 @@ import org.apache.solr.ltr.norm.Normalizer;
/**
* A scoring model whose initialization is completed via its
* {@link #init(SolrResourceLoader)} method.
+ *
+ * @since 7.3
*/
public abstract class AdapterModel extends LTRScoringModel {
[4/4] lucene-solr:branch_7x: SOLR-12372: contrib/clustering (private)
logger rename
Posted by cp...@apache.org.
SOLR-12372: contrib/clustering (private) logger rename
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/50778149
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/50778149
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/50778149
Branch: refs/heads/branch_7x
Commit: 5077814939a34bb7a0bc642df65e4903fb72de2c
Parents: 2a30feb
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri May 18 20:00:49 2018 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri May 18 20:20:44 2018 +0100
----------------------------------------------------------------------
.../clustering/carrot2/LuceneCarrot2StemmerFactory.java | 8 ++++----
.../clustering/carrot2/LuceneCarrot2TokenizerFactory.java | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/50778149/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java
----------------------------------------------------------------------
diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java
index 5013e42..4065e41 100644
--- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java
+++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2StemmerFactory.java
@@ -54,7 +54,7 @@ import org.tartarus.snowball.ext.TurkishStemmer;
* @lucene.experimental
*/
public class LuceneCarrot2StemmerFactory implements IStemmerFactory {
- private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public IStemmer getStemmer(LanguageCode language) {
@@ -137,7 +137,7 @@ public class LuceneCarrot2StemmerFactory implements IStemmerFactory {
.get(language);
if (stemmerClazz == null) {
- logger.warn("No Snowball stemmer class for: " + language.name()
+ log.warn("No Snowball stemmer class for: " + language.name()
+ ". Quality of clustering may be degraded.");
return IdentityStemmer.INSTANCE;
}
@@ -145,7 +145,7 @@ public class LuceneCarrot2StemmerFactory implements IStemmerFactory {
try {
return new SnowballStemmerAdapter(stemmerClazz.newInstance());
} catch (Exception e) {
- logger.warn("Could not instantiate snowball stemmer"
+ log.warn("Could not instantiate snowball stemmer"
+ " for language: " + language.name()
+ ". Quality of clustering may be degraded.", e);
@@ -166,7 +166,7 @@ public class LuceneCarrot2StemmerFactory implements IStemmerFactory {
ReflectionUtils.classForName(ArabicStemmer.class.getName(), false);
ReflectionUtils.classForName(ArabicNormalizer.class.getName(), false);
} catch (ClassNotFoundException e) {
- logger
+ log
.warn(
"Could not instantiate Lucene stemmer for Arabic, clustering quality "
+ "of Arabic content may be degraded. For best quality clusters, "
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/50778149/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2TokenizerFactory.java
----------------------------------------------------------------------
diff --git a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2TokenizerFactory.java b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2TokenizerFactory.java
index 0ee153b..b710c02 100644
--- a/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2TokenizerFactory.java
+++ b/solr/contrib/clustering/src/java/org/apache/solr/handler/clustering/carrot2/LuceneCarrot2TokenizerFactory.java
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
* @lucene.experimental
*/
public class LuceneCarrot2TokenizerFactory implements ITokenizerFactory {
- private static final Logger logger = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
@Override
public ITokenizer getTokenizer(LanguageCode language) {
@@ -78,7 +78,7 @@ public class LuceneCarrot2TokenizerFactory implements ITokenizerFactory {
ReflectionUtils.classForName(
"org.apache.lucene.analysis.cn.smart.SentenceTokenizer", false);
} catch (Throwable e) {
- logger
+ log
.warn("Could not instantiate Smart Chinese Analyzer, clustering quality "
+ "of Chinese content may be degraded. For best quality clusters, "
+ "make sure Lucene's Smart Chinese Analyzer JAR is in the classpath");
[3/4] lucene-solr:branch_7x: SOLR-12036: use DefaultStreamFactory in
Solr Ref Guide (Streaming Expressions) example
Posted by cp...@apache.org.
SOLR-12036: use DefaultStreamFactory in Solr Ref Guide (Streaming Expressions) example
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2a30febc
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2a30febc
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2a30febc
Branch: refs/heads/branch_7x
Commit: 2a30febcf9ed96d480ce0a6c9f48713d23a18bd9
Parents: c101fd4
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri May 18 19:58:56 2018 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri May 18 20:20:32 2018 +0100
----------------------------------------------------------------------
solr/solr-ref-guide/src/streaming-expressions.adoc | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2a30febc/solr/solr-ref-guide/src/streaming-expressions.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/streaming-expressions.adoc b/solr/solr-ref-guide/src/streaming-expressions.adoc
index ed37ce1..1c34c73 100644
--- a/solr/solr-ref-guide/src/streaming-expressions.adoc
+++ b/solr/solr-ref-guide/src/streaming-expressions.adoc
@@ -99,12 +99,7 @@ The {solr-javadocs}/solr-solrj/org/apache/solr/client/solrj/io/package-summary.h
[source,java]
----
-StreamFactory streamFactory = new StreamFactory().withCollectionZkHost("collection1", zkServer.getZkAddress())
- .withStreamFunction("search", CloudSolrStream.class)
- .withStreamFunction("unique", UniqueStream.class)
- .withStreamFunction("top", RankStream.class)
- .withStreamFunction("group", ReducerStream.class)
- .withStreamFunction("parallel", ParallelStream.class);
+StreamFactory streamFactory = new DefaultStreamFactory().withCollectionZkHost("collection1", zkServer.getZkAddress());
ParallelStream pstream = (ParallelStream)streamFactory.constructStream("parallel(collection1, group(search(collection1, q=\"*:*\", fl=\"id,a_s,a_i,a_f\", sort=\"a_s asc,a_f asc\", partitionKeys=\"a_s\"), by=\"a_s asc\"), workers=\"2\", zkHost=\""+zkHost+"\", sort=\"a_s asc\")");
----
[2/4] lucene-solr:branch_7x: SOLR-12036: add @since javadoc
Posted by cp...@apache.org.
SOLR-12036: add @since javadoc
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c101fd4c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c101fd4c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c101fd4c
Branch: refs/heads/branch_7x
Commit: c101fd4c80acdf67755329ca306bea1d1b405225
Parents: ac7b344
Author: Christine Poerschke <cp...@apache.org>
Authored: Fri May 18 19:55:57 2018 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Fri May 18 20:20:17 2018 +0100
----------------------------------------------------------------------
.../solr/client/solrj/io/stream/expr/DefaultStreamFactory.java | 2 ++
1 file changed, 2 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c101fd4c/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/DefaultStreamFactory.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/DefaultStreamFactory.java b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/DefaultStreamFactory.java
index 672d0cd..07ec431 100644
--- a/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/DefaultStreamFactory.java
+++ b/solr/solrj/src/java/org/apache/solr/client/solrj/io/stream/expr/DefaultStreamFactory.java
@@ -20,6 +20,8 @@ import org.apache.solr.client.solrj.io.Lang;
/**
* A default collection of mappings, used to convert strings into stream expressions.
+ *
+ * @since 7.4
*/
public class DefaultStreamFactory extends StreamFactory {