You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/05/14 01:17:45 UTC
svn commit: r1594417 - in /lucene/dev/branches/lucene5666:
lucene/misc/src/java/org/apache/lucene/uninverting/
solr/core/src/java/org/apache/solr/schema/
solr/core/src/java/org/apache/solr/update/
Author: rmuir
Date: Tue May 13 23:17:45 2014
New Revision: 1594417
URL: http://svn.apache.org/r1594417
Log:
LUCENE-5666: fix test failures
Added:
lucene/dev/branches/lucene5666/solr/core/src/java/org/apache/solr/update/DeleteByQueryWrapper.java (with props)
Modified:
lucene/dev/branches/lucene5666/lucene/misc/src/java/org/apache/lucene/uninverting/UninvertingReader.java
lucene/dev/branches/lucene5666/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
lucene/dev/branches/lucene5666/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
Modified: lucene/dev/branches/lucene5666/lucene/misc/src/java/org/apache/lucene/uninverting/UninvertingReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5666/lucene/misc/src/java/org/apache/lucene/uninverting/UninvertingReader.java?rev=1594417&r1=1594416&r2=1594417&view=diff
==============================================================================
--- lucene/dev/branches/lucene5666/lucene/misc/src/java/org/apache/lucene/uninverting/UninvertingReader.java (original)
+++ lucene/dev/branches/lucene5666/lucene/misc/src/java/org/apache/lucene/uninverting/UninvertingReader.java Tue May 13 23:17:45 2014
@@ -171,7 +171,15 @@ public class UninvertingReader extends F
final Map<String,Type> mapping;
final FieldInfos fieldInfos;
- UninvertingReader(AtomicReader in, Map<String,Type> mapping) {
+ /**
+ * Create a new UninvertingReader with the specified mapping
+ * <p>
+ * Expert: This should almost never be used. Use {@link #wrap(DirectoryReader, Map)}
+ * instead.
+ *
+ * @lucene.internal
+ */
+ public UninvertingReader(AtomicReader in, Map<String,Type> mapping) {
super(in);
this.mapping = mapping;
ArrayList<FieldInfo> filteredInfos = new ArrayList<>();
Modified: lucene/dev/branches/lucene5666/solr/core/src/java/org/apache/solr/schema/IndexSchema.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5666/solr/core/src/java/org/apache/solr/schema/IndexSchema.java?rev=1594417&r1=1594416&r2=1594417&view=diff
==============================================================================
--- lucene/dev/branches/lucene5666/solr/core/src/java/org/apache/solr/schema/IndexSchema.java (original)
+++ lucene/dev/branches/lucene5666/solr/core/src/java/org/apache/solr/schema/IndexSchema.java Tue May 13 23:17:45 2014
@@ -21,6 +21,7 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.AnalyzerWrapper;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.FieldInfo;
+import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.StorableField;
@@ -362,7 +363,7 @@ public class IndexSchema {
queryAnalyzer = new SolrQueryAnalyzer();
}
- public Map<String,UninvertingReader.Type> getUninversionMap(DirectoryReader reader) {
+ public Map<String,UninvertingReader.Type> getUninversionMap(IndexReader reader) {
Map<String,UninvertingReader.Type> map = new HashMap<>();
for (FieldInfo f : MultiFields.getMergedFieldInfos(reader)) {
if (f.hasDocValues() == false && f.isIndexed()) {
Added: lucene/dev/branches/lucene5666/solr/core/src/java/org/apache/solr/update/DeleteByQueryWrapper.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5666/solr/core/src/java/org/apache/solr/update/DeleteByQueryWrapper.java?rev=1594417&view=auto
==============================================================================
--- lucene/dev/branches/lucene5666/solr/core/src/java/org/apache/solr/update/DeleteByQueryWrapper.java (added)
+++ lucene/dev/branches/lucene5666/solr/core/src/java/org/apache/solr/update/DeleteByQueryWrapper.java Tue May 13 23:17:45 2014
@@ -0,0 +1,119 @@
+package org.apache.solr.update;
+
+/*
+ * 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.
+ */
+
+import java.io.IOException;
+
+import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.AtomicReaderContext;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.search.Explanation;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.Query;
+import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.Weight;
+import org.apache.lucene.uninverting.UninvertingReader;
+import org.apache.lucene.util.Bits;
+import org.apache.solr.schema.IndexSchema;
+
+/**
+ * Allows access to uninverted docvalues by delete-by-queries.
+ * this is used e.g. to implement versioning constraints in solr.
+ * <p>
+ * Even though we wrap for each query, UninvertingReader's core
+ * cache key is the inner one, so it still reuses fieldcaches and so on.
+ */
+final class DeleteByQueryWrapper extends Query {
+ final Query in;
+ final IndexSchema schema;
+
+ DeleteByQueryWrapper(Query in, IndexSchema schema) {
+ this.in = in;
+ this.schema = schema;
+ }
+
+ AtomicReader wrap(AtomicReader reader) {
+ return new UninvertingReader(reader, schema.getUninversionMap(reader));
+ }
+
+ // we try to be well-behaved, but we are not (and IW's applyQueryDeletes isn't much better...)
+
+ @Override
+ public Query rewrite(IndexReader reader) throws IOException {
+ Query rewritten = in.rewrite(reader);
+ if (rewritten != in) {
+ return new DeleteByQueryWrapper(in, schema);
+ } else {
+ return this;
+ }
+ }
+
+ @Override
+ public Weight createWeight(IndexSearcher searcher) throws IOException {
+ final AtomicReader wrapped = wrap((AtomicReader) searcher.getIndexReader());
+ final IndexSearcher privateContext = new IndexSearcher(wrapped);
+ final Weight inner = in.createWeight(privateContext);
+ return new Weight() {
+ @Override
+ public Explanation explain(AtomicReaderContext context, int doc) throws IOException { throw new UnsupportedOperationException(); }
+
+ @Override
+ public Query getQuery() { return DeleteByQueryWrapper.this; }
+
+ @Override
+ public float getValueForNormalization() throws IOException { return inner.getValueForNormalization(); }
+
+ @Override
+ public void normalize(float norm, float topLevelBoost) { inner.normalize(norm, topLevelBoost); }
+
+ @Override
+ public Scorer scorer(AtomicReaderContext context, Bits acceptDocs) throws IOException {
+ return inner.scorer(privateContext.getIndexReader().leaves().get(0), acceptDocs);
+ }
+ };
+ }
+
+ @Override
+ public String toString(String field) {
+ return "Uninverting(" + in.toString(field) + ")";
+ }
+
+ @Override
+ public int hashCode() {
+ final int prime = 31;
+ int result = super.hashCode();
+ result = prime * result + ((in == null) ? 0 : in.hashCode());
+ result = prime * result + ((schema == null) ? 0 : schema.hashCode());
+ return result;
+ }
+
+ @Override
+ public boolean equals(Object obj) {
+ if (this == obj) return true;
+ if (!super.equals(obj)) return false;
+ if (getClass() != obj.getClass()) return false;
+ DeleteByQueryWrapper other = (DeleteByQueryWrapper) obj;
+ if (in == null) {
+ if (other.in != null) return false;
+ } else if (!in.equals(other.in)) return false;
+ if (schema == null) {
+ if (other.schema != null) return false;
+ } else if (!schema.equals(other.schema)) return false;
+ return true;
+ }
+}
Modified: lucene/dev/branches/lucene5666/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5666/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java?rev=1594417&r1=1594416&r2=1594417&view=diff
==============================================================================
--- lucene/dev/branches/lucene5666/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java (original)
+++ lucene/dev/branches/lucene5666/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java Tue May 13 23:17:45 2014
@@ -242,7 +242,7 @@ public class DirectUpdateHandler2 extend
bq.add(new BooleanClause(new TermQuery(updateTerm),
Occur.MUST_NOT));
bq.add(new BooleanClause(new TermQuery(idTerm), Occur.MUST));
- writer.deleteDocuments(bq);
+ writer.deleteDocuments(new DeleteByQueryWrapper(bq, core.getLatestSchema()));
}
// Add to the transaction log *after* successfully adding to the
@@ -402,7 +402,7 @@ public class DirectUpdateHandler2 extend
} else {
RefCounted<IndexWriter> iw = solrCoreState.getIndexWriter(core);
try {
- iw.get().deleteDocuments(q);
+ iw.get().deleteDocuments(new DeleteByQueryWrapper(q, core.getLatestSchema()));
} finally {
iw.decref();
}
@@ -440,7 +440,7 @@ public class DirectUpdateHandler2 extend
.getIndexAnalyzer());
for (Query q : dbqList) {
- writer.deleteDocuments(q);
+ writer.deleteDocuments(new DeleteByQueryWrapper(q, core.getLatestSchema()));
}
} finally {
iw.decref();