You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2015/01/21 16:20:20 UTC
svn commit: r1653555 [1/2] - in /lucene/dev/branches/branch_5x: ./ solr/
solr/contrib/
solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/
solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/
solr/c...
Author: romseygeek
Date: Wed Jan 21 15:20:18 2015
New Revision: 1653555
URL: http://svn.apache.org/r1653555
Log:
SOLR-6976: Remove methods and classes deprecated in 4.x
Removed:
lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/CachedSqlEntityProcessor.java
lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/HttpDataSource.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/analysis/LegacyHTMLStripCharFilter.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/analysis/LegacyHTMLStripCharFilterFactory.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/common/
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/CSVRequestHandler.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/JsonUpdateRequestHandler.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/XsltUpdateRequestHandler.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/util/plugin/ResourceLoaderAware.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/analysis/LegacyHTMLStripCharFilterTest.java
Modified:
lucene/dev/branches/branch_5x/ (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/contrib/ (props changed)
lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/ConfigNameConstants.java
lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java
lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java
lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java
lucene/dev/branches/branch_5x/solr/core/ (props changed)
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/analysis/SolrAnalyzer.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/highlight/PostingsSolrHighlighter.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/CharStream.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/FastCharStream.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/SchemaField.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/QueryParsing.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SortSpec.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/core/TestConfig.java (contents, props changed)
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/highlight/DummyHighlighter.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/QueryParsingTest.java
lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java
lucene/dev/branches/branch_5x/solr/solrj/ (props changed)
lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java
lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java
lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/response/RangeFacet.java
lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java
lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java
lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/cloud/ImplicitDocRouter.java
lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/AppendedSolrParams.java
lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/DefaultSolrParams.java
lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/FacetParams.java
lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/ShardParams.java
lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/SolrParams.java
lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/SolrExampleTests.java
lucene/dev/branches/branch_5x/solr/solrj/src/test/org/apache/solr/client/solrj/SolrQueryTest.java
lucene/dev/branches/branch_5x/solr/test-framework/ (props changed)
lucene/dev/branches/branch_5x/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
Modified: lucene/dev/branches/branch_5x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/CHANGES.txt?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/solr/CHANGES.txt Wed Jan 21 15:20:18 2015
@@ -142,6 +142,36 @@ Upgrading from Solr 4.x
* Due to changes in the underlying commons-codec package, users of the BeiderMorseFilterFactory
will need to rebuild their indexes after upgrading. See LUCENE-6058 for more details.
+* CachedSqlEntityProcessor has been removed, use SqlEntityProcessor with the
+ cacheImpl parameter.
+
+* HttpDataSource has been removed, use URLDataSource instead.
+
+* LegacyHTMLStripCharFilter has been removed
+
+* CoreAdminRequest.persist() call has been removed. All changes made via
+ CoreAdmin are persistent.
+
+* SpellCheckResponse.getSuggestions() and getSuggestionFrequencies() have been
+ removed, use getAlternatives() and getAlternativeFrequencies() instead.
+
+* SolrQuery deprecated methods have been removed:
+ - setMissing() is now setFacetMissing()
+ - getFacetSort() is now getFacetSortString()
+ - setFacetSort(boolean) should instead use setFacetSort(String) with
+ FacetParams.FACET_SORT_COUNT or FacetParams.FACET_SORT_INDEX
+ - setSortField(String, ORDER) should use setSort(SortClause)
+ - addSortField(String, ORDER) should use addSort(SortClause)
+ - removeSortField(String, ORDER) shoudl use removeSort(SortClause)
+ - getSortFields() should use getSorts()
+ - set/getQueryType() should use set/getRequestHandler()
+
+* ClientUtil deprecated date methods have been removed, use DateUtil instead
+
+* FacetParams.FacetDateOther has been removed, use FacetRangeOther
+
+* ShardParams.SHARD_KEYS has been removed, use ShardParams._ROUTE_
+
* The 'old-style' solr.xml format is no longer supported, and cores must be
defined using core.properties files. See
https://cwiki.apache.org/confluence/display/solr/Format+of+solr.xml
@@ -699,6 +729,9 @@ Other Changes
* SOLR-6840: Remove support for old-style solr.xml (Erick Erickson, Alan Woodward)
+* SOLR-6976: Remove classes and methods deprecated in 4.x (Alan Woodward, Noble
+ Paul, Chris Hostetter)
+
================== 4.10.3 ==================
Bug Fixes
Modified: lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/ConfigNameConstants.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/ConfigNameConstants.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/ConfigNameConstants.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/config/ConfigNameConstants.java Wed Jan 21 15:20:18 2015
@@ -16,12 +16,12 @@
*/
package org.apache.solr.handler.dataimport.config;
+import org.apache.solr.handler.dataimport.SolrWriter;
+
import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import org.apache.solr.handler.dataimport.SolrWriter;
-
public class ConfigNameConstants {
public static final String SCRIPT = "script";
@@ -31,10 +31,6 @@ public class ConfigNameConstants {
public static final String PROPERTY_WRITER = "propertyWriter";
- /**
- * @deprecated use IMPORTER_NS_SHORT instead
- */
- @Deprecated
public static final String IMPORTER_NS = "dataimporter";
public static final String IMPORTER_NS_SHORT = "dih";
Modified: lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/dataimporthandler/src/test/org/apache/solr/handler/dataimport/AbstractSqlEntityProcessorTestCase.java Wed Jan 21 15:20:18 2015
@@ -1,5 +1,9 @@
package org.apache.solr.handler.dataimport;
+import junit.framework.Assert;
+import org.junit.After;
+import org.junit.Before;
+
import java.io.File;
import java.nio.file.Files;
import java.sql.Connection;
@@ -17,11 +21,6 @@ import java.util.Locale;
import java.util.Map;
import java.util.Set;
-import junit.framework.Assert;
-
-import org.junit.After;
-import org.junit.Before;
-
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
* contributor license agreements. See the NOTICE file distributed with
@@ -634,8 +633,7 @@ public abstract class AbstractSqlEntityP
+ "newColumnName=''countryAdded_s'' newColumnValue=''country_added'' "
: "");
if (countryCached) {
- sb.append(random().nextBoolean() ? "processor=''SqlEntityProcessor'' cacheImpl=''SortedMapBackedCache'' "
- : "processor=''CachedSqlEntityProcessor'' ");
+ sb.append("processor=''SqlEntityProcessor'' cacheImpl=''SortedMapBackedCache'' ");
if (useSimpleCaches) {
sb.append("query=''SELECT CODE, COUNTRY_NAME FROM COUNTRIES WHERE DELETED != 'Y' AND CODE='${People.COUNTRY_CODE}' ''>\n");
} else {
@@ -671,8 +669,7 @@ public abstract class AbstractSqlEntityP
+ "newColumnName=''sportsAdded_s'' newColumnValue=''sport_added'' "
: "");
if (sportsCached) {
- sb.append(random().nextBoolean() ? "processor=''SqlEntityProcessor'' cacheImpl=''SortedMapBackedCache'' "
- : "processor=''CachedSqlEntityProcessor'' ");
+ sb.append("processor=''SqlEntityProcessor'' cacheImpl=''SortedMapBackedCache'' ");
if (useSimpleCaches) {
sb.append("query=''SELECT ID, SPORT_NAME FROM PEOPLE_SPORTS WHERE DELETED != 'Y' AND PERSON_ID=${People.ID} ORDER BY ID'' ");
} else {
Modified: lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/map-reduce/src/test/org/apache/solr/hadoop/MorphlineBasicMiniMRTest.java Wed Jan 21 15:20:18 2015
@@ -16,15 +16,13 @@
*/
package org.apache.solr.hadoop;
-import java.io.File;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.OutputStreamWriter;
-import java.io.Writer;
-import java.lang.reflect.Array;
-import java.nio.charset.StandardCharsets;
-import java.util.Arrays;
-
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakAction;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakAction.Action;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope.Scope;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakZombies;
+import com.carrotsearch.randomizedtesting.annotations.ThreadLeakZombies.Consequence;
import org.apache.commons.io.FileUtils;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
@@ -49,13 +47,14 @@ import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakAction;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakAction.Action;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakLingering;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakScope.Scope;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakZombies;
-import com.carrotsearch.randomizedtesting.annotations.ThreadLeakZombies.Consequence;
+import java.io.File;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.OutputStreamWriter;
+import java.io.Writer;
+import java.lang.reflect.Array;
+import java.nio.charset.StandardCharsets;
+import java.util.Arrays;
@ThreadLeakAction({Action.WARN})
@ThreadLeakLingering(linger = 0)
Modified: lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineTest.java Wed Jan 21 15:20:18 2015
@@ -16,7 +16,6 @@
*/
package org.apache.solr.morphlines.solr;
-import org.junit.BeforeClass;
import org.junit.Test;
import org.kitesdk.morphline.api.Record;
import org.kitesdk.morphline.base.Fields;
Modified: lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAliasTest.java Wed Jan 21 15:20:18 2015
@@ -47,7 +47,7 @@ import java.util.Iterator;
@ThreadLeakScope(Scope.NONE)
@Slow
public class SolrMorphlineZkAliasTest extends AbstractSolrMorphlineZkTestBase {
-
+
@Override
public void doTest() throws Exception {
Modified: lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkAvroTest.java Wed Jan 21 15:20:18 2015
@@ -35,7 +35,6 @@ import org.apache.lucene.util.LuceneTest
import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.response.QueryResponse;
import org.apache.solr.common.SolrDocument;
-import org.junit.BeforeClass;
import org.kitesdk.morphline.api.Record;
import org.kitesdk.morphline.base.Fields;
import org.kitesdk.morphline.base.Notifications;
@@ -53,7 +52,7 @@ import java.util.List;
@ThreadLeakScope(Scope.NONE)
@Slow
public class SolrMorphlineZkAvroTest extends AbstractSolrMorphlineZkTestBase {
-
+
@Override
public void doTest() throws Exception {
Joiner joiner = Joiner.on(File.separator);
Modified: lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/contrib/morphlines-core/src/test/org/apache/solr/morphlines/solr/SolrMorphlineZkTest.java Wed Jan 21 15:20:18 2015
@@ -41,7 +41,7 @@ import java.util.Iterator;
@ThreadLeakScope(Scope.NONE)
@Slow
public class SolrMorphlineZkTest extends AbstractSolrMorphlineZkTestBase {
-
+
@Override
public void doTest() throws Exception {
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/analysis/SolrAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/analysis/SolrAnalyzer.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/analysis/SolrAnalyzer.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/analysis/SolrAnalyzer.java Wed Jan 21 15:20:18 2015
@@ -17,10 +17,9 @@
package org.apache.solr.analysis;
-import org.apache.lucene.analysis.*;
+import org.apache.lucene.analysis.Analyzer;
import java.io.Reader;
-import java.io.IOException;
/**
*
@@ -37,14 +36,8 @@ public abstract class SolrAnalyzer exten
return posIncGap;
}
- /** wrap the reader in a CharStream, if appropriate */
- @Deprecated
- public Reader charStream(Reader reader) {
- return reader;
- }
-
@Override
protected Reader initReader(String fieldName, Reader reader) {
- return charStream(reader);
+ return reader;
}
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/client/solrj/embedded/EmbeddedSolrServer.java Wed Jan 21 15:20:18 2015
@@ -17,6 +17,7 @@
package org.apache.solr.client.solrj.embedded;
+import com.google.common.base.Strings;
import org.apache.solr.client.solrj.SolrClient;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.client.solrj.SolrServerException;
@@ -30,7 +31,6 @@ import org.apache.solr.common.params.Sol
import org.apache.solr.common.util.JavaBinCodec;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.CoreContainer;
-import org.apache.solr.core.CoreDescriptor;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrRequestHandler;
@@ -62,25 +62,10 @@ public class EmbeddedSolrServer extends
/**
* Use the other constructor using a CoreContainer and a name.
- * @deprecated use {@link #EmbeddedSolrServer(CoreContainer, String)} instead.
*/
- @Deprecated
public EmbeddedSolrServer(SolrCore core)
{
- if ( core == null ) {
- throw new NullPointerException("SolrCore instance required");
- }
- CoreDescriptor dcore = core.getCoreDescriptor();
- if (dcore == null)
- throw new NullPointerException("CoreDescriptor required");
-
- CoreContainer cores = dcore.getCoreContainer();
- if (cores == null)
- throw new NullPointerException("CoreContainer required");
-
- coreName = dcore.getName();
- coreContainer = cores;
- _parser = new SolrRequestParsers( null );
+ this(core.getCoreDescriptor().getCoreContainer(), core.getName());
}
/**
@@ -93,8 +78,10 @@ public class EmbeddedSolrServer extends
if ( coreContainer == null ) {
throw new NullPointerException("CoreContainer instance required");
}
+ if (Strings.isNullOrEmpty(coreName))
+ throw new SolrException(SolrException.ErrorCode.SERVER_ERROR, "Core name cannot be empty");
this.coreContainer = coreContainer;
- this.coreName = coreName == null? "" : coreName;
+ this.coreName = coreName;
_parser = new SolrRequestParsers( null );
}
@@ -208,7 +195,7 @@ public class EmbeddedSolrServer extends
}
// Now write it out
- NamedList<Object> normalized = getParsedResponse(req, rsp);
+ NamedList<Object> normalized = BinaryResponseWriter.getParsedResponse(req, rsp);
return normalized;
}
catch( IOException iox ) {
@@ -228,18 +215,6 @@ public class EmbeddedSolrServer extends
}
/**
- * Returns a response object equivalent to what you get from the XML/JSON/javabin parser. Documents
- * become SolrDocuments, DocList becomes SolrDocumentList etc.
- *
- * @deprecated use {@link BinaryResponseWriter#getParsedResponse(SolrQueryRequest, SolrQueryResponse)}
- */
- @Deprecated
- public NamedList<Object> getParsedResponse( SolrQueryRequest req, SolrQueryResponse rsp )
- {
- return BinaryResponseWriter.getParsedResponse(req, rsp);
- }
-
- /**
* Shutdown all cores within the EmbeddedSolrServer instance
*/
@Override
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java Wed Jan 21 15:20:18 2015
@@ -18,6 +18,7 @@
package org.apache.solr.core;
import org.apache.lucene.analysis.util.CharFilterFactory;
+import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.util.TokenizerFactory;
@@ -26,7 +27,6 @@ import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.DocValuesFormat;
import org.apache.lucene.codecs.PostingsFormat;
import org.apache.lucene.util.IOUtils;
-import org.apache.solr.common.ResourceLoader;
import org.apache.solr.common.SolrException;
import org.apache.solr.handler.admin.CoreAdminHandler;
import org.apache.solr.handler.component.SearchComponent;
@@ -546,10 +546,6 @@ public class SolrResourceLoader implemen
if (!live) {
//TODO: Does SolrCoreAware make sense here since in a multi-core context
// which core are we talking about ?
- if (org.apache.solr.util.plugin.ResourceLoaderAware.class.isInstance(obj)) {
- log.warn("Class [{}] uses org.apache.solr.util.plugin.ResourceLoaderAware " +
- "which is deprecated. Change to org.apache.lucene.analysis.util.ResourceLoaderAware.", cname);
- }
if( obj instanceof ResourceLoaderAware ) {
assertAwareCompatibility( ResourceLoaderAware.class, obj );
waitingForResources.add( (ResourceLoaderAware)obj );
@@ -589,10 +585,6 @@ public class SolrResourceLoader implemen
assertAwareCompatibility( SolrCoreAware.class, obj );
waitingForCore.add( (SolrCoreAware)obj );
}
- if (org.apache.solr.util.plugin.ResourceLoaderAware.class.isInstance(obj)) {
- log.warn("Class [{}] uses org.apache.solr.util.plugin.ResourceLoaderAware " +
- "which is deprecated. Change to org.apache.lucene.analysis.util.ResourceLoaderAware.", cName);
- }
if( obj instanceof ResourceLoaderAware ) {
assertAwareCompatibility( ResourceLoaderAware.class, obj );
waitingForResources.add( (ResourceLoaderAware)obj );
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java Wed Jan 21 15:20:18 2015
@@ -92,7 +92,6 @@ public class HighlightComponent extends
PluginInfo pluginInfo = core.getSolrConfig().getPluginInfo(SolrHighlighter.class.getName()); //TODO deprecated configuration remove later
if (pluginInfo != null) {
highlighter = core.createInitInstance(pluginInfo, SolrHighlighter.class, null, DefaultSolrHighlighter.class.getName());
- highlighter.initalize(core.getSolrConfig());
} else {
DefaultSolrHighlighter defHighlighter = new DefaultSolrHighlighter(core);
defHighlighter.init(PluginInfo.EMPTY_INFO);
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandler.java Wed Jan 21 15:20:18 2015
@@ -282,7 +282,6 @@ public class HttpShardHandler extends Sh
clusterState = zkController.getClusterState();
String shardKeys = params.get(ShardParams._ROUTE_);
- if(shardKeys == null) shardKeys = params.get(ShardParams.SHARD_KEYS);//eprecated
// This will be the complete list of slices we need to query for this request.
slices = new HashMap<>();
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java Wed Jan 21 15:20:18 2015
@@ -16,18 +16,6 @@
*/
package org.apache.solr.highlight;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.ListIterator;
-import java.util.Map;
-import java.util.Set;
-
import org.apache.lucene.analysis.CachingTokenFilter;
import org.apache.lucene.analysis.TokenFilter;
import org.apache.lucene.analysis.TokenStream;
@@ -59,7 +47,6 @@ import org.apache.solr.common.params.Sol
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
import org.apache.solr.core.PluginInfo;
-import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.schema.IndexSchema;
@@ -71,6 +58,18 @@ import org.apache.solr.util.plugin.Plugi
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.ListIterator;
+import java.util.Map;
+import java.util.Set;
+
/**
*
* @since solr 1.3
@@ -160,38 +159,7 @@ public class DefaultSolrHighlighter exte
if(boundaryScanner == null) boundaryScanner = new SimpleBoundaryScanner();
boundaryScanners.put("", boundaryScanner);
boundaryScanners.put(null, boundaryScanner);
-
- initialized = true;
- }
- //just for back-compat with the deprecated method
- private boolean initialized = false;
- @Override
- @Deprecated
- public void initalize( SolrConfig config) {
- if (initialized) return;
- SolrFragmenter frag = new GapFragmenter();
- fragmenters.put("", frag);
- fragmenters.put(null, frag);
-
- SolrFormatter fmt = new HtmlFormatter();
- formatters.put("", fmt);
- formatters.put(null, fmt);
- SolrEncoder enc = new DefaultEncoder();
- encoders.put("", enc);
- encoders.put(null, enc);
-
- SolrFragListBuilder fragListBuilder = new SimpleFragListBuilder();
- fragListBuilders.put( "", fragListBuilder );
- fragListBuilders.put( null, fragListBuilder );
-
- SolrFragmentsBuilder fragsBuilder = new ScoreOrderFragmentsBuilder();
- fragmentsBuilders.put( "", fragsBuilder );
- fragmentsBuilders.put( null, fragsBuilder );
-
- SolrBoundaryScanner boundaryScanner = new SimpleBoundaryScanner();
- boundaryScanners.put("", boundaryScanner);
- boundaryScanners.put(null, boundaryScanner);
}
/**
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/highlight/PostingsSolrHighlighter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/highlight/PostingsSolrHighlighter.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/highlight/PostingsSolrHighlighter.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/highlight/PostingsSolrHighlighter.java Wed Jan 21 15:20:18 2015
@@ -107,9 +107,6 @@ import java.util.Set;
* @lucene.experimental
*/
public class PostingsSolrHighlighter extends SolrHighlighter implements PluginInfoInitialized {
-
- @Override
- public void initalize(SolrConfig config) {}
@Override
public void init(PluginInfo info) {}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/highlight/SolrHighlighter.java Wed Jan 21 15:20:18 2015
@@ -16,21 +16,20 @@ package org.apache.solr.highlight;
* limitations under the License.
*/
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.List;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
import org.apache.lucene.search.Query;
import org.apache.solr.common.params.HighlightParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
-import org.apache.solr.core.SolrConfig;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.search.DocList;
import org.apache.solr.util.SolrPluginUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.List;
public abstract class SolrHighlighter
{
@@ -38,9 +37,6 @@ public abstract class SolrHighlighter
public static int DEFAULT_PHRASE_LIMIT = 5000;
public static Logger log = LoggerFactory.getLogger(SolrHighlighter.class);
- @Deprecated
- public abstract void initalize( SolrConfig config );
-
/**
* Check whether Highlighting is enabled for this request.
* @param params The params controlling Highlighting
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/CharStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/CharStream.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/CharStream.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/CharStream.java Wed Jan 21 15:20:18 2015
@@ -27,22 +27,6 @@ interface CharStream {
*/
char readChar() throws java.io.IOException;
- @Deprecated
- /**
- * Returns the column position of the character last read.
- * @deprecated
- * @see #getEndColumn
- */
- int getColumn();
-
- @Deprecated
- /**
- * Returns the line number of the character last read.
- * @deprecated
- * @see #getEndLine
- */
- int getLine();
-
/**
* Returns the column number of the last character for current token (being
* matched after the last call to BeginTOken).
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/FastCharStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/FastCharStream.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/FastCharStream.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/parser/FastCharStream.java Wed Jan 21 15:20:18 2015
@@ -108,15 +108,6 @@ public final class FastCharStream implem
}
}
- @Override
- public final int getColumn() {
- return bufferStart + bufferPosition;
- }
- @Override
- public final int getLine() {
- return 1;
- }
- @Override
public final int getEndColumn() {
return bufferStart + bufferPosition;
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/request/SimpleFacets.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/request/SimpleFacets.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/request/SimpleFacets.java Wed Jan 21 15:20:18 2015
@@ -17,26 +17,6 @@
package org.apache.solr.request;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.EnumSet;
-import java.util.IdentityHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.Executor;
-import java.util.concurrent.Future;
-import java.util.concurrent.FutureTask;
-import java.util.concurrent.RunnableFuture;
-import java.util.concurrent.Semaphore;
-import java.util.concurrent.SynchronousQueue;
-import java.util.concurrent.ThreadPoolExecutor;
-import java.util.concurrent.TimeUnit;
-
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.LeafReader;
@@ -95,6 +75,26 @@ import org.apache.solr.util.BoundedTreeS
import org.apache.solr.util.DateMathParser;
import org.apache.solr.util.DefaultSolrThreadFactory;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.EnumSet;
+import java.util.IdentityHashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.Callable;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Executor;
+import java.util.concurrent.Future;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.RunnableFuture;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.SynchronousQueue;
+import java.util.concurrent.ThreadPoolExecutor;
+import java.util.concurrent.TimeUnit;
+
/**
* A class that generates simple Facet information for a request.
*
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/SchemaField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/SchemaField.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/SchemaField.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/schema/SchemaField.java Wed Jan 21 15:20:18 2015
@@ -96,10 +96,6 @@ public final class SchemaField extends F
public boolean storeTermOffsets() { return (properties & STORE_TERMOFFSETS)!=0; }
public boolean omitNorms() { return (properties & OMIT_NORMS)!=0; }
- /** @deprecated Use {@link #omitTermFreqAndPositions} */
- @Deprecated
- public boolean omitTf() { return omitTermFreqAndPositions(); }
-
public boolean omitTermFreqAndPositions() { return (properties & OMIT_TF_POSITIONS)!=0; }
public boolean omitPositions() { return (properties & OMIT_POSITIONS)!=0; }
public boolean storeOffsetsWithPositions() { return (properties & STORE_OFFSETS)!=0; }
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/QueryParsing.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/QueryParsing.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/QueryParsing.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/QueryParsing.java Wed Jan 21 15:20:18 2015
@@ -33,7 +33,6 @@ import org.apache.lucene.search.TermQuer
import org.apache.lucene.search.TermRangeQuery;
import org.apache.lucene.search.WildcardQuery;
import org.apache.lucene.util.BytesRef;
-import org.apache.lucene.util.CharsRef;
import org.apache.lucene.util.CharsRefBuilder;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.params.MapSolrParams;
@@ -45,8 +44,8 @@ import org.apache.solr.schema.IndexSchem
import org.apache.solr.schema.SchemaField;
import java.io.IOException;
-import java.util.Collections;
import java.util.ArrayList;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Locale;
@@ -222,17 +221,6 @@ public class QueryParsing {
return new MapSolrParams(localParams);
}
- /**
- * Returns the Sort object represented by the string, or null if default sort
- * by score descending should be used.
- * @see #parseSortSpec
- * @deprecated use {@link #parseSortSpec}
- */
- @Deprecated
- public static Sort parseSort(String sortSpec, SolrQueryRequest req) {
- return parseSortSpec(sortSpec, req).getSort();
- }
-
/**
* <p>
* The form of the sort specification string currently parsed is:
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SortSpec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SortSpec.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SortSpec.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/search/SortSpec.java Wed Jan 21 15:20:18 2015
@@ -19,13 +19,11 @@ package org.apache.solr.search;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
-
import org.apache.solr.schema.SchemaField;
import java.util.Arrays;
-import java.util.List;
-import java.util.ArrayList;
import java.util.Collections;
+import java.util.List;
/***
* SortSpec encapsulates a Lucene Sort and a count of the number of documents
* to return.
@@ -44,28 +42,6 @@ public class SortSpec
setSortAndFields(sort, Arrays.asList(fields));
}
- /** @deprecated Specify both Sort and SchemaField[] when constructing */
- @Deprecated
- public SortSpec(Sort sort, int num) {
- this(sort,0,num);
- }
-
- /** @deprecated Specify both Sort and SchemaField[] when constructing */
- @Deprecated
- public SortSpec(Sort sort, int offset, int num) {
- setSort(sort);
- this.offset=offset;
- this.num=num;
- }
-
- /** @deprecated use {@link #setSortAndFields} */
- @Deprecated
- public void setSort( Sort s )
- {
- sort = s;
- fields = Collections.unmodifiableList(Arrays.asList(new SchemaField[s.getSort().length]));
- }
-
/**
* the specified SchemaFields must correspond one to one with the Sort's SortFields,
* using null where appropriate.
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java Wed Jan 21 15:20:18 2015
@@ -46,14 +46,8 @@ public class SolrIndexConfig implements
final String defaultMergePolicyClassName;
public static final String DEFAULT_MERGE_SCHEDULER_CLASSNAME = ConcurrentMergeScheduler.class.getName();
public final Version luceneVersion;
-
- /**
- * The explicit value of <useCompoundFile> specified on this index config
- * @deprecated use {@link #getUseCompoundFile}
- */
- @Deprecated
- public final boolean useCompoundFile;
- private boolean effectiveUseCompountFileSetting;
+
+ private boolean effectiveUseCompoundFileSetting;
public final int maxBufferedDocs;
public final int maxMergeDocs;
@@ -83,7 +77,7 @@ public class SolrIndexConfig implements
@SuppressWarnings("deprecation")
private SolrIndexConfig(SolrConfig solrConfig) {
luceneVersion = solrConfig.luceneMatchVersion;
- useCompoundFile = effectiveUseCompountFileSetting = false;
+ effectiveUseCompoundFileSetting = false;
maxBufferedDocs = -1;
maxMergeDocs = -1;
maxIndexingThreads = IndexWriterConfig.DEFAULT_MAX_THREAD_STATES;
@@ -133,8 +127,7 @@ public class SolrIndexConfig implements
true);
defaultMergePolicyClassName = def.defaultMergePolicyClassName;
- useCompoundFile=solrConfig.getBool(prefix+"/useCompoundFile", def.useCompoundFile);
- effectiveUseCompountFileSetting = useCompoundFile;
+ effectiveUseCompoundFileSetting = solrConfig.getBool(prefix+"/useCompoundFile", def.getUseCompoundFile());
maxBufferedDocs=solrConfig.getInt(prefix+"/maxBufferedDocs",def.maxBufferedDocs);
maxMergeDocs=solrConfig.getInt(prefix+"/maxMergeDocs",def.maxMergeDocs);
maxIndexingThreads=solrConfig.getInt(prefix+"/maxIndexingThreads",def.maxIndexingThreads);
@@ -305,7 +298,7 @@ public class SolrIndexConfig implements
}
public boolean getUseCompoundFile() {
- return effectiveUseCompountFileSetting;
+ return effectiveUseCompoundFileSetting;
}
/**
@@ -329,7 +322,7 @@ public class SolrIndexConfig implements
if (useCFSArg instanceof Boolean) {
boolean cfs = ((Boolean)useCFSArg).booleanValue();
log.warn("Please update your config to specify <useCompoundFile>"+cfs+"</useCompoundFile> directly in your <indexConfig> settings.");
- effectiveUseCompountFileSetting = cfs;
+ effectiveUseCompoundFileSetting = cfs;
} else {
log.error("MergePolicy's 'useCompoundFile' init arg is not a boolean, can not apply back compat logic to apply to the IndexWriterConfig: " + useCFSArg.toString());
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java Wed Jan 21 15:20:18 2015
@@ -17,24 +17,6 @@ package org.apache.solr.update.processor
* limitations under the License.
*/
-import static org.apache.solr.update.processor.DistributingUpdateProcessorFactory.DISTRIB_UPDATE_PARAM;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.TimeUnit;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.locks.ReentrantLock;
-
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.CharsRefBuilder;
import org.apache.solr.client.solrj.request.UpdateRequest;
@@ -91,6 +73,24 @@ import org.apache.zookeeper.KeeperExcept
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.locks.ReentrantLock;
+
+import static org.apache.solr.update.processor.DistributingUpdateProcessorFactory.DISTRIB_UPDATE_PARAM;
+
// NOT mt-safe... create a new processor for each add thread
// TODO: we really should not wait for distrib after local? unless a certain replication factor is asked for
public class DistributedUpdateProcessor extends UpdateRequestProcessor {
@@ -1254,7 +1254,6 @@ public class DistributedUpdateProcessor
SolrParams params = req.getParams();
String route = params.get(ShardParams._ROUTE_);
- if(route == null) route = params.get(ShardParams.SHARD_KEYS);// deprecated . kept for backcompat
Collection<Slice> slices = coll.getRouter().getSearchSlices(route, params, coll);
List<Node> leaders = new ArrayList<>(slices.size());
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/cloud/ShardRoutingTest.java Wed Jan 21 15:20:18 2015
@@ -17,32 +17,15 @@ package org.apache.solr.cloud;
* limitations under the License.
*/
-import org.apache.solr.client.solrj.SolrQuery;
import org.apache.solr.client.solrj.SolrClient;
-import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.client.solrj.embedded.JettySolrRunner;
-import org.apache.solr.client.solrj.impl.CloudSolrClient;
import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.client.solrj.response.QueryResponse;
-import org.apache.solr.common.SolrDocument;
-import org.apache.solr.common.SolrException;
-import org.apache.solr.common.SolrInputDocument;
-import org.apache.solr.common.cloud.CompositeIdRouter;
-import org.apache.solr.common.cloud.ZkNodeProps;
-import org.apache.solr.common.cloud.ZkStateReader;
-import org.apache.solr.common.params.CommonParams;
-import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.ShardParams;
-import org.apache.solr.common.util.StrUtils;
-import org.apache.solr.servlet.SolrDispatchFilter;
-import org.apache.solr.update.DirectUpdateHandler2;
import org.junit.BeforeClass;
-import org.junit.Ignore;
-import java.util.HashSet;
import java.util.List;
import java.util.Map;
-import java.util.Set;
public class ShardRoutingTest extends AbstractFullDistribZkTestBase {
@@ -137,7 +120,7 @@ public class ShardRoutingTest extends Ab
private void doHashingTest() throws Exception {
log.info("### STARTING doHashingTest");
assertEquals(4, cloudClient.getZkStateReader().getClusterState().getCollection(DEFAULT_COLLECTION).getSlices().size());
- String shardKeys = ShardParams.SHARD_KEYS;
+ String shardKeys = ShardParams._ROUTE_;
// for now, we know how ranges will be distributed to shards.
// may have to look it up in clusterstate if that assumption changes.
@@ -282,12 +265,12 @@ public class ShardRoutingTest extends Ab
assertEquals(1, nEnd - nStart); // short circuit should prevent distrib search
nStart = getNumRequests();
- replica.client.solrClient.query( params("q","*:*", "shard.keys","b!") );
+ replica.client.solrClient.query( params("q","*:*", ShardParams._ROUTE_, "b!") );
nEnd = getNumRequests();
assertEquals(1, nEnd - nStart); // short circuit should prevent distrib search
nStart = getNumRequests();
- leader2.client.solrClient.query( params("q","*:*", "shard.keys","b!") );
+ leader2.client.solrClient.query( params("q","*:*", ShardParams._ROUTE_, "b!") );
nEnd = getNumRequests();
assertEquals(3, nEnd - nStart); // original + 2 phase distrib search. we could improve this!
@@ -297,12 +280,12 @@ public class ShardRoutingTest extends Ab
assertEquals(9, nEnd - nStart); // original + 2 phase distrib search * 4 shards.
nStart = getNumRequests();
- leader2.client.solrClient.query( params("q","*:*", "shard.keys","b!,d!") );
+ leader2.client.solrClient.query( params("q","*:*", ShardParams._ROUTE_, "b!,d!") );
nEnd = getNumRequests();
assertEquals(5, nEnd - nStart); // original + 2 phase distrib search * 2 shards.
nStart = getNumRequests();
- leader2.client.solrClient.query( params("q","*:*", "shard.keys","b!,f1!f2!") );
+ leader2.client.solrClient.query( params("q","*:*", ShardParams._ROUTE_, "b!,f1!f2!") );
nEnd = getNumRequests();
assertEquals(5, nEnd - nStart);
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/core/TestConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/core/TestConfig.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/core/TestConfig.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/core/TestConfig.java Wed Jan 21 15:20:18 2015
@@ -17,17 +17,14 @@
package org.apache.solr.core;
-import org.apache.lucene.index.IndexWriter;
+import org.apache.lucene.index.ConcurrentMergeScheduler;
import org.apache.lucene.index.IndexWriterConfig;
import org.apache.lucene.index.TieredMergePolicy;
-import org.apache.lucene.index.ConcurrentMergeScheduler;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.handler.admin.ShowFileRequestHandler;
-import org.apache.solr.update.DirectUpdateHandler2;
-import org.apache.solr.update.SolrIndexConfig;
-import org.apache.solr.util.RefCounted;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.IndexSchemaFactory;
+import org.apache.solr.update.SolrIndexConfig;
import org.junit.BeforeClass;
import org.junit.Test;
import org.w3c.dom.Node;
@@ -36,7 +33,6 @@ import org.w3c.dom.NodeList;
import javax.xml.xpath.XPathConstants;
import java.io.IOException;
import java.io.InputStream;
-import java.util.Locale;
public class TestConfig extends SolrTestCaseJ4 {
@@ -117,7 +113,7 @@ public class TestConfig extends SolrTest
SolrIndexConfig sic = sc.indexConfig;
assertEquals("default ramBufferSizeMB", 100.0D, sic.ramBufferSizeMB, 0.0D);
assertEquals("default LockType", SolrIndexConfig.LOCK_TYPE_NATIVE, sic.lockType);
- assertEquals("default useCompoundFile", false, sic.useCompoundFile);
+ assertEquals("default useCompoundFile", false, sic.getUseCompoundFile());
IndexSchema indexSchema = IndexSchemaFactory.buildIndexSchema("schema.xml", solrConfig);
IndexWriterConfig iwc = sic.toIndexWriterConfig(indexSchema);
@@ -140,7 +136,7 @@ public class TestConfig extends SolrTest
Double.parseDouble(System.getProperty("solr.tests.ramBufferSizeMB")),
sic.ramBufferSizeMB, 0.0D);
assertEquals("useCompoundFile sysprop",
- Boolean.parseBoolean(System.getProperty("useCompoundFile")), sic.useCompoundFile);
+ Boolean.parseBoolean(System.getProperty("useCompoundFile")), sic.getUseCompoundFile());
}
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/highlight/DummyHighlighter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/highlight/DummyHighlighter.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/highlight/DummyHighlighter.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/highlight/DummyHighlighter.java Wed Jan 21 15:20:18 2015
@@ -16,15 +16,14 @@
*/
package org.apache.solr.highlight;
-import java.io.IOException;
-
import org.apache.lucene.search.Query;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.SimpleOrderedMap;
-import org.apache.solr.core.SolrConfig;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.search.DocList;
+import java.io.IOException;
+
public class DummyHighlighter extends SolrHighlighter {
@Override
@@ -35,9 +34,4 @@ public class DummyHighlighter extends So
return fragments;
}
- @Override
- public void initalize(SolrConfig config) {
- // do nothing
- }
-
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/QueryParsingTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/QueryParsingTest.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/QueryParsingTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/search/QueryParsingTest.java Wed Jan 21 15:20:18 2015
@@ -20,10 +20,9 @@ import org.apache.lucene.search.Query;
import org.apache.lucene.search.Sort;
import org.apache.lucene.search.SortField;
import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.schema.SchemaField;
-import org.apache.solr.search.SortSpec;
import org.apache.solr.common.SolrException;
import org.apache.solr.request.SolrQueryRequest;
+import org.apache.solr.schema.SchemaField;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -79,7 +78,7 @@ public class QueryParsingTest extends So
SortSpec spec;
SolrQueryRequest req = req();
- sort = QueryParsing.parseSort("score desc", req);
+ sort = QueryParsing.parseSortSpec("score desc", req).getSort();
assertNull("sort", sort);//only 1 thing in the list, no Sort specified
spec = QueryParsing.parseSortSpec("score desc", req);
@@ -89,7 +88,7 @@ public class QueryParsingTest extends So
assertEquals(0, spec.getSchemaFields().size());
// SOLR-4458 - using different case variations of asc and desc
- sort = QueryParsing.parseSort("score aSc", req);
+ sort = QueryParsing.parseSortSpec("score aSc", req).getSort();
SortField[] flds = sort.getSort();
assertEquals(flds[0].getType(), SortField.Type.SCORE);
assertTrue(flds[0].getReverse());
@@ -102,7 +101,7 @@ public class QueryParsingTest extends So
assertEquals(1, spec.getSchemaFields().size());
assertNull(spec.getSchemaFields().get(0));
- sort = QueryParsing.parseSort("weight dEsC", req);
+ sort = QueryParsing.parseSortSpec("weight dEsC", req).getSort();
flds = sort.getSort();
assertEquals(flds[0].getType(), SortField.Type.FLOAT);
assertEquals(flds[0].getField(), "weight");
@@ -118,7 +117,7 @@ public class QueryParsingTest extends So
assertNotNull(spec.getSchemaFields().get(0));
assertEquals("weight", spec.getSchemaFields().get(0).getName());
- sort = QueryParsing.parseSort("weight desc,bday ASC", req);
+ sort = QueryParsing.parseSortSpec("weight desc,bday ASC", req).getSort();
flds = sort.getSort();
assertEquals(flds[0].getType(), SortField.Type.FLOAT);
assertEquals(flds[0].getField(), "weight");
@@ -127,7 +126,7 @@ public class QueryParsingTest extends So
assertEquals(flds[1].getField(), "bday");
assertEquals(flds[1].getReverse(), false);
//order aliases
- sort = QueryParsing.parseSort("weight top,bday asc", req);
+ sort = QueryParsing.parseSortSpec("weight top,bday asc", req).getSort();
flds = sort.getSort();
assertEquals(flds[0].getType(), SortField.Type.FLOAT);
assertEquals(flds[0].getField(), "weight");
@@ -135,7 +134,7 @@ public class QueryParsingTest extends So
assertEquals(flds[1].getType(), SortField.Type.LONG);
assertEquals(flds[1].getField(), "bday");
assertEquals(flds[1].getReverse(), false);
- sort = QueryParsing.parseSort("weight top,bday bottom", req);
+ sort = QueryParsing.parseSortSpec("weight top,bday bottom", req).getSort();
flds = sort.getSort();
assertEquals(flds[0].getType(), SortField.Type.FLOAT);
assertEquals(flds[0].getField(), "weight");
@@ -145,20 +144,20 @@ public class QueryParsingTest extends So
assertEquals(flds[1].getReverse(), false);
//test weird spacing
- sort = QueryParsing.parseSort("weight DESC, bday asc", req);
+ sort = QueryParsing.parseSortSpec("weight DESC, bday asc", req).getSort();
flds = sort.getSort();
assertEquals(flds[0].getType(), SortField.Type.FLOAT);
assertEquals(flds[0].getField(), "weight");
assertEquals(flds[1].getField(), "bday");
assertEquals(flds[1].getType(), SortField.Type.LONG);
//handles trailing commas
- sort = QueryParsing.parseSort("weight desc,", req);
+ sort = QueryParsing.parseSortSpec("weight desc,", req).getSort();
flds = sort.getSort();
assertEquals(flds[0].getType(), SortField.Type.FLOAT);
assertEquals(flds[0].getField(), "weight");
//test functions
- sort = QueryParsing.parseSort("pow(weight, 2) desc", req);
+ sort = QueryParsing.parseSortSpec("pow(weight, 2) desc", req).getSort();
flds = sort.getSort();
assertEquals(flds[0].getType(), SortField.Type.REWRITEABLE);
//Not thrilled about the fragility of string matching here, but...
@@ -166,12 +165,12 @@ public class QueryParsingTest extends So
assertEquals(flds[0].getField(), "pow(float(weight),const(2))");
//test functions (more deep)
- sort = QueryParsing.parseSort("sum(product(r_f1,sum(d_f1,t_f1,1.0)),a_f1) asc", req);
+ sort = QueryParsing.parseSortSpec("sum(product(r_f1,sum(d_f1,t_f1,1.0)),a_f1) asc", req).getSort();
flds = sort.getSort();
assertEquals(flds[0].getType(), SortField.Type.REWRITEABLE);
assertEquals(flds[0].getField(), "sum(product(float(r_f1),sum(float(d_f1),float(t_f1),const(1.0))),float(a_f1))");
- sort = QueryParsing.parseSort("pow(weight, 2.0) desc", req);
+ sort = QueryParsing.parseSortSpec("pow(weight, 2.0) desc", req).getSort();
flds = sort.getSort();
assertEquals(flds[0].getType(), SortField.Type.REWRITEABLE);
//Not thrilled about the fragility of string matching here, but...
@@ -202,19 +201,19 @@ public class QueryParsingTest extends So
assertEquals("bday", schemaFlds.get(2).getName());
//handles trailing commas
- sort = QueryParsing.parseSort("weight desc,", req);
+ sort = QueryParsing.parseSortSpec("weight desc,", req).getSort();
flds = sort.getSort();
assertEquals(flds[0].getType(), SortField.Type.FLOAT);
assertEquals(flds[0].getField(), "weight");
//Test literals in functions
- sort = QueryParsing.parseSort("strdist(foo_s1, \"junk\", jw) desc", req);
+ sort = QueryParsing.parseSortSpec("strdist(foo_s1, \"junk\", jw) desc", req).getSort();
flds = sort.getSort();
assertEquals(flds[0].getType(), SortField.Type.REWRITEABLE);
//the value sources get wrapped, so the out field is different than the input
assertEquals(flds[0].getField(), "strdist(str(foo_s1),literal(junk), dist=org.apache.lucene.search.spell.JaroWinklerDistance)");
- sort = QueryParsing.parseSort("", req);
+ sort = QueryParsing.parseSortSpec("", req).getSort();
assertNull(sort);
spec = QueryParsing.parseSortSpec("", req);
@@ -231,40 +230,40 @@ public class QueryParsingTest extends So
//test some bad vals
try {
- sort = QueryParsing.parseSort("weight, desc", req);
+ sort = QueryParsing.parseSortSpec("weight, desc", req).getSort();
assertTrue(false);
} catch (SolrException e) {
//expected
}
try {
- sort = QueryParsing.parseSort("w", req);
+ sort = QueryParsing.parseSortSpec("w", req).getSort();
assertTrue(false);
} catch (SolrException e) {
//expected
}
try {
- sort = QueryParsing.parseSort("weight desc, bday", req);
+ sort = QueryParsing.parseSortSpec("weight desc, bday", req).getSort();
assertTrue(false);
} catch (SolrException e) {
}
try {
//bad number of commas
- sort = QueryParsing.parseSort("pow(weight,,2) desc, bday asc", req);
+ sort = QueryParsing.parseSortSpec("pow(weight,,2) desc, bday asc", req).getSort();
assertTrue(false);
} catch (SolrException e) {
}
try {
//bad function
- sort = QueryParsing.parseSort("pow() desc, bday asc", req);
+ sort = QueryParsing.parseSortSpec("pow() desc, bday asc", req).getSort();
assertTrue(false);
} catch (SolrException e) {
}
try {
//bad number of parens
- sort = QueryParsing.parseSort("pow((weight,2) desc, bday asc", req);
+ sort = QueryParsing.parseSortSpec("pow((weight,2) desc, bday asc", req).getSort();
assertTrue(false);
} catch (SolrException e) {
}
Modified: lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java (original)
+++ lucene/dev/branches/branch_5x/solr/core/src/test/org/apache/solr/update/processor/SignatureUpdateProcessorFactoryTest.java Wed Jan 21 15:20:18 2015
@@ -17,12 +17,7 @@
package org.apache.solr.update.processor;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
-
import org.apache.lucene.util.Constants;
-
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.impl.BinaryRequestWriter;
import org.apache.solr.client.solrj.request.UpdateRequest;
@@ -30,20 +25,23 @@ import org.apache.solr.common.SolrInputD
import org.apache.solr.common.params.MultiMapSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.params.UpdateParams;
-import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.ContentStream;
import org.apache.solr.common.util.ContentStreamBase;
+import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.SolrCore;
-import org.apache.solr.handler.BinaryUpdateRequestHandler;
import org.apache.solr.handler.UpdateRequestHandler;
+import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.request.SolrQueryRequestBase;
-import org.apache.solr.request.LocalSolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
/**
*
*/
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/SolrQuery.java Wed Jan 21 15:20:18 2015
@@ -17,13 +17,6 @@
package org.apache.solr.client.solrj;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Date;
-import java.util.List;
-import java.util.Locale;
-import java.util.regex.Pattern;
-
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.FacetParams;
import org.apache.solr.common.params.HighlightParams;
@@ -32,6 +25,13 @@ import org.apache.solr.common.params.Sta
import org.apache.solr.common.params.TermsParams;
import org.apache.solr.common.util.DateUtil;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Date;
+import java.util.List;
+import java.util.Locale;
+import java.util.regex.Pattern;
+
/**
* This is an augmented SolrParams with get/set/add fields for common fields used
@@ -443,14 +443,6 @@ public class SolrQuery extends Modifiabl
return this;
}
- /**
- * @deprecated use {@link #setFacetMissing(Boolean)}
- */
- @Deprecated
- public SolrQuery setMissing(String fld) {
- return setFacetMissing(Boolean.valueOf(fld));
- }
-
/** get facet sort
*
* @return facet sort or default of {@link FacetParams#FACET_SORT_COUNT}
@@ -459,18 +451,6 @@ public class SolrQuery extends Modifiabl
return this.get(FacetParams.FACET_SORT, FacetParams.FACET_SORT_COUNT);
}
- /** get facet sort
- *
- * @return facet sort or default of true. <br />
- * true corresponds to
- * {@link FacetParams#FACET_SORT_COUNT} and <br />false to {@link FacetParams#FACET_SORT_INDEX}
- *
- * @deprecated Use {@link #getFacetSortString()} instead.
- */
- @Deprecated
- public boolean getFacetSort() {
- return this.get(FacetParams.FACET_SORT, FacetParams.FACET_SORT_COUNT).equals(FacetParams.FACET_SORT_COUNT);
- }
/** set facet sort
*
@@ -482,19 +462,6 @@ public class SolrQuery extends Modifiabl
return this;
}
- /** set facet sort
- *
- * @param sort sort facets
- * @return this
- * @deprecated Use {@link #setFacetSort(String)} instead, true corresponds to
- * {@link FacetParams#FACET_SORT_COUNT} and false to {@link FacetParams#FACET_SORT_INDEX}.
- */
- @Deprecated
- public SolrQuery setFacetSort(boolean sort) {
- this.set(FacetParams.FACET_SORT, sort == true ? FacetParams.FACET_SORT_COUNT : FacetParams.FACET_SORT_INDEX);
- return this;
- }
-
/** add highlight field
*
* @param f field to enable for highlighting
@@ -572,57 +539,6 @@ public class SolrQuery extends Modifiabl
}
/**
- * Replaces the sort string with a single sort field.
- * @deprecated Use {@link #setSort(SortClause)} instead, which is part
- * of an api handling a wider range of sort specifications.
- */
- @Deprecated
- public SolrQuery setSortField(String field, ORDER order) {
- this.remove(CommonParams.SORT);
- addValueToParam(CommonParams.SORT, toSortString(field, order));
- return this;
- }
-
- /**
- * Adds a sort field to the end of the sort string.
- * @deprecated Use {@link #addSort(SortClause)} instead, which is part
- * of an api handling a wider range of sort specifications.
- */
- @Deprecated
- public SolrQuery addSortField(String field, ORDER order) {
- return addValueToParam(CommonParams.SORT, toSortString(field, order));
- }
-
- /**
- * Removes a sort field to the end of the sort string.
- * @deprecated Use {@link #removeSort(SortClause)} instead, which is part
- * of an api handling a wider range of sort specifications.
- */
- @Deprecated
- public SolrQuery removeSortField(String field, ORDER order) {
- String[] sorts = getSortFields();
- if (sorts != null) {
- String removeSort = toSortString(field, order);
- String s = join(sorts, ",", removeSort);
- if (s.length()==0) s=null;
- this.set(CommonParams.SORT, s);
- }
- return this;
- }
-
- /**
- * Gets an array of sort specifications.
- * @deprecated Use {@link #getSorts()} instead, which is part
- * of an api handling a wider range of sort specifications.
- */
- @Deprecated
- public String[] getSortFields() {
- String s = getSortField();
- if (s==null) return null;
- return s.trim().split(", *");
- }
-
- /**
* Gets the raw sort field, as it will be sent to Solr.
* <p>
* The returned sort field will always contain a serialized version
@@ -979,22 +895,6 @@ public class SolrQuery extends Modifiabl
}
/**
- * @deprecated See {@link #setRequestHandler(String)}.
- */
- @Deprecated
- public SolrQuery setQueryType(String qt) {
- return setRequestHandler(qt);
- }
-
- /**
- * @deprecated See {@link #getRequestHandler()}.
- */
- @Deprecated
- public String getQueryType() {
- return getRequestHandler();
- }
-
- /**
* @return this
* @see ModifiableSolrParams#set(String,String[])
*/
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrClient.java Wed Jan 21 15:20:18 2015
@@ -923,9 +923,6 @@ public class CloudSolrClient extends Sol
}
String shardKeys = reqParams.get(ShardParams._ROUTE_);
- if(shardKeys == null) {
- shardKeys = reqParams.get(ShardParams.SHARD_KEYS); // deprecated
- }
// TODO: not a big deal because of the caching, but we could avoid looking
// at every shard
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/request/CoreAdminRequest.java Wed Jan 21 15:20:18 2015
@@ -587,14 +587,6 @@ public class CoreAdminRequest extends So
return req.process( client );
}
- @Deprecated
- public static CoreAdminResponse persist(String fileName, SolrClient client) throws SolrServerException, IOException
- {
- CoreAdminRequest.Persist req = new CoreAdminRequest.Persist();
- req.setFileName(fileName);
- return req.process(client);
- }
-
public static CoreAdminResponse mergeIndexes(String name,
String[] indexDirs, String[] srcCores, SolrClient client) throws SolrServerException,
IOException {
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/response/RangeFacet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/response/RangeFacet.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/response/RangeFacet.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/response/RangeFacet.java Wed Jan 21 15:20:18 2015
@@ -84,11 +84,6 @@ public abstract class RangeFacet<B, G> {
public static class Numeric extends RangeFacet<Number, Number> {
- @Deprecated
- public Numeric(String name, Number start, Number end, Number gap, Number before, Number after) {
- this(name, start, end, gap, before, after, null);
- }
-
public Numeric(String name, Number start, Number end, Number gap, Number before, Number after, Number between) {
super(name, start, end, gap, before, after, between);
}
@@ -97,11 +92,6 @@ public abstract class RangeFacet<B, G> {
public static class Date extends RangeFacet<java.util.Date, String> {
- @Deprecated
- public Date(String name, java.util.Date start, java.util.Date end, String gap, Number before, Number after) {
- this(name, start, end, gap, before, after, null);
- }
-
public Date(String name, java.util.Date start, java.util.Date end, String gap, Number before, Number after, Number between) {
super(name, start, end, gap, before, after, between);
}
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/response/SpellCheckResponse.java Wed Jan 21 15:20:18 2015
@@ -210,18 +210,6 @@ public class SpellCheckResponse {
return alternativeFrequencies;
}
- @Deprecated
- /** @see #getAlternatives */
- public List<String> getSuggestions() {
- return alternatives;
- }
-
- @Deprecated
- /** @see #getAlternativeFrequencies */
- public List<Integer> getSuggestionFrequencies() {
- return alternativeFrequencies;
- }
-
}
public class Collation {
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/client/solrj/util/ClientUtils.java Wed Jan 21 15:20:18 2015
@@ -17,21 +17,6 @@
package org.apache.solr.client.solrj.util;
-import java.io.IOException;
-import java.io.StringWriter;
-import java.io.Writer;
-import java.net.URLEncoder;
-import java.text.DateFormat;
-import java.text.ParseException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.Iterator;
-import java.util.Map;
-import java.util.Map.Entry;
-import java.util.TimeZone;
-import java.nio.ByteBuffer;
-
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrInputDocument;
import org.apache.solr.common.SolrInputField;
@@ -43,6 +28,18 @@ import org.apache.solr.common.util.Conte
import org.apache.solr.common.util.DateUtil;
import org.apache.solr.common.util.XML;
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.Writer;
+import java.net.URLEncoder;
+import java.nio.ByteBuffer;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.Iterator;
+import java.util.Map;
+import java.util.Map.Entry;
+
/**
*
@@ -187,44 +184,6 @@ public class ClientUtils
//---------------------------------------------------------------------------------------
/**
- * @deprecated Use {@link org.apache.solr.common.util.DateUtil#DEFAULT_DATE_FORMATS}
- */
- @Deprecated
- public static final Collection<String> fmts = DateUtil.DEFAULT_DATE_FORMATS;
-
- /**
- * Returns a formatter that can be use by the current thread if needed to
- * convert Date objects to the Internal representation.
- *
- * @deprecated Use {@link org.apache.solr.common.util.DateUtil#parseDate(String)}
- */
- @Deprecated
- public static Date parseDate( String d ) throws ParseException
- {
- return DateUtil.parseDate(d);
- }
-
- /**
- * Returns a formatter that can be use by the current thread if needed to
- * convert Date objects to the Internal representation.
- *
- * @deprecated use {@link org.apache.solr.common.util.DateUtil#getThreadLocalDateFormat()}
- */
- @Deprecated
- public static DateFormat getThreadLocalDateFormat() {
-
- return DateUtil.getThreadLocalDateFormat();
- }
-
- /**
- * @deprecated Use {@link org.apache.solr.common.util.DateUtil#UTC}.
- */
- @Deprecated
- public static TimeZone UTC = DateUtil.UTC;
-
-
-
- /**
* See: {@link org.apache.lucene.queryparser.classic queryparser syntax}
* for more information on Escaping Special Characters
*/
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/cloud/ClusterState.java Wed Jan 21 15:20:18 2015
@@ -17,6 +17,12 @@ package org.apache.solr.common.cloud;
* limitations under the License.
*/
+import org.apache.solr.common.SolrException;
+import org.apache.solr.common.SolrException.ErrorCode;
+import org.noggit.JSONWriter;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.util.Collection;
import java.util.Collections;
import java.util.HashMap;
@@ -26,12 +32,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-import org.apache.solr.common.SolrException;
-import org.apache.solr.common.SolrException.ErrorCode;
-import org.noggit.JSONWriter;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
* Immutable state of the cloud. Normally you can get the state by using
* {@link ZkStateReader#getClusterState()}.
@@ -45,18 +45,6 @@ public class ClusterState implements JSO
private final Map<String, CollectionRef> collectionStates;
private Set<String> liveNodes;
-
- /**
- * Use this constr when ClusterState is meant for publication.
- *
- * hashCode and equals will only depend on liveNodes and not clusterStateVersion.
- */
- @Deprecated
- public ClusterState(Set<String> liveNodes,
- Map<String, DocCollection> collectionStates) {
- this(null, liveNodes, collectionStates);
- }
-
/**
* Use this constr when ClusterState is meant for consumption.
*/
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/cloud/ImplicitDocRouter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/cloud/ImplicitDocRouter.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/cloud/ImplicitDocRouter.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/cloud/ImplicitDocRouter.java Wed Jan 21 15:20:18 2015
@@ -31,9 +31,9 @@ import static org.apache.solr.common.par
/** This document router is for custom sharding
*/
public class ImplicitDocRouter extends DocRouter {
+
public static final String NAME = "implicit";
-// @Deprecated
-// public static final String DEFAULT_SHARD_PARAM = "_shard_";
+
private static Logger log = LoggerFactory
.getLogger(ImplicitDocRouter.class);
@@ -49,7 +49,6 @@ public class ImplicitDocRouter extends D
}
if(shard == null) {
Object o = sdoc.getFieldValue(_ROUTE_);
- if (o == null) o = sdoc.getFieldValue("_shard_");//deprecated . for backcompat remove later
if (o != null) {
shard = o.toString();
}
@@ -58,7 +57,6 @@ public class ImplicitDocRouter extends D
if (shard == null) {
shard = params.get(_ROUTE_);
- if(shard == null) shard =params.get("_shard_"); //deperecated for back compat
}
if (shard != null) {
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/AppendedSolrParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/AppendedSolrParams.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/AppendedSolrParams.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/AppendedSolrParams.java Wed Jan 21 15:20:18 2015
@@ -24,11 +24,11 @@ package org.apache.solr.common.params;
*/
public class AppendedSolrParams extends DefaultSolrParams {
- /**
- * @deprecated (3.6) Use {@link SolrParams#wrapAppended(SolrParams, SolrParams)} instead.
- */
- @Deprecated
- public AppendedSolrParams(SolrParams main, SolrParams extra) {
+ public static AppendedSolrParams wrapAppended(SolrParams params, SolrParams extra) {
+ return new AppendedSolrParams(params, extra);
+ }
+
+ private AppendedSolrParams(SolrParams main, SolrParams extra) {
super(main, extra);
}
Modified: lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/DefaultSolrParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/DefaultSolrParams.java?rev=1653555&r1=1653554&r2=1653555&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/DefaultSolrParams.java (original)
+++ lucene/dev/branches/branch_5x/solr/solrj/src/java/org/apache/solr/common/params/DefaultSolrParams.java Wed Jan 21 15:20:18 2015
@@ -24,14 +24,11 @@ import java.util.LinkedHashSet;
*
*/
public class DefaultSolrParams extends SolrParams {
+
protected final SolrParams params;
protected final SolrParams defaults;
- /**
- * @deprecated (3.6) Use {@link SolrParams#wrapDefaults(SolrParams, SolrParams)} instead.
- */
- @Deprecated
- public DefaultSolrParams(SolrParams params, SolrParams defaults) {
+ protected DefaultSolrParams(SolrParams params, SolrParams defaults) {
assert params != null && defaults != null;
this.params = params;
this.defaults = defaults;