You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by yo...@apache.org on 2012/02/02 03:17:55 UTC
svn commit: r1239437 - in /lucene/dev/trunk:
modules/queries/src/java/org/apache/lucene/queries/function/
solr/core/src/java/org/apache/solr/update/processor/
solr/solrj/src/java/org/apache/solr/common/params/
solr/test-framework/src/java/org/apache/solr/
Author: yonik
Date: Thu Feb 2 02:17:54 2012
New Revision: 1239437
URL: http://svn.apache.org/viewvc?rev=1239437&view=rev
Log:
SOLR-3078: only return update versions on request
Modified:
lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java
lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/params/UpdateParams.java
lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
Modified: lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java?rev=1239437&r1=1239436&r2=1239437&view=diff
==============================================================================
--- lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java (original)
+++ lucene/dev/trunk/modules/queries/src/java/org/apache/lucene/queries/function/FunctionQuery.java Thu Feb 2 02:17:54 2012
@@ -107,7 +107,7 @@ public class FunctionQuery extends Query
final float qWeight;
int doc=-1;
final FunctionValues vals;
- final Bits liveDocs;
+ final Bits acceptDocs;
public AllScorer(AtomicReaderContext context, Bits acceptDocs, FunctionWeight w, float qWeight) throws IOException {
super(w);
@@ -115,7 +115,7 @@ public class FunctionQuery extends Query
this.qWeight = qWeight;
this.reader = context.reader();
this.maxDoc = reader.maxDoc();
- this.liveDocs = acceptDocs;
+ this.acceptDocs = acceptDocs;
vals = func.getValues(weight.context, context);
}
@@ -135,7 +135,7 @@ public class FunctionQuery extends Query
if (doc>=maxDoc) {
return doc=NO_MORE_DOCS;
}
- if (liveDocs != null && !liveDocs.get(doc)) continue;
+ if (acceptDocs != null && !acceptDocs.get(doc)) continue;
return doc;
}
}
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java?rev=1239437&r1=1239436&r2=1239437&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java Thu Feb 2 02:17:54 2012
@@ -40,6 +40,7 @@ import org.apache.solr.common.cloud.ZkSt
import org.apache.solr.common.cloud.ZooKeeperException;
import org.apache.solr.common.params.CoreAdminParams.CoreAdminAction;
import org.apache.solr.common.params.ModifiableSolrParams;
+import org.apache.solr.common.params.UpdateParams;
import org.apache.solr.common.util.Hash;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.CoreDescriptor;
@@ -112,7 +113,7 @@ public class DistributedUpdateProcessor
this.ulog = updateHandler.getUpdateLog();
this.vinfo = ulog == null ? null : ulog.getVersionInfo();
versionsStored = this.vinfo != null && this.vinfo.getVersionField() != null;
- returnVersions = versionsStored;
+ returnVersions = req.getParams().getBool(UpdateParams.VERSIONS ,false);
// TODO: better way to get the response, or pass back info to it?
SolrRequestInfo reqInfo = returnVersions ? SolrRequestInfo.getRequestInfo() : null;
Modified: lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/params/UpdateParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/params/UpdateParams.java?rev=1239437&r1=1239436&r2=1239437&view=diff
==============================================================================
--- lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/params/UpdateParams.java (original)
+++ lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/common/params/UpdateParams.java Thu Feb 2 02:17:54 2012
@@ -61,4 +61,7 @@ public interface UpdateParams
public static final String MAX_OPTIMIZE_SEGMENTS = "maxSegments";
public static final String EXPUNGE_DELETES = "expungeDeletes";
+
+ /** Return versions of updates? */
+ public static final String VERSIONS = "versions";
}
Modified: lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java?rev=1239437&r1=1239436&r2=1239437&view=diff
==============================================================================
--- lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java (original)
+++ lucene/dev/trunk/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java Thu Feb 2 02:17:54 2012
@@ -834,6 +834,11 @@ public abstract class SolrTestCaseJ4 ext
public static Long addAndGetVersion(SolrInputDocument sdoc, SolrParams params) throws Exception {
+ if (params==null || params.get("versions") == null) {
+ ModifiableSolrParams mparams = new ModifiableSolrParams(params);
+ mparams.set("versions","true");
+ params = mparams;
+ }
String response = updateJ(jsonAdd(sdoc), params);
Map rsp = (Map)ObjectBuilder.fromJSON(response);
List lst = (List)rsp.get("adds");
@@ -842,6 +847,11 @@ public abstract class SolrTestCaseJ4 ext
}
public static Long deleteAndGetVersion(String id, SolrParams params) throws Exception {
+ if (params==null || params.get("versions") == null) {
+ ModifiableSolrParams mparams = new ModifiableSolrParams(params);
+ mparams.set("versions","true");
+ params = mparams;
+ }
String response = updateJ(jsonDelId(id), params);
Map rsp = (Map)ObjectBuilder.fromJSON(response);
List lst = (List)rsp.get("deletes");
@@ -850,6 +860,11 @@ public abstract class SolrTestCaseJ4 ext
}
public static Long deleteByQueryAndGetVersion(String q, SolrParams params) throws Exception {
+ if (params==null || params.get("versions") == null) {
+ ModifiableSolrParams mparams = new ModifiableSolrParams(params);
+ mparams.set("versions","true");
+ params = mparams;
+ }
String response = updateJ(jsonDelQ(q), params);
Map rsp = (Map)ObjectBuilder.fromJSON(response);
List lst = (List)rsp.get("deleteByQuery");