You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2017/02/13 15:58:42 UTC
[1/2] lucene-solr:branch_6x: SOLR-8029: disabled easymock for java9
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 00449959d -> 4b3ab9040
SOLR-8029: disabled easymock for java9
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/8b5dec52
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8b5dec52
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8b5dec52
Branch: refs/heads/branch_6x
Commit: 8b5dec52f5d331ad3febd599016f8dd85480e628
Parents: d71ec07
Author: Noble Paul <no...@gmail.com>
Authored: Mon Feb 13 07:28:16 2017 -0800
Committer: Noble Paul <no...@gmail.com>
Committed: Mon Feb 13 07:57:29 2017 -0800
----------------------------------------------------------------------
.../test/org/apache/solr/handler/admin/TestCoreAdminApis.java | 7 +++++++
1 file changed, 7 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8b5dec52/solr/core/src/test/org/apache/solr/handler/admin/TestCoreAdminApis.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/TestCoreAdminApis.java b/solr/core/src/test/org/apache/solr/handler/admin/TestCoreAdminApis.java
index f263f5e..2df88dc 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/TestCoreAdminApis.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/TestCoreAdminApis.java
@@ -24,12 +24,14 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
+import org.apache.lucene.util.Constants;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrRequest;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.api.Api;
import org.apache.solr.api.ApiBag;
import org.easymock.EasyMock;
+import org.junit.BeforeClass;
import static org.apache.solr.common.util.Utils.fromJSONString;
import static org.easymock.EasyMock.anyBoolean;
@@ -38,6 +40,11 @@ import static org.easymock.EasyMock.getCurrentArguments;
public class TestCoreAdminApis extends SolrTestCaseJ4 {
+ @BeforeClass
+ public static void beforeClass() throws Exception {
+ assumeFalse("SOLR-9893: EasyMock does not work with Java 9", Constants.JRE_IS_MINIMUM_JAVA9);
+ }
+
public void testCalls() throws Exception {
Map<String, Object[]> calls = new HashMap<>();
CoreContainer mockCC = getCoreContainerMock(calls, new HashMap<>());
[2/2] lucene-solr:branch_6x: Merge remote-tracking branch
'origin/branch_6x' into branch_6x
Posted by no...@apache.org.
Merge remote-tracking branch 'origin/branch_6x' into branch_6x
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/4b3ab904
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/4b3ab904
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/4b3ab904
Branch: refs/heads/branch_6x
Commit: 4b3ab9040b3e071f91d3409eee4e8204bc13015a
Parents: 8b5dec5 0044995
Author: Noble Paul <no...@gmail.com>
Authored: Mon Feb 13 07:58:38 2017 -0800
Committer: Noble Paul <no...@gmail.com>
Committed: Mon Feb 13 07:58:38 2017 -0800
----------------------------------------------------------------------
dev-tools/doap/lucene.rdf | 9 +
dev-tools/doap/solr.rdf | 9 +
lucene/CHANGES.txt | 40 +-
.../analysis/cn/smart/hhmm/WordDictionary.java | 1 -
.../document/SortedSetDocValuesRangeQuery.java | 5 +-
.../java/org/apache/lucene/index/FieldInfo.java | 3 +-
.../apache/lucene/index/FilterCodecReader.java | 24 ++
.../org/apache/lucene/index/PointValues.java | 3 +-
.../apache/lucene/index/SegmentCoreReaders.java | 7 +
.../org/apache/lucene/index/SegmentInfos.java | 6 +-
.../org/apache/lucene/util/QueryBuilder.java | 122 ++++--
.../java/org/apache/lucene/util/Version.java | 7 +
.../util/automaton/FiniteStringsIterator.java | 36 +-
.../org/apache/lucene/util/bkd/BKDReader.java | 19 +-
.../graph/GraphTokenStreamFiniteStrings.java | 212 +++++++---
.../lucene/index/TestFilterCodecReader.java | 49 +++
.../apache/lucene/index/TestIndexSorting.java | 3 +-
.../apache/lucene/util/TestQueryBuilder.java | 71 ++++
.../TestGraphTokenStreamFiniteStrings.java | 421 +++++++++++++++++--
.../apache/lucene/index/memory/MemoryIndex.java | 75 ++--
.../lucene/index/memory/TestMemoryIndex.java | 18 +-
.../function/valuesource/DoubleFieldSource.java | 7 +-
.../function/valuesource/FloatFieldSource.java | 8 +-
.../function/valuesource/IntFieldSource.java | 7 +-
.../function/valuesource/LongFieldSource.java | 8 +-
.../MultiValuedDoubleFieldSource.java | 78 ++++
.../MultiValuedFloatFieldSource.java | 78 ++++
.../valuesource/MultiValuedIntFieldSource.java | 78 ++++
.../valuesource/MultiValuedLongFieldSource.java | 78 ++++
.../queries/function/FunctionTestSetup.java | 58 +++
.../function/TestDocValuesFieldSources.java | 14 +-
.../queries/function/TestFieldScoreQuery.java | 26 ++
.../function/TestFunctionRangeQuery.java | 37 +-
.../queries/function/TestValueSources.java | 113 +++--
.../classic/TestMultiFieldQueryParser.java | 4 +-
.../queryparser/classic/TestQueryParser.java | 53 ++-
.../geopoint/document/GeoPointField.java | 7 +-
.../geopoint/document/GeoPointTokenStream.java | 2 +
.../geopoint/search/GeoPointDistanceQuery.java | 5 +-
.../search/GeoPointDistanceQueryImpl.java | 3 +-
.../geopoint/search/GeoPointInBBoxQuery.java | 3 +-
.../search/GeoPointInBBoxQueryImpl.java | 3 +-
.../geopoint/search/GeoPointInPolygonQuery.java | 3 +-
.../search/GeoPointInPolygonQueryImpl.java | 2 +
.../geopoint/search/GeoPointMultiTermQuery.java | 2 +
.../search/GeoPointNumericTermsEnum.java | 3 +-
.../search/GeoPointPrefixTermsEnum.java | 2 +
.../GeoPointTermQueryConstantScoreWrapper.java | 2 +
.../geopoint/search/GeoPointTermsEnum.java | 2 +
.../spatial/geopoint/search/package-info.java | 3 +-
.../index/BaseIndexFileFormatTestCase.java | 51 ++-
.../lucene/index/BasePointsFormatTestCase.java | 36 +-
solr/CHANGES.txt | 45 +-
.../util/valuesource/ConstDoubleSource.java | 3 +-
.../featureExamples/external_features.json | 6 +-
.../modelExamples/external_model.json | 4 +-
.../modelExamples/external_model2.json | 13 +
.../modelExamples/external_model_store.json | 13 -
.../solr/ltr/TestParallelWeightCreation.java | 24 +-
.../solr/ltr/TestSelectiveWeightCreation.java | 83 ++--
.../solr/ltr/feature/TestExternalFeatures.java | 32 +-
.../ltr/feature/TestFeatureLtrScoringModel.java | 71 ----
.../solr/ltr/feature/TestFeatureStore.java | 106 -----
.../ltr/store/rest/TestManagedFeatureStore.java | 119 +++++-
.../java/org/apache/solr/cloud/Overseer.java | 21 +-
.../org/apache/solr/cloud/ZkController.java | 5 +-
.../org/apache/solr/core/DirectoryFactory.java | 18 +-
.../solr/core/EphemeralDirectoryFactory.java | 8 +
.../apache/solr/core/HdfsDirectoryFactory.java | 23 +-
.../solr/core/MetricsDirectoryFactory.java | 4 +-
.../src/java/org/apache/solr/core/SolrCore.java | 85 ++--
.../org/apache/solr/handler/IndexFetcher.java | 97 +++--
.../org/apache/solr/handler/StreamHandler.java | 94 ++++-
.../solr/handler/component/FacetComponent.java | 8 +-
.../apache/solr/request/DocValuesFacets.java | 20 +-
.../request/PerSegmentSingleValuedFaceting.java | 14 +-
.../org/apache/solr/request/SimpleFacets.java | 114 +++--
.../solr/request/SubstringBytesRefFilter.java | 52 +++
.../solr/store/blockcache/BlockCache.java | 41 +-
.../store/blockcache/BlockCacheLocation.java | 4 +-
.../org/apache/solr/update/SolrCoreState.java | 6 +
.../apache/solr/update/UpdateShardHandler.java | 4 +-
.../conf/solrconfig-master-throttled.xml | 2 +-
.../apache/solr/cloud/CleanupOldIndexTest.java | 2 +
.../cloud/CollectionsAPIDistributedZkTest.java | 8 +-
.../solr/core/HdfsDirectoryFactoryTest.java | 2 +-
.../solr/handler/TestReplicationHandler.java | 82 ++--
.../solr/handler/admin/MBeansHandlerTest.java | 14 +-
.../apache/solr/request/SimpleFacetsTest.java | 172 +++++++-
.../request/SubstringBytesRefFilterTest.java | 51 +++
.../solr/store/blockcache/BlockCacheTest.java | 134 ++++++
.../solr/util/TestObjectReleaseTracker.java | 13 +-
.../solrj/io/eval/AbsoluteValueEvaluator.java | 60 +++
.../solr/client/solrj/io/eval/AddEvaluator.java | 61 +++
.../solr/client/solrj/io/eval/AndEvaluator.java | 90 ++++
.../client/solrj/io/eval/BooleanEvaluator.java | 86 ++++
.../client/solrj/io/eval/ComplexEvaluator.java | 99 +++++
.../solrj/io/eval/ConditionalEvaluator.java | 59 +++
.../client/solrj/io/eval/DivideEvaluator.java | 78 ++++
.../client/solrj/io/eval/EqualsEvaluator.java | 112 +++++
.../solrj/io/eval/ExclusiveOrEvaluator.java | 67 +++
.../client/solrj/io/eval/FieldEvaluator.java | 62 +++
.../io/eval/GreaterThanEqualToEvaluator.java | 99 +++++
.../solrj/io/eval/GreaterThanEvaluator.java | 99 +++++
.../solrj/io/eval/IfThenElseEvaluator.java | 62 +++
.../solrj/io/eval/LessThanEqualToEvaluator.java | 99 +++++
.../client/solrj/io/eval/LessThanEvaluator.java | 99 +++++
.../client/solrj/io/eval/MultiplyEvaluator.java | 62 +++
.../solr/client/solrj/io/eval/NotEvaluator.java | 62 +++
.../client/solrj/io/eval/NumberEvaluator.java | 79 ++++
.../solr/client/solrj/io/eval/OrEvaluator.java | 90 ++++
.../client/solrj/io/eval/RawValueEvaluator.java | 90 ++++
.../client/solrj/io/eval/SimpleEvaluator.java | 29 ++
.../client/solrj/io/eval/StreamEvaluator.java | 30 ++
.../client/solrj/io/eval/SubtractEvaluator.java | 61 +++
.../solr/client/solrj/io/eval/package-info.java | 21 +
.../solr/client/solrj/io/ops/AndOperation.java | 101 -----
.../client/solrj/io/ops/BooleanOperation.java | 26 --
.../client/solrj/io/ops/EqualsOperation.java | 70 ---
.../io/ops/GreaterThanEqualToOperation.java | 70 ---
.../solrj/io/ops/GreaterThanOperation.java | 70 ---
.../solr/client/solrj/io/ops/LeafOperation.java | 67 ---
.../solrj/io/ops/LessThanEqualToOperation.java | 70 ---
.../client/solrj/io/ops/LessThanOperation.java | 70 ---
.../solr/client/solrj/io/ops/NotOperation.java | 87 ----
.../solr/client/solrj/io/ops/OrOperation.java | 71 ----
.../client/solrj/io/stream/HavingStream.java | 46 +-
.../client/solrj/io/stream/SelectStream.java | 71 +++-
.../solrj/io/stream/expr/Explanation.java | 1 +
.../solrj/io/stream/expr/StreamFactory.java | 34 ++
.../apache/solr/common/params/FacetParams.java | 5 +
.../solr/common/util/ObjectReleaseTracker.java | 22 -
.../io/stream/SelectWithEvaluatorsTest.java | 259 ++++++++++++
.../solrj/io/stream/StreamExpressionTest.java | 55 +--
.../stream/eval/AbsoluteValueEvaluatorTest.java | 96 +++++
.../solrj/io/stream/eval/AddEvaluatorTest.java | 336 +++++++++++++++
.../solrj/io/stream/eval/AndEvaluatorTest.java | 123 ++++++
.../io/stream/eval/CompoundEvaluatorTest.java | 85 ++++
.../io/stream/eval/DivideEvaluatorTest.java | 164 ++++++++
.../io/stream/eval/EqualsEvaluatorTest.java | 263 ++++++++++++
.../stream/eval/ExclusiveOrEvaluatorTest.java | 123 ++++++
.../eval/GreaterThanEqualToEvaluatorTest.java | 249 +++++++++++
.../stream/eval/GreaterThanEvaluatorTest.java | 249 +++++++++++
.../eval/LessThanEqualToEvaluatorTest.java | 256 +++++++++++
.../io/stream/eval/LessThanEvaluatorTest.java | 249 +++++++++++
.../io/stream/eval/MultiplyEvaluatorTest.java | 179 ++++++++
.../solrj/io/stream/eval/NotEvaluatorTest.java | 80 ++++
.../solrj/io/stream/eval/OrEvaluatorTest.java | 123 ++++++
.../io/stream/eval/RawValueEvaluatorTest.java | 69 +++
.../io/stream/eval/SubtractEvaluatorTest.java | 188 +++++++++
.../java/org/apache/solr/SolrTestCaseJ4.java | 63 ++-
151 files changed, 7780 insertions(+), 1599 deletions(-)
----------------------------------------------------------------------