You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by tf...@apache.org on 2017/05/12 23:39:24 UTC
[57/58] [abbrv] lucene-solr:jira/solr-10233: Revert "Temporary commit
for SOLR-10524"
Revert "Temporary commit for SOLR-10524"
This reverts commit b16f0e3531bce9ca600bb53d4bea908c269ce0d1.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/14ea4ad8
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/14ea4ad8
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/14ea4ad8
Branch: refs/heads/jira/solr-10233
Commit: 14ea4ad8fa262963cfb969634413411c61222165
Parents: 9e82fd4
Author: Tomas Fernandez Lobbe <tf...@apache.org>
Authored: Fri May 12 14:49:08 2017 -0700
Committer: Tomas Fernandez Lobbe <tf...@apache.org>
Committed: Fri May 12 14:49:08 2017 -0700
----------------------------------------------------------------------
.../src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java | 3 ---
.../test/org/apache/solr/cloud/overseer/ZkStateWriterTest.java | 2 --
2 files changed, 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/14ea4ad8/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
index 1eddeaa..c7e8c52 100644
--- a/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
+++ b/solr/core/src/java/org/apache/solr/cloud/overseer/ZkStateWriter.java
@@ -166,9 +166,6 @@ public class ZkStateWriter {
* @return true if a flush is required, false otherwise
*/
protected boolean maybeFlushBefore(ZkWriteCommand cmd) {
- if (cmd.collection == null) {
- return false;
- }
return cmd.collection.getStateFormat() != lastStateFormat;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/14ea4ad8/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateWriterTest.java
----------------------------------------------------------------------
diff --git a/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateWriterTest.java b/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateWriterTest.java
index 729857f..85dbf4a 100644
--- a/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateWriterTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/overseer/ZkStateWriterTest.java
@@ -35,7 +35,6 @@ import org.apache.solr.common.cloud.SolrZkClient;
import org.apache.solr.common.cloud.ZkStateReader;
import org.apache.solr.common.util.Utils;
import org.apache.zookeeper.KeeperException;
-import org.junit.Ignore;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -43,7 +42,6 @@ public class ZkStateWriterTest extends SolrTestCaseJ4 {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
- @Ignore
public void testZkStateWriterBatching() throws Exception {
String zkDir = createTempDir("testZkStateWriterBatching").toFile().getAbsolutePath();