You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by gu...@apache.org on 2019/03/04 17:32:00 UTC
[lucene-solr] 01/10: Merge branch 'master' of
https://gitbox.apache.org/repos/asf/lucene-solr into solr-13131
This is an automated email from the ASF dual-hosted git repository.
gus pushed a commit to branch solr-13131
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit d87e0c2039d14739559eb0ff5b9ae12c9668c58c
Merge: 8bff5b4 8c34da8
Author: Gus Heck <gu...@apache.org>
AuthorDate: Sat Mar 2 12:05:39 2019 -0500
Merge branch 'master' of https://gitbox.apache.org/repos/asf/lucene-solr into solr-13131
lucene/CHANGES.txt | 18 +
.../codecs/simpletext/SimpleTextBKDWriter.java | 73 +--
.../codecs/blocktree/BlockTreeTermsReader.java | 9 +-
.../lucene/codecs/blocktree/FieldReader.java | 11 +-
.../apache/lucene/store/ByteBufferIndexInput.java | 2 +-
.../apache/lucene/util/bkd/BKDRadixSelector.java | 336 +++++++++----
.../java/org/apache/lucene/util/bkd/BKDWriter.java | 62 +--
.../apache/lucene/util/bkd/HeapPointReader.java | 68 ++-
.../apache/lucene/util/bkd/HeapPointWriter.java | 124 ++---
.../apache/lucene/util/bkd/OfflinePointReader.java | 66 ++-
.../apache/lucene/util/bkd/OfflinePointWriter.java | 22 +-
.../org/apache/lucene/util/bkd/PointReader.java | 11 +-
.../util/bkd/{PointReader.java => PointValue.java} | 26 +-
.../org/apache/lucene/util/bkd/PointWriter.java | 9 +-
.../src/java/org/apache/lucene/util/fst/FST.java | 41 +-
.../java/org/apache/lucene/util/fst/FSTStore.java | 25 +-
.../apache/lucene/util/fst/OffHeapFSTStore.java | 69 +++
.../org/apache/lucene/util/fst/OnHeapFSTStore.java | 97 ++++
.../lucene/util/fst/ReverseRandomAccessReader.java | 63 +++
.../util/graph/GraphTokenStreamFiniteStrings.java | 17 +-
.../lucene/util/bkd/TestBKDRadixSelector.java | 76 +--
.../graph/TestGraphTokenStreamFiniteStrings.java | 48 +-
.../taxonomy/TestTaxonomyFacetSumValueSource.java | 6 +-
lucene/ivy-versions.properties | 16 +-
.../apache/lucene/search/intervals/Intervals.java | 12 +
.../apache/lucene/document/TestLatLonShape.java | 532 ---------------------
...tLonShape.java => TestLatLonShapeEncoding.java} | 381 +--------------
.../search/intervals/TestSimplifications.java | 49 ++
.../apache/lucene/spatial3d/geom/GeoPathTest.java | 39 +-
solr/CHANGES.txt | 37 ++
...geIdentifierUpdateProcessorFactoryTestCase.java | 26 +-
solr/core/ivy.xml | 1 +
.../cloud/api/collections/CreateCollectionCmd.java | 2 +-
.../OverseerCollectionMessageHandler.java | 56 ++-
.../solr/cloud/api/collections/RestoreCmd.java | 41 +-
.../cloud/api/collections/TimeRoutedAlias.java | 3 +-
.../solr/handler/admin/CoreAdminHandler.java | 3 +-
.../solr/handler/component/HighlightComponent.java | 4 +-
.../solr/handler/component/StatsValuesFactory.java | 3 +-
.../apache/solr/handler/export/ExportWriter.java | 138 +++---
.../org/apache/solr/search/FunctionQParser.java | 60 ++-
.../security/DelegationTokenKerberosFilter.java | 15 +-
.../org/apache/solr/security/HadoopAuthFilter.java | 17 +-
.../org/apache/solr/update/DocumentBuilder.java | 6 +-
.../apache/solr/update/StreamingSolrClients.java | 2 +-
.../org/apache/solr/util/StartupLoggingUtils.java | 18 +
solr/core/src/test-files/log4j2.xml | 45 +-
.../collection1/conf/schema-sortingresponse.xml | 25 +-
.../configsets/cloud-managed/conf/managed-schema | 12 +
.../cloud/AsyncCallRequestStatusResponseTest.java | 26 +-
.../solr/cloud/CreateCollectionCleanupTest.java | 37 +-
.../apache/solr/cloud/DocValuesNotIndexedTest.java | 44 +-
.../org/apache/solr/cloud/TestPullReplica.java | 2 +-
.../org/apache/solr/cloud/TestTlogReplica.java | 27 +-
.../AbstractCloudBackupRestoreTestCase.java | 73 ++-
.../collections/TestHdfsCloudBackupRestore.java | 6 +-
.../collections/TestLocalFSCloudBackupRestore.java | 6 +-
.../apache/solr/cloud/rule/ImplicitSnitchTest.java | 3 +-
.../apache/solr/handler/RequestLoggingTest.java | 29 +-
.../TestDistributedStatsComponentCardinality.java | 3 +-
.../solr/handler/export/TestExportWriter.java | 32 +-
.../org/apache/solr/logging/TestLogWatcher.java | 82 ++--
.../test/org/apache/solr/schema/UUIDFieldTest.java | 4 +-
.../search/SignificantTermsQParserPluginTest.java | 4 +-
.../solr/search/function/TestFunctionQuery.java | 47 ++
.../apache/solr/util/TestObjectReleaseTracker.java | 3 +-
.../org/apache/solr/util/TestSystemIdResolver.java | 3 +-
solr/licenses/avatica-core-1.10.0.jar.sha1 | 1 -
solr/licenses/avatica-core-1.13.0.jar.sha1 | 1 +
solr/licenses/calcite-core-1.13.0.jar.sha1 | 1 -
solr/licenses/calcite-core-1.18.0.jar.sha1 | 1 +
solr/licenses/calcite-linq4j-1.13.0.jar.sha1 | 1 -
solr/licenses/calcite-linq4j-1.18.0.jar.sha1 | 1 +
solr/licenses/commons-compiler-2.7.6.jar.sha1 | 1 -
solr/licenses/commons-compiler-3.0.9.jar.sha1 | 1 +
solr/licenses/curator-client-2.13.0.jar.sha1 | 1 +
solr/licenses/curator-client-2.8.0.jar.sha1 | 1 -
solr/licenses/curator-framework-2.13.0.jar.sha1 | 1 +
solr/licenses/curator-framework-2.8.0.jar.sha1 | 1 -
solr/licenses/curator-recipes-2.13.0.jar.sha1 | 1 +
solr/licenses/curator-recipes-2.8.0.jar.sha1 | 1 -
solr/licenses/disruptor-3.4.0.jar.sha1 | 1 -
solr/licenses/disruptor-3.4.2.jar.sha1 | 1 +
solr/licenses/guava-14.0.1.jar.sha1 | 1 -
solr/licenses/guava-25.1-jre.jar.sha1 | 1 +
solr/licenses/janino-2.7.6.jar.sha1 | 1 -
solr/licenses/janino-3.0.9.jar.sha1 | 1 +
solr/licenses/json-path-2.4.0.jar.sha1 | 1 +
solr/licenses/json-path-LICENSE-ASL.txt | 202 ++++++++
solr/licenses/json-path-NOTICE.txt | 0
solr/licenses/log4j-1.2-api-2.11.0.jar.sha1 | 1 -
solr/licenses/log4j-1.2-api-2.11.2.jar.sha1 | 1 +
solr/licenses/log4j-api-2.11.0.jar.sha1 | 1 -
solr/licenses/log4j-api-2.11.2.jar.sha1 | 1 +
solr/licenses/log4j-core-2.11.0.jar.sha1 | 1 -
solr/licenses/log4j-core-2.11.2.jar.sha1 | 1 +
solr/licenses/log4j-slf4j-impl-2.11.0.jar.sha1 | 1 -
solr/licenses/log4j-slf4j-impl-2.11.2.jar.sha1 | 1 +
solr/licenses/log4j-web-2.11.2.jar.sha1 | 1 +
solr/licenses/log4j-web-LICENSE-ASL.txt | 202 ++++++++
solr/licenses/log4j-web-NOTICE.txt | 17 +
solr/server/ivy.xml | 1 +
solr/server/resources/log4j2-console.xml | 38 +-
solr/server/resources/log4j2.xml | 68 ++-
solr/solr-ref-guide/src/solr-upgrade-notes.adoc | 10 +
.../src/solrcloud-autoscaling-triggers.adoc | 2 +-
.../org/apache/solr/common/SolrInputField.java | 61 ++-
.../common/util/ByteArrayUtf8CharSequence.java | 5 +
.../org/apache/solr/common/util/JavaBinCodec.java | 2 +-
.../src/java/org/apache/solr/SolrTestCaseJ4.java | 2 +
.../solr/cloud/AbstractFullDistribZkTestBase.java | 2 +
111 files changed, 2222 insertions(+), 1673 deletions(-)
diff --cc solr/core/src/java/org/apache/solr/cloud/api/collections/TimeRoutedAlias.java
index dcd4a37,2da81da..4951003
--- a/solr/core/src/java/org/apache/solr/cloud/api/collections/TimeRoutedAlias.java
+++ b/solr/core/src/java/org/apache/solr/cloud/api/collections/TimeRoutedAlias.java
@@@ -34,12 -31,12 +34,13 @@@ import java.util.HashSet
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.Set;
import java.util.TimeZone;
import java.util.concurrent.TimeUnit;
-import java.util.function.Predicate;
-import java.util.function.Supplier;
+import com.google.common.base.Objects;
+import org.apache.solr.cloud.ZkController;
+ import com.google.common.base.MoreObjects;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.cloud.Aliases;
import org.apache.solr.common.params.CommonParams;