You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2020/11/10 08:23:02 UTC
[lucene-solr] branch master updated (849a28e -> bac4309)
This is an automated email from the ASF dual-hosted git repository.
jpountz pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 849a28e LUCENE-9536: Correct the OrdinalMap optimization. (#2070)
new 514c363 LUCENE-9322: Move Solr to Lucene90Codec.
new fd98f67 Remove unused imports.
new bac4309 SOLR-14749: Use h2 instead of h3 so that the javadoc tool doesn't complain about out-or-sequence headers.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../lucene/backward_codecs/lucene87/Lucene87Codec.java | 14 +-------------
.../lucene50/Lucene50RWStoredFieldsFormat.java | 1 -
.../lucene/backward_codecs/lucene50/TestForUtil.java | 1 -
.../backward_codecs/lucene60/Lucene60PointsWriter.java | 2 --
.../lucene70/Lucene70RWSegmentInfoFormat.java | 1 -
.../cluster/events/impl/DefaultClusterEventProducer.java | 2 +-
.../src/java/org/apache/solr/core/SchemaCodecFactory.java | 4 ++--
.../apache/solr/common/cloud/TestZkMaintenanceUtils.java | 2 --
8 files changed, 4 insertions(+), 23 deletions(-)
[lucene-solr] 03/03: SOLR-14749: Use h2 instead of h3 so that the
javadoc tool doesn't complain about out-or-sequence headers.
Posted by jp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jpountz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit bac43093265c56996d35f2d5d9f93c4323a7b7e5
Author: Adrien Grand <jp...@gmail.com>
AuthorDate: Tue Nov 10 09:09:20 2020 +0100
SOLR-14749: Use h2 instead of h3 so that the javadoc tool doesn't complain about out-or-sequence headers.
---
.../apache/solr/cluster/events/impl/DefaultClusterEventProducer.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/solr/core/src/java/org/apache/solr/cluster/events/impl/DefaultClusterEventProducer.java b/solr/core/src/java/org/apache/solr/cluster/events/impl/DefaultClusterEventProducer.java
index e24fb40..b91ffef 100644
--- a/solr/core/src/java/org/apache/solr/cluster/events/impl/DefaultClusterEventProducer.java
+++ b/solr/core/src/java/org/apache/solr/cluster/events/impl/DefaultClusterEventProducer.java
@@ -43,7 +43,7 @@ import org.slf4j.LoggerFactory;
/**
* Implementation of {@link ClusterEventProducer}.
- * <h3>Implementation notes</h3>
+ * <h2>Implementation notes</h2>
* <p>For each cluster event relevant listeners are always invoked sequentially
* (not in parallel) and in arbitrary order. This means that if any listener blocks the
* processing other listeners may be invoked much later or not at all.</p>
[lucene-solr] 01/03: LUCENE-9322: Move Solr to Lucene90Codec.
Posted by jp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jpountz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 514c363f1d82b801234b16ef16804f08da86dc7a
Author: Adrien Grand <jp...@gmail.com>
AuthorDate: Mon Nov 9 19:37:03 2020 +0100
LUCENE-9322: Move Solr to Lucene90Codec.
And drop configurability of Lucene87Codec since it shouldn't be used for writing anymore.
---
.../lucene/backward_codecs/lucene87/Lucene87Codec.java | 14 +-------------
.../src/java/org/apache/solr/core/SchemaCodecFactory.java | 4 ++--
2 files changed, 3 insertions(+), 15 deletions(-)
diff --git a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene87/Lucene87Codec.java b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene87/Lucene87Codec.java
index 13bd32f..857f4e4 100644
--- a/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene87/Lucene87Codec.java
+++ b/lucene/backward-codecs/src/java/org/apache/lucene/backward_codecs/lucene87/Lucene87Codec.java
@@ -17,8 +17,6 @@
package org.apache.lucene.backward_codecs.lucene87;
-import java.util.Objects;
-
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.CompoundFormat;
import org.apache.lucene.codecs.DocValuesFormat;
@@ -84,18 +82,8 @@ public class Lucene87Codec extends Codec {
* Instantiates a new codec.
*/
public Lucene87Codec() {
- this(Lucene87StoredFieldsFormat.Mode.BEST_SPEED);
- }
-
- /**
- * Instantiates a new codec, specifying the stored fields compression
- * mode to use.
- * @param mode stored fields compression mode to use for newly
- * flushed/merged segments.
- */
- public Lucene87Codec(Lucene87StoredFieldsFormat.Mode mode) {
super("Lucene87");
- this.storedFieldsFormat = new Lucene87StoredFieldsFormat(Objects.requireNonNull(mode));
+ this.storedFieldsFormat = new Lucene87StoredFieldsFormat();
this.defaultFormat = new Lucene84PostingsFormat();
}
diff --git a/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java b/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java
index ce0df02..dedbf8f 100644
--- a/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java
+++ b/solr/core/src/java/org/apache/solr/core/SchemaCodecFactory.java
@@ -20,11 +20,11 @@ import java.lang.invoke.MethodHandles;
import java.util.Arrays;
import java.util.Locale;
-import org.apache.lucene.backward_codecs.lucene87.Lucene87Codec;
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.codecs.DocValuesFormat;
import org.apache.lucene.codecs.PostingsFormat;
import org.apache.lucene.codecs.lucene87.Lucene87StoredFieldsFormat.Mode;
+import org.apache.lucene.codecs.lucene90.Lucene90Codec;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.util.NamedList;
@@ -92,7 +92,7 @@ public class SchemaCodecFactory extends CodecFactory implements SolrCoreAware {
compressionMode = SOLR_DEFAULT_COMPRESSION_MODE;
log.debug("Using default compressionMode: {}", compressionMode);
}
- codec = new Lucene87Codec(compressionMode) {
+ codec = new Lucene90Codec(compressionMode) {
@Override
public PostingsFormat getPostingsFormatForField(String field) {
final SchemaField schemaField = core.getLatestSchema().getFieldOrNull(field);
[lucene-solr] 02/03: Remove unused imports.
Posted by jp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jpountz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit fd98f677b9b82749ba75100ca4f5a54a572fcb9c
Author: Adrien Grand <jp...@gmail.com>
AuthorDate: Mon Nov 9 19:38:01 2020 +0100
Remove unused imports.
---
.../lucene/backward_codecs/lucene50/Lucene50RWStoredFieldsFormat.java | 1 -
.../test/org/apache/lucene/backward_codecs/lucene50/TestForUtil.java | 1 -
.../apache/lucene/backward_codecs/lucene60/Lucene60PointsWriter.java | 2 --
.../lucene/backward_codecs/lucene70/Lucene70RWSegmentInfoFormat.java | 1 -
.../src/test/org/apache/solr/common/cloud/TestZkMaintenanceUtils.java | 2 --
5 files changed, 7 deletions(-)
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/Lucene50RWStoredFieldsFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/Lucene50RWStoredFieldsFormat.java
index c6ecaa8..c625dc8 100644
--- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/Lucene50RWStoredFieldsFormat.java
+++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/Lucene50RWStoredFieldsFormat.java
@@ -18,7 +18,6 @@ package org.apache.lucene.backward_codecs.lucene50;
import java.io.IOException;
-import org.apache.lucene.backward_codecs.lucene50.Lucene50StoredFieldsFormat;
import org.apache.lucene.codecs.StoredFieldsWriter;
import org.apache.lucene.index.SegmentInfo;
import org.apache.lucene.store.Directory;
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestForUtil.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestForUtil.java
index e550a8c..a79216d 100644
--- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestForUtil.java
+++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene50/TestForUtil.java
@@ -23,7 +23,6 @@ import static org.apache.lucene.backward_codecs.lucene50.ForUtil.MAX_ENCODED_SIZ
import java.io.IOException;
-import org.apache.lucene.backward_codecs.lucene50.ForUtil;
import org.apache.lucene.store.ByteBuffersDirectory;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene60/Lucene60PointsWriter.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene60/Lucene60PointsWriter.java
index 072b5e3..2ca4f11 100644
--- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene60/Lucene60PointsWriter.java
+++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene60/Lucene60PointsWriter.java
@@ -24,8 +24,6 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.lucene.backward_codecs.lucene60.Lucene60PointsFormat;
-import org.apache.lucene.backward_codecs.lucene60.Lucene60PointsReader;
import org.apache.lucene.codecs.CodecUtil;
import org.apache.lucene.codecs.MutablePointValues;
import org.apache.lucene.codecs.PointsReader;
diff --git a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene70/Lucene70RWSegmentInfoFormat.java b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene70/Lucene70RWSegmentInfoFormat.java
index 21b10b9..90ccf4a 100644
--- a/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene70/Lucene70RWSegmentInfoFormat.java
+++ b/lucene/backward-codecs/src/test/org/apache/lucene/backward_codecs/lucene70/Lucene70RWSegmentInfoFormat.java
@@ -20,7 +20,6 @@ package org.apache.lucene.backward_codecs.lucene70;
import java.io.IOException;
import java.util.Set;
-import org.apache.lucene.backward_codecs.lucene70.Lucene70SegmentInfoFormat;
import org.apache.lucene.codecs.CodecUtil;
import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.SegmentInfo;
diff --git a/solr/solrj/src/test/org/apache/solr/common/cloud/TestZkMaintenanceUtils.java b/solr/solrj/src/test/org/apache/solr/common/cloud/TestZkMaintenanceUtils.java
index 3f6b6d7..661844a 100644
--- a/solr/solrj/src/test/org/apache/solr/common/cloud/TestZkMaintenanceUtils.java
+++ b/solr/solrj/src/test/org/apache/solr/common/cloud/TestZkMaintenanceUtils.java
@@ -28,8 +28,6 @@ import org.apache.commons.io.FileUtils;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.SolrServerException;
import org.apache.solr.cloud.ZkTestServer;
-import org.apache.solr.common.cloud.SolrZkClient;
-import org.apache.solr.common.cloud.ZkMaintenanceUtils;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
import org.junit.AfterClass;