dsmiley commented on code in PR #2477:
URL: https://github.com/apache/solr/pull/2477#discussion_r1613839800
##########
solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java:
##########
@@ -285,6 +294,21 @@ public IndexWriterConfig toIndexWriterConfig(SolrCore
core) throws IOException {
iwc.setMergedSegmentWarmer(warmer);
}
+ if (segmentSort != null) {
+ try {
+ SegmentSort sortEnum = SegmentSort.valueOf(segmentSort);
+ LeafSorter sorter = new SegmentTimeLeafSorter(sortEnum);
+ Comparator<LeafReader> leafSorter = sorter.getLeafSorter();
+ if (leafSorter != null) {
+ iwc.setLeafSorter(leafSorter);
+ if (log.isDebugEnabled()) {
+ log.debug("Segment sort enabled: {}", sorter.toString());
Review Comment:
no toString() needed... then you could drop the isDebugEnabled as well
(AFAIK).
##########
solr/core/src/java/org/apache/solr/update/SolrIndexConfig.java:
##########
@@ -285,6 +294,21 @@ public IndexWriterConfig toIndexWriterConfig(SolrCore
core) throws IOException {
iwc.setMergedSegmentWarmer(warmer);
}
+ if (segmentSort != null) {
+ try {
+ SegmentSort sortEnum = SegmentSort.valueOf(segmentSort);
+ LeafSorter sorter = new SegmentTimeLeafSorter(sortEnum);
+ Comparator<LeafReader> leafSorter = sorter.getLeafSorter();
+ if (leafSorter != null) {
+ iwc.setLeafSorter(leafSorter);
+ if (log.isDebugEnabled()) {
+ log.debug("Segment sort enabled: {}", sorter.toString());
+ }
+ }
+ } catch (IllegalArgumentException e) {
+ log.error("Invalid segmentSort option: ", segmentSort);
Review Comment:
normally we fail hard on wrong configuration
##########
solr/core/src/java/org/apache/solr/update/LeafSorter.java:
##########
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.solr.update;
+
+import java.lang.invoke.MethodHandles;
+import java.util.Comparator;
+import org.apache.lucene.index.LeafReader;
+import org.apache.lucene.index.SegmentReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public interface LeafSorter {
+
+ Comparator<LeafReader> getLeafSorter();
+}
+
+final class SegmentTimeLeafSorter implements LeafSorter {
Review Comment:
we don't put two classes/interfaces in the same source file even though Java
supports it
##########
solr/core/src/java/org/apache/solr/update/LeafSorter.java:
##########
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.solr.update;
+
+import java.lang.invoke.MethodHandles;
+import java.util.Comparator;
+import org.apache.lucene.index.LeafReader;
+import org.apache.lucene.index.SegmentReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public interface LeafSorter {
+
+ Comparator<LeafReader> getLeafSorter();
+}
+
+final class SegmentTimeLeafSorter implements LeafSorter {
+ private static final Logger log =
LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
+ private static final String TIME_FIELD = "timestamp";
+ private static final SegmentSort DEFAULT_SORT_OPTIONS = SegmentSort.NONE;
+
+ private SegmentSort sortOptions;
+ private Comparator<LeafReader> leafSorter;
+
+ public SegmentTimeLeafSorter() {
+ this(DEFAULT_SORT_OPTIONS);
+ }
+
+ public SegmentTimeLeafSorter(SegmentSort sortOptions) {
+ this.sortOptions = sortOptions;
+ }
+
+ @Override
+ public Comparator<LeafReader> getLeafSorter() {
+ if (leafSorter == null) {
+ if (SegmentSort.NONE == sortOptions) {
+ return null;
+ }
+ boolean ascSort = SegmentSort.TIME_ASC == sortOptions;
+ long missingValue = ascSort ? Long.MAX_VALUE : Long.MIN_VALUE;
+ leafSorter =
+ Comparator.comparingLong(
+ r -> {
+ try {
+ return Long.parseLong(
+ ((SegmentReader)
r).getSegmentInfo().info.getDiagnostics().get(TIME_FIELD));
+ } catch (Exception e) {
+ log.error("Error getting time stamp for SegmentReader", e);
+ return missingValue;
+ }
+ });
+ return ascSort ? leafSorter : leafSorter.reversed();
+ }
+ ;
+ return leafSorter;
+ }
+
+ public SegmentSort getSortOptions() {
+ return sortOptions;
+ }
+
+ @Override
+ public String toString() {
+ StringBuilder sb = new StringBuilder(50);
+ sb.append("SegmentTimeLeafSorter{");
+ sb.append(sortOptions.toString());
+ sb.append('}');
Review Comment:
manual StringBuilder like this adds verbosity for no benefit
##########
solr/core/src/java/org/apache/solr/update/LeafSorter.java:
##########
@@ -0,0 +1,85 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.solr.update;
+
+import java.lang.invoke.MethodHandles;
+import java.util.Comparator;
+import org.apache.lucene.index.LeafReader;
+import org.apache.lucene.index.SegmentReader;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public interface LeafSorter {
+
+ Comparator<LeafReader> getLeafSorter();
Review Comment:
looks weird, LeafSorter has a getLeafSorter that does not actually return a
LeafSorter?
Maybe the interface should be renamed LeafSorterSupplier
##########
solr/core/src/test-files/solr/collection1/conf/solrconfig-segmentsort.xml:
##########
Review Comment:
Can this be added to an existing config for SolrIndexConfigTest? If not its
okay; I'm just trying to reduce test config files to maintain.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@solr.apache.org
For additional commands, e-mail: issues-h...@solr.apache.org
