You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2017/06/21 07:34:07 UTC
lucene-solr:feature/autoscaling: Fixed merge problems to make the
branch as close to master as possible
Repository: lucene-solr
Updated Branches:
refs/heads/feature/autoscaling fb7803d9a -> b499f5aac
Fixed merge problems to make the branch as close to master as possible
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b499f5aa
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b499f5aa
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b499f5aa
Branch: refs/heads/feature/autoscaling
Commit: b499f5aac25cd2dc6747045316e9ad0cce05d822
Parents: fb7803d
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Wed Jun 21 13:04:01 2017 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Wed Jun 21 13:04:01 2017 +0530
----------------------------------------------------------------------
.../org/apache/solr/cloud/ZkController.java | 2 +-
.../handler/component/RealTimeGetComponent.java | 5 --
.../metrics/reporters/SolrGangliaReporter.java | 4 --
.../org/apache/solr/schema/DocValuesTest.java | 72 --------------------
.../solr/update/DirectUpdateHandlerTest.java | 1 -
.../apache/solr/common/cloud/SolrZkClient.java | 15 ----
.../solrj/impl/CloudSolrClientCacheTest.java | 3 +-
7 files changed, 2 insertions(+), 100 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b499f5aa/solr/core/src/java/org/apache/solr/cloud/ZkController.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/ZkController.java b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
index 8fa3d1b..c3878e1 100644
--- a/solr/core/src/java/org/apache/solr/cloud/ZkController.java
+++ b/solr/core/src/java/org/apache/solr/cloud/ZkController.java
@@ -566,7 +566,7 @@ public class ZkController {
* this data is retrieved from ZK on each call.
*/
public AutoScalingConfig getAutoScalingConfig() throws KeeperException, InterruptedException {
- Map<String, Object> jsonMap = zkClient.getJson(ZkStateReader.SOLR_AUTOSCALING_CONF_PATH, true);
+ Map<String, Object> jsonMap = Utils.getJson(zkClient, ZkStateReader.SOLR_AUTOSCALING_CONF_PATH, true);
return new AutoScalingConfig(jsonMap);
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b499f5aa/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
index da9f70b..6d70435 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
@@ -73,7 +73,6 @@ import org.apache.solr.schema.FieldType;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.search.DocList;
-import org.apache.solr.search.SolrDocumentFetcher;
import org.apache.solr.search.QParser;
import org.apache.solr.search.ReturnFields;
import org.apache.solr.search.SolrDocumentFetcher;
@@ -88,10 +87,6 @@ import org.apache.solr.util.RefCounted;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.solr.common.params.CommonParams.DISTRIB;
-import static org.apache.solr.common.params.CommonParams.ID;
-import static org.apache.solr.common.params.CommonParams.VERSION_FIELD;
-
public class RealTimeGetComponent extends SearchComponent
{
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b499f5aa/solr/core/src/java/org/apache/solr/metrics/reporters/SolrGangliaReporter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/metrics/reporters/SolrGangliaReporter.java b/solr/core/src/java/org/apache/solr/metrics/reporters/SolrGangliaReporter.java
index 02d7e1b..8d87940 100644
--- a/solr/core/src/java/org/apache/solr/metrics/reporters/SolrGangliaReporter.java
+++ b/solr/core/src/java/org/apache/solr/metrics/reporters/SolrGangliaReporter.java
@@ -114,10 +114,6 @@ public class SolrGangliaReporter extends SolrMetricReporter {
@Override
protected void validate() throws IllegalStateException {
- if (!enabled) {
- log.info("Reporter disabled for registry " + registryName);
- return;
- }
if (host == null) {
throw new IllegalStateException("Init argument 'host' must be set to a valid Ganglia server name.");
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b499f5aa/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java b/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
index c87eaf1..43c0006 100644
--- a/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
+++ b/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
@@ -25,14 +25,10 @@ import java.util.List;
import java.util.function.Function;
import java.util.function.Supplier;
-import org.apache.lucene.document.Document;
-import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.DocValuesType;
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.LeafReader;
-import org.apache.lucene.index.LeafReaderContext;
-import org.apache.lucene.index.MultiFields;
import org.apache.lucene.index.NumericDocValues;
import org.apache.lucene.index.SortedDocValues;
import org.apache.lucene.queries.function.FunctionValues;
@@ -155,74 +151,6 @@ public class DocValuesTest extends SolrTestCaseJ4 {
}
}
-
- public void testHalfAndHalfDocValues() throws Exception {
- // Insert two docs without docvalues
- String fieldname = "string_add_dv_later";
- assertU(adoc("id", "3", fieldname, "c"));
- assertU(commit());
- assertU(adoc("id", "1", fieldname, "a"));
- assertU(commit());
-
-
- try (SolrCore core = h.getCoreInc()) {
- assertFalse(core.getLatestSchema().getField(fieldname).hasDocValues());
- // Add docvalues to the field type
- IndexSchema schema = core.getLatestSchema();
- SchemaField oldField = schema.getField(fieldname);
- int newProperties = oldField.getProperties() | SchemaField.DOC_VALUES;
-
- SchemaField sf = new SchemaField( fieldname, oldField.getType(), newProperties, null);
- schema.getFields().put( fieldname, sf );
-
- // Insert a new doc with docvalues
- assertU(adoc("id", "2", fieldname, "b"));
- assertU(commit());
-
-
- // Check there are a mix of segments with and without docvalues
- final RefCounted<SolrIndexSearcher> searcherRef = core.openNewSearcher(true, true);
- final SolrIndexSearcher searcher = searcherRef.get();
- try {
- final DirectoryReader topReader = searcher.getRawReader();
-
- //Assert no merges
-
- assertEquals(3, topReader.numDocs());
- assertEquals(3, topReader.leaves().size());
-
- final FieldInfos infos = MultiFields.getMergedFieldInfos(topReader);
- //The global field type should have docValues because a document with dvs was added
- assertEquals(DocValuesType.SORTED, infos.fieldInfo(fieldname).getDocValuesType());
-
- for(LeafReaderContext ctx: topReader.leaves()) {
- LeafReader r = ctx.reader();
- //Make sure there were no merges
- assertEquals(1, r.numDocs());
- Document doc = r.document(0);
- String id = doc.getField("id").stringValue();
-
- if(id.equals("1") || id.equals("3")) {
- assertEquals(DocValuesType.NONE, r.getFieldInfos().fieldInfo(fieldname).getDocValuesType());
- } else {
- assertEquals(DocValuesType.SORTED, r.getFieldInfos().fieldInfo(fieldname).getDocValuesType());
- }
-
- }
- } finally {
- searcherRef.decref();
- }
- }
-
- // Assert sort order is correct
- assertQ(req("q", "string_add_dv_later:*", "sort", "string_add_dv_later asc"),
- "//*[@numFound='3']",
- "//result/doc[1]/int[@name='id'][.=1]",
- "//result/doc[2]/int[@name='id'][.=2]",
- "//result/doc[3]/int[@name='id'][.=3]"
- );
- }
-
private void tstToObj(SchemaField sf, Object o) {
List<IndexableField> fields = sf.createFields(o);
for (IndexableField field : fields) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b499f5aa/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java b/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
index 2ecc9ed..90bb6a0 100644
--- a/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerTest.java
@@ -27,7 +27,6 @@ import com.codahale.metrics.Gauge;
import com.codahale.metrics.Meter;
import com.codahale.metrics.Metric;
import org.apache.lucene.index.DirectoryReader;
-import org.apache.lucene.index.TieredMergePolicy;
import org.apache.lucene.store.Directory;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.common.params.CommonParams;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b499f5aa/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java b/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
index 507f719..66033bc 100644
--- a/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
+++ b/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
@@ -32,7 +32,6 @@ import java.lang.invoke.MethodHandles;
import java.nio.charset.StandardCharsets;
import java.nio.file.Path;
import java.util.List;
-import java.util.Map;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.RejectedExecutionException;
import java.util.regex.Pattern;
@@ -45,7 +44,6 @@ import org.apache.solr.common.cloud.ZkClientConnectionStrategy.ZkUpdate;
import org.apache.solr.common.util.ExecutorUtil;
import org.apache.solr.common.util.ObjectReleaseTracker;
import org.apache.solr.common.util.SolrjNamedThreadFactory;
-import org.apache.solr.common.util.Utils;
import org.apache.zookeeper.CreateMode;
import org.apache.zookeeper.KeeperException;
import org.apache.zookeeper.KeeperException.NoNodeException;
@@ -364,19 +362,6 @@ public class SolrZkClient implements Closeable {
}
}
- public Map<String, Object> getJson(String path, boolean retryOnConnLoss) throws KeeperException, InterruptedException {
- byte[] bytes = null;
- try {
- bytes = getData(path, null, null, retryOnConnLoss);
- } catch (KeeperException.NoNodeException e) {
- return null;
- }
- if (bytes != null && bytes.length > 0) {
- return (Map<String, Object>) Utils.fromJSON(bytes);
- }
- return null;
- }
-
/**
* Returns node's state
*/
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b499f5aa/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientCacheTest.java
----------------------------------------------------------------------
diff --git a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientCacheTest.java b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientCacheTest.java
index 112a46d..0a83138 100644
--- a/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientCacheTest.java
+++ b/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrClientCacheTest.java
@@ -34,7 +34,6 @@ import org.apache.http.NoHttpResponseException;
import org.apache.solr.SolrTestCaseJ4;
import org.apache.solr.client.solrj.request.UpdateRequest;
import org.apache.solr.common.cloud.ClusterState;
-import org.apache.solr.common.cloud.ClusterState.CollectionRef;
import org.apache.solr.common.cloud.DocCollection;
import org.apache.solr.common.util.NamedList;
import static org.mockito.Mockito.*;
@@ -122,7 +121,7 @@ public class CloudSolrClientCacheTest extends SolrTestCaseJ4 {
Map<String, ClusterState.CollectionRef> colls) {
return new ClusterStateProvider() {
@Override
- public CollectionRef getState(String collection) {
+ public ClusterState.CollectionRef getState(String collection) {
return colls.get(collection);
}