You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/02/08 18:05:36 UTC
[1/2] lucene-solr:master: SOLR-10083: Fix instanceof check in
ConstDoubleSource.equals (Pushkar Raste via Christine Poerschke)
Repository: lucene-solr
Updated Branches:
refs/heads/master 0e0821fdc -> ae68e6ceb
SOLR-10083: Fix instanceof check in ConstDoubleSource.equals (Pushkar Raste via Christine Poerschke)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c20853bf
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c20853bf
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c20853bf
Branch: refs/heads/master
Commit: c20853bf098a7daaf243997241b633f9997950c5
Parents: 0e0821f
Author: Christine Poerschke <cp...@apache.org>
Authored: Wed Feb 8 17:18:02 2017 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Wed Feb 8 17:18:02 2017 +0000
----------------------------------------------------------------------
solr/CHANGES.txt | 2 ++
.../apache/solr/analytics/util/valuesource/ConstDoubleSource.java | 3 +--
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c20853bf/solr/CHANGES.txt
----------------------------------------------------------------------
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index 129d802..d6d9724 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -144,6 +144,8 @@ Bug Fixes
* SOLR-10049: Collection deletion leaves behind the snapshot metadata (Hrishikesh Gadre via yonik)
+* SOLR-10083: Fix instanceof check in ConstDoubleSource.equals (Pushkar Raste via Christine Poerschke)
+
Optimizations
----------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c20853bf/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstDoubleSource.java
----------------------------------------------------------------------
diff --git a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstDoubleSource.java b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstDoubleSource.java
index 80e8ed1..e0ebad6 100644
--- a/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstDoubleSource.java
+++ b/solr/contrib/analytics/src/java/org/apache/solr/analytics/util/valuesource/ConstDoubleSource.java
@@ -23,7 +23,6 @@ import org.apache.lucene.index.LeafReaderContext;
import org.apache.lucene.queries.function.FunctionValues;
import org.apache.lucene.queries.function.docvalues.DoubleDocValues;
import org.apache.lucene.queries.function.valuesource.ConstNumberSource;
-import org.apache.lucene.queries.function.valuesource.ConstValueSource;
import org.apache.solr.analytics.util.AnalyticsParams;
/**
@@ -67,7 +66,7 @@ public class ConstDoubleSource extends ConstNumberSource {
@Override
public boolean equals(Object o) {
- if (!(o instanceof ConstValueSource)) return false;
+ if (!(o instanceof ConstDoubleSource)) return false;
ConstDoubleSource other = (ConstDoubleSource)o;
return this.constant == other.constant;
}
[2/2] lucene-solr:master: LUCENE-7676: Fixed FilterCodecReader to
override more super-class methods. Also added TestFilterCodecReader class.
Posted by cp...@apache.org.
LUCENE-7676: Fixed FilterCodecReader to override more super-class methods. Also added TestFilterCodecReader class.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/ae68e6ce
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/ae68e6ce
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/ae68e6ce
Branch: refs/heads/master
Commit: ae68e6cebc363e51cd68aee83830b5cb427b4799
Parents: c20853b
Author: Christine Poerschke <cp...@apache.org>
Authored: Wed Feb 8 17:19:06 2017 +0000
Committer: Christine Poerschke <cp...@apache.org>
Committed: Wed Feb 8 17:19:06 2017 +0000
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 ++
.../apache/lucene/index/FilterCodecReader.java | 24 ++++++++++
.../lucene/index/TestFilterCodecReader.java | 49 ++++++++++++++++++++
3 files changed, 76 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ae68e6ce/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 6f7837e..260ac2d 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -112,6 +112,9 @@ Bug Fixes
* LUCENE-7630: Fix (Edge)NGramTokenFilter to no longer drop payloads
and preserve all attributes. (Nathan Gass via Uwe Schindler)
+* LUCENE-7676: Fixed FilterCodecReader to override more super-class methods.
+ Also added TestFilterCodecReader class. (Christine Poerschke)
+
Improvements
* LUCENE-7055: Added Weight#scorerSupplier, which allows to estimate the cost
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ae68e6ce/lucene/core/src/java/org/apache/lucene/index/FilterCodecReader.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/FilterCodecReader.java b/lucene/core/src/java/org/apache/lucene/index/FilterCodecReader.java
index 48cbda7..c0ea8fc 100644
--- a/lucene/core/src/java/org/apache/lucene/index/FilterCodecReader.java
+++ b/lucene/core/src/java/org/apache/lucene/index/FilterCodecReader.java
@@ -17,6 +17,8 @@
package org.apache.lucene.index;
+import java.io.IOException;
+import java.util.Collection;
import java.util.Objects;
import org.apache.lucene.codecs.DocValuesProducer;
@@ -26,6 +28,7 @@ import org.apache.lucene.codecs.PointsReader;
import org.apache.lucene.codecs.StoredFieldsReader;
import org.apache.lucene.codecs.TermVectorsReader;
import org.apache.lucene.search.Sort;
+import org.apache.lucene.util.Accountable;
import org.apache.lucene.util.Bits;
/**
@@ -111,4 +114,25 @@ public abstract class FilterCodecReader extends CodecReader {
public void removeCoreClosedListener(CoreClosedListener listener) {
in.removeCoreClosedListener(listener);
}
+
+ @Override
+ protected void doClose() throws IOException {
+ in.doClose();
+ }
+
+ @Override
+ public long ramBytesUsed() {
+ return in.ramBytesUsed();
+ }
+
+ @Override
+ public Collection<Accountable> getChildResources() {
+ return in.getChildResources();
+ }
+
+ @Override
+ public void checkIntegrity() throws IOException {
+ in.checkIntegrity();
+ }
+
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/ae68e6ce/lucene/core/src/test/org/apache/lucene/index/TestFilterCodecReader.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFilterCodecReader.java b/lucene/core/src/test/org/apache/lucene/index/TestFilterCodecReader.java
new file mode 100644
index 0000000..feb803f
--- /dev/null
+++ b/lucene/core/src/test/org/apache/lucene/index/TestFilterCodecReader.java
@@ -0,0 +1,49 @@
+/*
+ * 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.lucene.index;
+
+import java.lang.reflect.Method;
+import java.lang.reflect.Modifier;
+import org.apache.lucene.util.LuceneTestCase;
+
+public class TestFilterCodecReader extends LuceneTestCase {
+
+ public void testDeclaredMethodsOverridden() throws Exception {
+ final Class<?> subClass = FilterCodecReader.class;
+ implTestDeclaredMethodsOverridden(subClass.getSuperclass(), subClass);
+ }
+
+ private void implTestDeclaredMethodsOverridden(Class<?> superClass, Class<?> subClass) throws Exception {
+ for (final Method superClassMethod : superClass.getDeclaredMethods()) {
+ final int modifiers = superClassMethod.getModifiers();
+ if (Modifier.isPrivate(modifiers)) continue;
+ if (Modifier.isFinal(modifiers)) continue;
+ if (Modifier.isStatic(modifiers)) continue;
+ try {
+ final Method subClassMethod = subClass.getDeclaredMethod(
+ superClassMethod.getName(),
+ superClassMethod.getParameterTypes());
+ assertEquals("getReturnType() difference",
+ superClassMethod.getReturnType(),
+ subClassMethod.getReturnType());
+ } catch (NoSuchMethodException e) {
+ fail(subClass + " needs to override '" + superClassMethod + "'");
+ }
+ }
+ }
+
+}