lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mikemcc...@apache.org
Subject svn commit: r1572063 [21/22] - in /lucene/dev/branches/lucene5376: ./ dev-tools/ dev-tools/idea/.idea/ dev-tools/idea/lucene/sandbox/ dev-tools/idea/solr/contrib/morphlines-core/ dev-tools/maven/lucene/ dev-tools/maven/lucene/core/src/java/ dev-tools/m...
Date Wed, 26 Feb 2014 14:44:12 GMT
Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionProcessorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionProcessorTest.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionProcessorTest.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/OverseerCollectionProcessorTest.java Wed Feb 26 14:43:56 2014
@@ -207,7 +207,7 @@ public class OverseerCollectionProcessor
       final String address = "localhost:" + (8963 + i) + "_solr";
       liveNodes.add(address);
       
-      solrZkClientMock.getBaseUrlForNodeName(address);
+      zkStateReaderMock.getBaseUrlForNodeName(address);
       expectLastCall().andAnswer(new IAnswer<Object>() {
         @Override
         public Object answer() throws Throwable {
@@ -218,6 +218,13 @@ public class OverseerCollectionProcessor
       }).anyTimes();
       
     }
+    zkStateReaderMock.getClusterProps();
+    expectLastCall().andAnswer(new IAnswer<Map>() {
+      @Override
+      public Map answer() throws Throwable {
+        return new HashMap();
+      }
+    });
     
     solrZkClientMock.getZkClientTimeout();
     expectLastCall().andAnswer(new IAnswer<Object>() {

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java Wed Feb 26 14:43:56 2014
@@ -17,42 +17,39 @@ package org.apache.solr.cloud;
  * limitations under the License.
  */
 
-import com.google.protobuf.TextFormat;
+import static org.apache.solr.cloud.OverseerCollectionProcessor.MAX_SHARDS_PER_NODE;
+import static org.apache.solr.cloud.OverseerCollectionProcessor.NUM_SLICES;
+import static org.apache.solr.cloud.OverseerCollectionProcessor.REPLICATION_FACTOR;
+import static org.apache.solr.cloud.OverseerCollectionProcessor.getSortedNodeNames;
+import static org.apache.solr.cloud.OverseerCollectionProcessor.getLeaderNode;
+import static org.apache.solr.common.cloud.ZkNodeProps.makeMap;
+
+import java.io.IOException;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
 import org.apache.lucene.util.LuceneTestCase;
+import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
 import org.apache.solr.client.solrj.SolrRequest;
-import org.apache.solr.client.solrj.SolrServerException;
+import org.apache.solr.client.solrj.embedded.JettySolrRunner;
 import org.apache.solr.client.solrj.impl.CloudSolrServer;
 import org.apache.solr.client.solrj.request.QueryRequest;
-import org.apache.solr.common.cloud.SolrZkClient;
-import org.apache.solr.common.cloud.ZkStateReader;
+import org.apache.solr.common.params.CollectionParams.CollectionAction;
 import org.apache.solr.common.params.MapSolrParams;
 import org.apache.solr.common.params.SolrParams;
-import org.apache.zookeeper.KeeperException;
-import org.apache.zookeeper.data.Stat;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Set;
-
-import static org.apache.solr.cloud.OverseerCollectionProcessor.MAX_SHARDS_PER_NODE;
-import static org.apache.solr.cloud.OverseerCollectionProcessor.NUM_SLICES;
-import static org.apache.solr.cloud.OverseerCollectionProcessor.REPLICATION_FACTOR;
-import static org.apache.solr.cloud.OverseerCollectionProcessor.getSortedNodeNames;
-import static org.apache.solr.common.cloud.ZkNodeProps.makeMap;
-import static org.apache.solr.common.params.CollectionParams.CollectionAction;
 @LuceneTestCase.Slow
+@SuppressSSL     // SSL does not work with this feature for some reason
 public class OverseerRolesTest  extends AbstractFullDistribZkTestBase{
   private CloudSolrServer client;
-
+  
   @BeforeClass
   public static void beforeThisClass2() throws Exception {
 
@@ -159,6 +156,39 @@ public class OverseerRolesTest  extends 
     assertTrue("New overseer not the frontrunner : "+ getSortedNodeNames(client.getZkStateReader().getZkClient()) + " expected : "+ anotherOverseer, leaderchanged);
 
 
+    String currentOverseer = getLeaderNode(client.getZkStateReader().getZkClient());
+
+    log.info("Current Overseer {}", currentOverseer);
+    Pattern pattern = Pattern.compile("(.*):(\\d*)(.*)");
+    Matcher m = pattern.matcher(currentOverseer);
+    if(m.matches()){
+      String hostPort =  m.group(1)+":"+m.group(2);
+
+      log.info("hostPort : {}", hostPort);
+
+      for (JettySolrRunner jetty : jettys) {
+        String s = jetty.getBaseUrl().toString();
+        if(s.contains(hostPort)){
+          log.info("leader node {}",s);
+          ChaosMonkey.stop(jetty);
+
+          timeout = System.currentTimeMillis()+10000;
+          leaderchanged = false;
+          for(;System.currentTimeMillis() < timeout;){
+            currentOverseer =  getLeaderNode(client.getZkStateReader().getZkClient());
+            if(anotherOverseer.equals(currentOverseer)){
+              leaderchanged =true;
+              break;
+            }
+            Thread.sleep(100);
+          }
+          assertTrue("New overseer designate has not become the overseer, expected : "+ anotherOverseer + "actual : "+ currentOverseer, leaderchanged);
+        }
+
+      }
+
+    }
+
     client.shutdown();
 
 

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java Wed Feb 26 14:43:56 2014
@@ -355,7 +355,7 @@ public class OverseerTest extends SolrTe
         if (coreCount == assignedCount) {
           break;
         }
-        Thread.sleep(500);
+        Thread.sleep(1000);
       }
       assertEquals("Unable to verify all cores have been returned an id", 
                    coreCount, assignedCount);

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/ShardSplitTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/ShardSplitTest.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/ShardSplitTest.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/ShardSplitTest.java Wed Feb 26 14:43:56 2014
@@ -38,7 +38,6 @@ import org.apache.solr.common.cloud.ZkNo
 import org.apache.solr.common.cloud.ZkStateReader;
 import org.apache.solr.common.params.CollectionParams;
 import org.apache.solr.common.params.ModifiableSolrParams;
-import org.apache.solr.handler.admin.CollectionsHandler;
 import org.apache.solr.update.DirectUpdateHandler2;
 import org.junit.After;
 import org.junit.Before;

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/SyncSliceTest.java Wed Feb 26 14:43:56 2014
@@ -240,7 +240,7 @@ public class SyncSliceTest extends Abstr
   }
 
   private void waitTillRecovered() throws Exception {
-    for (int i = 0; i < 30; i++) { 
+    for (int i = 0; i < 60; i++) { 
       Thread.sleep(3000);
       ZkStateReader zkStateReader = cloudClient.getZkStateReader();
       zkStateReader.updateClusterState(true);

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/UnloadDistributedZkTest.java Wed Feb 26 14:43:56 2014
@@ -24,6 +24,7 @@ import java.util.concurrent.SynchronousQ
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.concurrent.TimeUnit;
 
+import org.apache.lucene.util.LuceneTestCase.BadApple;
 import org.apache.lucene.util.LuceneTestCase.Slow;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrServer;
@@ -44,7 +45,7 @@ import org.junit.BeforeClass;
  * This test simply does a bunch of basic things in solrcloud mode and asserts things
  * work as expected.
  */
-@Slow
+@Slow @BadApple
 public class UnloadDistributedZkTest extends BasicDistributedZkTest {
   
   @BeforeClass
@@ -268,8 +269,8 @@ public class UnloadDistributedZkTest ext
     zkStateReader.getLeaderRetry("unloadcollection", "shard1", 15000);
     
     addClient = new HttpSolrServer(url2 + "/unloadcollection2");
-    addClient.setConnectionTimeout(15000);
-    addClient.setSoTimeout(30000);
+    addClient.setConnectionTimeout(30000);
+    addClient.setSoTimeout(90000);
     
     // add a few docs while the leader is down
     for (int x = 101; x < 200; x++) {

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/ZkCLITest.java Wed Feb 26 14:43:56 2014
@@ -83,7 +83,7 @@ public class ZkCLITest extends SolrTestC
     } else {
       File tmpSolrHome = new File(dataDir, "tmp-solr-home");
       FileUtils.copyDirectory(new File(ExternalPaths.EXAMPLE_HOME), tmpSolrHome);
-      FileUtils.copyFile(new File(ExternalPaths.SOURCE_HOME, "core/src/test-files/old-solr-example/solr.xml"), new File(tmpSolrHome, "solr.xml"));
+      FileUtils.copyFile(getFile("old-solr-example/solr.xml"), new File(tmpSolrHome, "solr.xml"));
       solrHome = tmpSolrHome.getAbsolutePath();
     }
     

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java Wed Feb 26 14:43:56 2014
@@ -32,11 +32,10 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 
 import java.io.File;
-import java.io.IOException;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.concurrent.TimeoutException;
 
 @Slow
 public class ZkControllerTest extends SolrTestCaseJ4 {
@@ -99,49 +98,59 @@ public class ZkControllerTest extends So
       AbstractZkTestCase.tryCleanSolrZkNode(server.getZkHost());
       AbstractZkTestCase.makeSolrZkNode(server.getZkHost());
 
-      SolrZkClient zkClient = new SolrZkClient(server.getZkAddress(), TIMEOUT);
+      ZkStateReader zkStateReader = new ZkStateReader(server.getZkAddress(), TIMEOUT, TIMEOUT);
       try {
-
         // getBaseUrlForNodeName
         assertEquals("http://zzz.xxx:1234/solr",
-                     zkClient.getBaseUrlForNodeName("zzz.xxx:1234_solr"));
+                     zkStateReader.getBaseUrlForNodeName("zzz.xxx:1234_solr"));
         assertEquals("http://xxx:99",
-                     zkClient.getBaseUrlForNodeName("xxx:99_"));
+                     zkStateReader.getBaseUrlForNodeName("xxx:99_"));
         assertEquals("http://foo-bar.baz.org:9999/some_dir",
-                     zkClient.getBaseUrlForNodeName("foo-bar.baz.org:9999_some_dir"));
+                     zkStateReader.getBaseUrlForNodeName("foo-bar.baz.org:9999_some_dir"));
         assertEquals("http://foo-bar.baz.org:9999/solr/sub_dir",
-                     zkClient.getBaseUrlForNodeName("foo-bar.baz.org:9999_solr%2Fsub_dir"));
+                     zkStateReader.getBaseUrlForNodeName("foo-bar.baz.org:9999_solr%2Fsub_dir"));
         
         // generateNodeName + getBaseUrlForNodeName
         assertEquals("http://foo:9876/solr",
-                     zkClient.getBaseUrlForNodeName
+                     zkStateReader.getBaseUrlForNodeName
                      (ZkController.generateNodeName("foo","9876","solr")));
         assertEquals("http://foo:9876/solr",
-                     zkClient.getBaseUrlForNodeName
+                     zkStateReader.getBaseUrlForNodeName
                      (ZkController.generateNodeName("foo","9876","/solr")));
         assertEquals("http://foo:9876/solr",
-                     zkClient.getBaseUrlForNodeName
+                     zkStateReader.getBaseUrlForNodeName
                      (ZkController.generateNodeName("foo","9876","/solr/")));
         assertEquals("http://foo.bar.com:9876/solr/sub_dir",
-                     zkClient.getBaseUrlForNodeName
+                     zkStateReader.getBaseUrlForNodeName
                      (ZkController.generateNodeName("foo.bar.com","9876","solr/sub_dir")));
         assertEquals("http://foo.bar.com:9876/solr/sub_dir",
-                     zkClient.getBaseUrlForNodeName
+                     zkStateReader.getBaseUrlForNodeName
                      (ZkController.generateNodeName("foo.bar.com","9876","/solr/sub_dir/")));
         assertEquals("http://foo-bar:9876",
-                     zkClient.getBaseUrlForNodeName
+                     zkStateReader.getBaseUrlForNodeName
                      (ZkController.generateNodeName("foo-bar","9876","")));
         assertEquals("http://foo-bar:9876",
-                     zkClient.getBaseUrlForNodeName
+                     zkStateReader.getBaseUrlForNodeName
                      (ZkController.generateNodeName("foo-bar","9876","/")));
         assertEquals("http://foo-bar.com:80/some_dir",
-                     zkClient.getBaseUrlForNodeName
+                     zkStateReader.getBaseUrlForNodeName
                      (ZkController.generateNodeName("foo-bar.com","80","some_dir")));
         assertEquals("http://foo-bar.com:80/some_dir",
-                     zkClient.getBaseUrlForNodeName
+                     zkStateReader.getBaseUrlForNodeName
                      (ZkController.generateNodeName("foo-bar.com","80","/some_dir")));
+        
+        //Verify the URL Scheme is taken into account
+        zkStateReader.getZkClient().create(ZkStateReader.CLUSTER_PROPS,
+            ZkStateReader.toJSON(Collections.singletonMap("urlScheme", "https")), CreateMode.PERSISTENT, true);
+        
+        assertEquals("https://zzz.xxx:1234/solr",
+            zkStateReader.getBaseUrlForNodeName("zzz.xxx:1234_solr"));
+        
+        assertEquals("https://foo-bar.com:80/some_dir",
+            zkStateReader.getBaseUrlForNodeName
+            (ZkController.generateNodeName("foo-bar.com","80","/some_dir")));
       } finally {
-        zkClient.close();
+        zkStateReader.close();
       }
     } finally {
       server.shutdown();

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/cloud/hdfs/StressHdfsTest.java Wed Feb 26 14:43:56 2014
@@ -198,6 +198,16 @@ public class StressHdfsTest extends Basi
     request.setPath("/admin/collections");
     cloudClient.request(request);
     
+    long timeout = System.currentTimeMillis() + 10000;
+    while (cloudClient.getZkStateReader().getClusterState().hasCollection(DELETE_DATA_DIR_COLLECTION)) {
+      if (System.currentTimeMillis() > timeout) {
+        throw new AssertionError("Timeout waiting to see removed collection leave clusterstate");
+      }
+      
+      Thread.sleep(200);
+      cloudClient.getZkStateReader().updateClusterState(true);
+    }
+    
     // check that all dirs are gone
     for (String dataDir : dataDirs) {
       Configuration conf = new Configuration();

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/core/OpenCloseCoreStressTest.java Wed Feb 26 14:43:56 2014
@@ -17,9 +17,21 @@
 
 package org.apache.solr.core;
 
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Locale;
+import java.util.Map;
+import java.util.Random;
+import java.util.TreeMap;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
+import java.util.concurrent.atomic.AtomicLong;
+
 import org.apache.commons.io.FileUtils;
+import org.apache.lucene.util.LuceneTestCase.BadApple;
 import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.embedded.JettySolrRunner;
 import org.apache.solr.client.solrj.impl.HttpSolrServer;
 import org.apache.solr.client.solrj.request.UpdateRequest;
@@ -28,26 +40,14 @@ import org.apache.solr.client.solrj.resp
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.common.params.ModifiableSolrParams;
 import org.junit.After;
-import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.util.Random;
-import java.util.TreeMap;
-import java.util.concurrent.atomic.AtomicBoolean;
-import java.util.concurrent.atomic.AtomicInteger;
-import java.util.concurrent.atomic.AtomicLong;
-
 /**
  * Incorporate the open/close stress tests into unit tests.
  */
+@BadApple
 public class OpenCloseCoreStressTest extends SolrTestCaseJ4 {
 
   private final Object locker = new Object();
@@ -74,7 +74,12 @@ public class OpenCloseCoreStressTest ext
   List<HttpSolrServer> queryServers = new ArrayList<HttpSolrServer>(queryThreads);
 
   static String savedFactory;
+  
+  @BeforeClass
+  public static void beforeClass() {
 
+  }
+  
   @Before
   public void setupServer() throws Exception {
     coreCounts = new TreeMap<String, Long>();
@@ -84,7 +89,7 @@ public class OpenCloseCoreStressTest ext
     solrHomeDirectory = new File(TEMP_DIR, "OpenCloseCoreStressTest_");
     FileUtils.deleteDirectory(solrHomeDirectory); // Ensure that a failed test didn't leave something lying around.
 
-    jetty = new JettySolrRunner(solrHomeDirectory.getAbsolutePath(), "/solr", 0);
+    jetty = new JettySolrRunner(solrHomeDirectory.getAbsolutePath(), "/solr", 0, null, null, true, null, sslConfig);
   }
 
   @After
@@ -132,7 +137,7 @@ public class OpenCloseCoreStressTest ext
 
   private void getServers() throws Exception {
     jetty.start();
-    url = "http://127.0.0.1:" + jetty.getLocalPort() + "/solr/";
+    url = buildUrl(jetty.getLocalPort(), "/solr/");
 
     // Mostly to keep annoying logging messages from being sent out all the time.
 

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/core/QueryResultKeyTest.java Wed Feb 26 14:43:56 2014
@@ -28,7 +28,7 @@ import org.apache.lucene.search.Query;
 import org.apache.lucene.search.Sort;
 import org.apache.lucene.search.SortField;
 import org.apache.lucene.search.TermQuery;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.search.QueryResultKey;
 import org.junit.Test;
@@ -165,10 +165,10 @@ public class QueryResultKeyTest extends 
    * the array is garunteed to always have at least 1 element
    */
   private int[] smallArrayOfRandomNumbers() {
-    int size = _TestUtil.nextInt(random(), 1, 5);
+    int size = TestUtil.nextInt(random(), 1, 5);
     int[] result = new int[size];
     for (int i=0; i < size; i++) {
-      result[i] = _TestUtil.nextInt(random(), 1, 5);
+      result[i] = TestUtil.nextInt(random(), 1, 5);
     }
     return result;
   }

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/core/ResourceLoaderTest.java Wed Feb 26 14:43:56 2014
@@ -22,7 +22,7 @@ import junit.framework.Assert;
 import org.apache.lucene.analysis.TokenStream;
 import org.apache.lucene.analysis.core.KeywordTokenizerFactory;
 import org.apache.lucene.analysis.ngram.NGramFilterFactory;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.handler.admin.LukeRequestHandler;
@@ -60,7 +60,7 @@ public class ResourceLoaderTest extends 
   }
 
   public void testEscapeInstanceDir() throws Exception {
-    File temp = _TestUtil.getTempDir("testEscapeInstanceDir");
+    File temp = TestUtil.getTempDir("testEscapeInstanceDir");
     try {
       temp.mkdirs();
       new File(temp, "dummy.txt").createNewFile();
@@ -76,7 +76,7 @@ public class ResourceLoaderTest extends 
       }
       loader.close();
     } finally {
-      _TestUtil.rmDir(temp);
+      TestUtil.rmDir(temp);
     }
   }
 
@@ -170,7 +170,7 @@ public class ResourceLoaderTest extends 
   }
 
   public void testClassLoaderLibs() throws Exception {
-    File tmpRoot = _TestUtil.getTempDir("testClassLoaderLibs");
+    File tmpRoot = TestUtil.getTempDir("testClassLoaderLibs");
 
     File lib = new File(tmpRoot, "lib");
     lib.mkdirs();

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/core/TestCoreContainer.java Wed Feb 26 14:43:56 2014
@@ -19,7 +19,7 @@ package org.apache.solr.core;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.lucene.util.IOUtils;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.handler.admin.CollectionsHandler;
 import org.apache.solr.handler.admin.CoreAdminHandler;
@@ -240,7 +240,7 @@ public class TestCoreContainer extends S
 
   @Test
   public void testSharedLib() throws Exception {
-    File tmpRoot = _TestUtil.getTempDir("testSharedLib");
+    File tmpRoot = TestUtil.getTempDir("testSharedLib");
 
     File lib = new File(tmpRoot, "lib");
     lib.mkdirs();
@@ -322,8 +322,8 @@ public class TestCoreContainer extends S
   @Test
   public void testCustomHandlers() throws Exception {
 
-    ConfigSolr config = ConfigSolr.fromString(CUSTOM_HANDLERS_SOLR_XML);
     SolrResourceLoader loader = new SolrResourceLoader("solr/collection1");
+    ConfigSolr config = ConfigSolr.fromString(loader, CUSTOM_HANDLERS_SOLR_XML);
 
     CoreContainer cc = new CoreContainer(loader, config);
     try {

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/core/TestSolrXMLSerializer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/core/TestSolrXMLSerializer.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/core/TestSolrXMLSerializer.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/core/TestSolrXMLSerializer.java Wed Feb 26 14:43:56 2014
@@ -19,7 +19,7 @@ package org.apache.solr.core;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
 import org.apache.solr.core.SolrXMLSerializer.SolrCoreXMLDef;
 import org.apache.solr.core.SolrXMLSerializer.SolrXMLDef;
 import org.junit.Test;
@@ -81,7 +81,7 @@ public class TestSolrXMLSerializer exten
     assertResults(((StringWriter) w).getBuffer().toString().getBytes("UTF-8"));
     
     // again with default file
-    File tmpFile = _TestUtil.createTempFile("solr.xml", null, TEMP_DIR);
+    File tmpFile = TestUtil.createTempFile("solr.xml", null, TEMP_DIR);
     
     serializer.persistFile(tmpFile, solrXMLDef);
 

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/handler/TestCSVLoader.java Wed Feb 26 14:43:56 2014
@@ -17,7 +17,7 @@
 
 package org.apache.solr.handler;
 
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.request.LocalSolrQueryRequest;
 import org.apache.solr.common.params.CommonParams;
@@ -50,7 +50,7 @@ public class TestCSVLoader extends SolrT
     // if you override setUp or tearDown, you better call
     // the super classes version
     super.setUp();
-    File tempDir = _TestUtil.getTempDir("TestCSVLoader");
+    File tempDir = TestUtil.getTempDir("TestCSVLoader");
     file = new File(tempDir, "solr_tmp.csv");
     filename = file.getPath();
     cleanup();

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/handler/TestReplicationHandler.java Wed Feb 26 14:43:56 2014
@@ -47,6 +47,7 @@ import org.apache.lucene.store.SimpleFSD
 import org.apache.lucene.util.LuceneTestCase.Slow;
 import org.apache.solr.BaseDistributedSearchTestCase;
 import org.apache.solr.SolrTestCaseJ4;
+import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
 import org.apache.solr.client.solrj.SolrServer;
 import org.apache.solr.client.solrj.SolrServerException;
 import org.apache.solr.client.solrj.embedded.JettySolrRunner;
@@ -72,6 +73,7 @@ import org.apache.solr.util.AbstractSolr
 import org.apache.solr.util.FileUtils;
 import org.junit.After;
 import org.junit.Before;
+import org.junit.BeforeClass;
 import org.junit.Ignore;
 import org.junit.Test;
 
@@ -82,6 +84,7 @@ import org.junit.Test;
  * @since 1.4
  */
 @Slow
+@SuppressSSL     // does not work yet with SSL
 public class TestReplicationHandler extends SolrTestCaseJ4 {
 
 
@@ -98,8 +101,12 @@ public class TestReplicationHandler exte
   // number of docs to index... decremented for each test case to tell if we accidentally reuse
   // index from previous test method
   static int nDocs = 500;
+  
+  @BeforeClass
+  public static void beforeClass() {
 
-
+  }
+  
   @Before
   public void setUp() throws Exception {
     super.setUp();
@@ -151,8 +158,7 @@ public class TestReplicationHandler exte
   private static SolrServer createNewSolrServer(int port) {
     try {
       // setup the server...
-      String url = "http://127.0.0.1:" + port + context;
-      HttpSolrServer s = new HttpSolrServer(url);
+      HttpSolrServer s = new HttpSolrServer(buildUrl(port));
       s.setConnectionTimeout(15000);
       s.setSoTimeout(60000);
       s.setDefaultMaxConnectionsPerHost(100);
@@ -485,7 +491,7 @@ public class TestReplicationHandler exte
   //jetty servers.
   private void invokeReplicationCommand(int pJettyPort, String pCommand) throws IOException
   {
-    String masterUrl = "http://127.0.0.1:" + pJettyPort + "/solr/replication?command=" + pCommand;
+    String masterUrl = buildUrl(pJettyPort) + "/replication?command=" + pCommand;
     try {
       URL u = new URL(masterUrl);
       InputStream stream = u.openStream();
@@ -638,7 +644,7 @@ public class TestReplicationHandler exte
     
     // todo: make SolrJ easier to pass arbitrary params to
     // TODO: precommit WILL screw with the rest of this test
-    String masterUrl = "http://127.0.0.1:" + masterJetty.getLocalPort() + "/solr/update?prepareCommit=true";
+    String masterUrl = buildUrl(masterJetty.getLocalPort()) + "/update?prepareCommit=true";
     URL url = new URL(masterUrl);
 //    InputStream stream = url.openStream();
 //    try {
@@ -654,8 +660,8 @@ public class TestReplicationHandler exte
     assertEquals(nDocs, masterQueryResult.getNumFound());
 
     // snappull
-    masterUrl = "http://127.0.0.1:" + slaveJetty.getLocalPort() + "/solr/replication?command=fetchindex&masterUrl=";
-    masterUrl += "http://127.0.0.1:" + masterJetty.getLocalPort() + "/solr/replication";
+    masterUrl = buildUrl(slaveJetty.getLocalPort()) + "/replication?command=fetchindex&masterUrl=";
+    masterUrl += buildUrl(masterJetty.getLocalPort()) + "/replication";
     url = new URL(masterUrl);
     InputStream stream = url.openStream();
     try {
@@ -1002,10 +1008,9 @@ public class TestReplicationHandler exte
     String masterUrl;
     URL url;
     InputStream stream;
-    masterUrl = "http://127.0.0.1:" + to.getLocalPort()
-        + "/solr/replication?wait=true&command=fetchindex&masterUrl=";
-    masterUrl += "http://127.0.0.1:" + from.getLocalPort()
-        + "/solr/replication";
+    masterUrl = buildUrl(to.getLocalPort())
+        + "/replication?wait=true&command=fetchindex&masterUrl="
+        + buildUrl(from.getLocalPort()) + "/replication";
     url = new URL(masterUrl);
     stream = url.openStream();
     try {
@@ -1319,7 +1324,7 @@ public class TestReplicationHandler exte
       @Override
       public void run() {
         String masterUrl = 
-          "http://127.0.0.1:" + masterJetty.getLocalPort() + "/solr/replication?command=" + ReplicationHandler.CMD_BACKUP + 
+          buildUrl(masterJetty.getLocalPort()) + "/replication?command=" + ReplicationHandler.CMD_BACKUP + 
           (addNumberToKeepInRequest ? "&" + backupKeepParamName + "=1" : "");
         URL url;
         InputStream stream = null;
@@ -1349,7 +1354,7 @@ public class TestReplicationHandler exte
       }
       @Override
       public void run() {
-        String masterUrl = "http://127.0.0.1:" + masterJetty.getLocalPort() + "/solr/replication?command=" + ReplicationHandler.CMD_DETAILS;
+        String masterUrl = buildUrl(masterJetty.getLocalPort()) + "/replication?command=" + ReplicationHandler.CMD_DETAILS;
         URL url;
         InputStream stream = null;
         try {
@@ -1515,6 +1520,10 @@ public class TestReplicationHandler exte
     fail("timed out waiting for collection1 startAt time to exceed: " + min);
     return min; // compilation neccessity
   }
+  
+  private static String buildUrl(int port) {
+    return buildUrl(port, context);
+  }
 
   private static class SolrInstance {
 

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/handler/component/DistributedDebugComponentTest.java Wed Feb 26 14:43:56 2014
@@ -11,6 +11,7 @@ import org.apache.solr.client.solrj.requ
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.common.SolrInputDocument;
 import org.apache.solr.common.util.NamedList;
+import org.junit.After;
 import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.BeforeClass;
@@ -44,21 +45,6 @@ public class DistributedDebugComponentTe
   @BeforeClass
   public static void beforeTest() throws Exception {
     solrHome = createSolrHome();
-    createJetty(solrHome.getAbsolutePath(), null, null);
-    
-    String url = jetty.getBaseUrl().toString();
-    collection1 = new HttpSolrServer(url);
-    collection2 = new HttpSolrServer(url + "/collection2");
-    
-    String urlCollection1 = jetty.getBaseUrl().toString() + "/" + "collection1";
-    String urlCollection2 = jetty.getBaseUrl().toString() + "/" + "collection2";
-    shard1 = urlCollection1.replaceAll("http://", "");
-    shard2 = urlCollection2.replaceAll("http://", "");
-    
-    //create second core
-    CoreAdminRequest.Create req = new CoreAdminRequest.Create();
-    req.setCoreName("collection2");
-    collection1.request(req);
   }
   
   private static File createSolrHome() throws Exception {
@@ -70,12 +56,6 @@ public class DistributedDebugComponentTe
 
   @AfterClass
   public static void afterTest() throws Exception {
-    collection1.shutdown();
-    collection2.shutdown();
-    collection1 = null;
-    collection2 = null;
-    jetty.stop();
-    jetty=null;
     cleanUpJettyHome(solrHome);
   }
   
@@ -83,6 +63,20 @@ public class DistributedDebugComponentTe
   @Override
   public void setUp() throws Exception {
     super.setUp();
+    createJetty(solrHome.getAbsolutePath(), null, null);
+    String url = jetty.getBaseUrl().toString();
+    collection1 = new HttpSolrServer(url);
+    collection2 = new HttpSolrServer(url + "/collection2");
+    
+    String urlCollection1 = jetty.getBaseUrl().toString() + "/" + "collection1";
+    String urlCollection2 = jetty.getBaseUrl().toString() + "/" + "collection2";
+    shard1 = urlCollection1.replaceAll("https?://", "");
+    shard2 = urlCollection2.replaceAll("https?://", "");
+    
+    //create second core
+    CoreAdminRequest.Create req = new CoreAdminRequest.Create();
+    req.setCoreName("collection2");
+    collection1.request(req);
     
     SolrInputDocument doc = new SolrInputDocument();
     doc.setField("id", "1");
@@ -97,6 +91,17 @@ public class DistributedDebugComponentTe
     
   }
   
+  @After
+  public void tearDown() throws Exception {
+    super.tearDown();
+    collection1.shutdown();
+    collection2.shutdown();
+    collection1 = null;
+    collection2 = null;
+    jetty.stop();
+    jetty=null;
+  }
+  
   @Test
   @SuppressWarnings("unchecked")
   public void testSimpleSearch() throws Exception {

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/request/TestRemoteStreaming.java Wed Feb 26 14:43:56 2014
@@ -19,6 +19,7 @@ package org.apache.solr.request;
 
 import org.apache.commons.io.IOUtils;
 import org.apache.solr.SolrJettyTestBase;
+import org.apache.solr.SolrTestCaseJ4.SuppressSSL;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrServer;
 import org.apache.solr.client.solrj.SolrServerException;
@@ -45,10 +46,11 @@ import java.net.URLEncoder;
 /**
  * See SOLR-2854.
  */
+@SuppressSSL     // does not yet work with ssl - uses raw URL
 public class TestRemoteStreaming extends SolrJettyTestBase {
 
   private static final File solrHomeDirectory = new File(TEMP_DIR, "TestRemoteStreaming");
-
+  
   @BeforeClass
   public static void beforeTest() throws Exception {
     //this one has handleSelect=true which a test here needs

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/response/TestCSVResponseWriter.java Wed Feb 26 14:43:56 2014
@@ -22,7 +22,6 @@ import org.apache.solr.common.SolrDocume
 import org.apache.solr.common.SolrDocumentList;
 import org.apache.solr.common.util.DateUtil;
 import org.apache.solr.request.SolrQueryRequest;
-import org.apache.solr.search.ReturnFields;
 import org.apache.solr.search.SolrReturnFields;
 import org.junit.*;
 
@@ -192,6 +191,24 @@ public class TestCSVResponseWriter exten
         "2,,\n",
       buf.toString());
 
+    // Test function queries
+    rsp.setReturnFields( new SolrReturnFields("sum(1,1),id,exists(foo_i),div(9,1),foo_f", req) );
+    buf = new StringWriter();
+    w.write(buf, req, rsp);
+    assertEquals("\"sum(1,1)\",id,exists(foo_i),\"div(9,1)\",foo_f\n" +
+        "\"\",1,,,1.414\n" +
+        "\"\",2,,,\n",
+        buf.toString());
+
+    // Test transformers
+    rsp.setReturnFields( new SolrReturnFields("mydocid:[docid],[explain]", req) );
+    buf = new StringWriter();
+    w.write(buf, req, rsp);
+    assertEquals("mydocid,[explain]\n" +
+        "\"\",\n" +
+        "\"\",\n",
+        buf.toString());
+
     req.close();
   }
   
@@ -207,6 +224,23 @@ public class TestCSVResponseWriter exten
     assertEquals(2, lines.length);
     assertEquals("XXX,YYY,FOO", lines[0] );
     assertEquals("1,0,hi", lines[1] );
+
+    //assertions specific to multiple pseudofields functions like abs, div, exists, etc.. (SOLR-5423)
+    String funcText = h.query(req("q","*", "wt","csv", "csv.header","true", "fl","XXX:id,YYY:exists(foo_i),exists(shouldbeunstored)"));
+    String[] funcLines = funcText.split("\n");
+    assertEquals(6, funcLines.length);
+    assertEquals("XXX,YYY,exists(shouldbeunstored)", funcLines[0] );
+    assertEquals("1,true,false", funcLines[1] );
+    assertEquals("3,false,true", funcLines[3] );
+    
+    
+    //assertions specific to single function without alias (SOLR-5423)
+    String singleFuncText = h.query(req("q","*", "wt","csv", "csv.header","true", "fl","exists(shouldbeunstored),XXX:id"));
+    String[] singleFuncLines = singleFuncText.split("\n");
+    assertEquals(6, singleFuncLines.length);
+    assertEquals("exists(shouldbeunstored),XXX", singleFuncLines[0] );
+    assertEquals("false,1", singleFuncLines[1] );
+    assertEquals("true,3", singleFuncLines[3] );
   }
     
 

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/schema/TestCollationField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/schema/TestCollationField.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/schema/TestCollationField.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/schema/TestCollationField.java Wed Feb 26 14:43:56 2014
@@ -23,7 +23,7 @@ import java.text.Collator;
 import java.text.RuleBasedCollator;
 import java.util.Locale;
 
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
@@ -63,7 +63,7 @@ public class TestCollationField extends 
    */
   public static String setupSolrHome() throws Exception {
     // make a solr home underneath the test's TEMP_DIR
-    File tmpFile = _TestUtil.getTempDir("collation1");
+    File tmpFile = TestUtil.getTempDir("collation1");
     tmpFile.delete();
     tmpFile.mkdir();
     

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/schema/TestCollationFieldDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/schema/TestCollationFieldDocValues.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/schema/TestCollationFieldDocValues.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/schema/TestCollationFieldDocValues.java Wed Feb 26 14:43:56 2014
@@ -23,7 +23,7 @@ import java.text.Collator;
 import java.text.RuleBasedCollator;
 import java.util.Locale;
 
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
 import org.apache.lucene.util.LuceneTestCase.SuppressCodecs;
 
 import org.apache.commons.io.FileUtils;
@@ -65,7 +65,7 @@ public class TestCollationFieldDocValues
    */
   public static String setupSolrHome() throws Exception {
     // make a solr home underneath the test's TEMP_DIR
-    File tmpFile = _TestUtil.getTempDir("collation1");
+    File tmpFile = TestUtil.getTempDir("collation1");
     tmpFile.delete();
     tmpFile.mkdir();
     

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/search/CursorMarkTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/search/CursorMarkTest.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/search/CursorMarkTest.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/search/CursorMarkTest.java Wed Feb 26 14:43:56 2014
@@ -17,7 +17,7 @@
 
 package org.apache.solr.search;
 
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
 import org.apache.lucene.util.BytesRef;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.common.SolrException.ErrorCode;
@@ -205,7 +205,7 @@ public class CursorMarkTest extends Solr
       if (null == sf) {
         // score or function
         results[i] = (Float) random().nextFloat() * random().nextInt(); break;
-      } else if (0 == _TestUtil.nextInt(random(), 0, 7)) {
+      } else if (0 == TestUtil.nextInt(random(), 0, 7)) {
         // emulate missing value for doc
         results[i] = null;
       } else {
@@ -218,11 +218,11 @@ public class CursorMarkTest extends Solr
 
         Object val = null;
         if (fieldName.equals("id")) {
-          val = sf.getType().unmarshalSortValue(_TestUtil.randomSimpleString(random()));
+          val = sf.getType().unmarshalSortValue(TestUtil.randomSimpleString(random()));
         } else if (fieldName.startsWith("str")) {
-          val = sf.getType().unmarshalSortValue(_TestUtil.randomRealisticUnicodeString(random()));
+          val = sf.getType().unmarshalSortValue(TestUtil.randomRealisticUnicodeString(random()));
         } else if (fieldName.startsWith("bin")) {
-          byte[] randBytes = new byte[_TestUtil.nextInt(random(), 1, 50)];
+          byte[] randBytes = new byte[TestUtil.nextInt(random(), 1, 50)];
           random().nextBytes(randBytes);
           val = new BytesRef(randBytes);
         } else if (fieldName.startsWith("int")) {

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/search/DocSetPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/search/DocSetPerf.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/search/DocSetPerf.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/search/DocSetPerf.java Wed Feb 26 14:43:56 2014
@@ -17,13 +17,10 @@
 
 package org.apache.solr.search;
 
-import org.apache.solr.search.BitDocSet;
-import org.apache.solr.search.HashDocSet;
-import org.apache.solr.search.DocSet;
-import org.apache.lucene.util.OpenBitSet;
-
-import java.util.Random;
 import java.util.BitSet;
+import java.util.Random;
+
+import org.apache.lucene.util.FixedBitSet;
 
 /**
  */
@@ -38,21 +35,20 @@ public class DocSetPerf {
 
   static Random rand = new Random();
 
-
-  static OpenBitSet bs;
+  static FixedBitSet bs;
   static BitDocSet bds;
   static HashDocSet hds;
   static int[] ids; // not unique
 
   static void generate(int maxSize, int bitsToSet) {
-    bs = new OpenBitSet(maxSize);
+    bs = new FixedBitSet(maxSize);
     ids = new int[bitsToSet];
     int count=0;
     if (maxSize>0) {
       for (int i=0; i<bitsToSet; i++) {
         int id=rand.nextInt(maxSize);
         if (!bs.get(id)) {
-          bs.fastSet(id);
+          bs.set(id);
           ids[count++]=id;
         }
       }
@@ -80,7 +76,7 @@ public class DocSetPerf {
 
     int ret=0;
 
-    OpenBitSet[] sets = new OpenBitSet[numSets];
+    FixedBitSet[] sets = new FixedBitSet[numSets];
     DocSet[] bset = new DocSet[numSets];
     DocSet[] hset = new DocSet[numSets];
     BitSet scratch=new BitSet();
@@ -97,14 +93,14 @@ public class DocSetPerf {
     if ("test".equals(test)) {
       for (int it=0; it<iter; it++) {
         generate(randSize ? rand.nextInt(bitSetSize) : bitSetSize, numBitsSet);
-        OpenBitSet bs1=bs;
+        FixedBitSet bs1=bs;
         BitDocSet bds1=bds;
         HashDocSet hds1=hds;
         generate(randSize ? rand.nextInt(bitSetSize) : bitSetSize, numBitsSet);
 
-        OpenBitSet res = ((OpenBitSet)bs1.clone());
+        FixedBitSet res = bs1.clone();
         res.and(bs);
-        int icount = (int)res.cardinality();
+        int icount = res.cardinality();
 
         test(bds1.intersection(bds).size() == icount);
         test(bds1.intersectionSize(bds) == icount);
@@ -167,8 +163,6 @@ public class DocSetPerf {
       }
     }
 
-
-
     long end = System.currentTimeMillis();
     System.out.println("TIME="+(end-start));
 
@@ -176,6 +170,4 @@ public class DocSetPerf {
     System.out.println("ret="+ret);
   }
 
-
-
 }

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/search/ReturnFieldsTest.java Wed Feb 26 14:43:56 2014
@@ -17,13 +17,10 @@
 
 package org.apache.solr.search;
 
+import org.apache.lucene.util.TestUtil;
 import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.common.params.CommonParams;
-import org.apache.solr.request.SolrQueryRequest;
 import org.apache.solr.response.transform.*;
 
-import org.apache.lucene.util._TestUtil;
-
 import org.junit.BeforeClass;
 import org.junit.Test;
 
@@ -184,25 +181,31 @@ public class ReturnFieldsTest extends So
 
   @Test
   public void testFunctions() {
-    ReturnFields rf = new SolrReturnFields( req("fl", "id sum(1,1)") );
+    ReturnFields rf = new SolrReturnFields( req("fl", "exists(text),id,sum(1,1)") );
     assertFalse(rf.wantsScore());
     assertTrue( rf.wantsField( "id" ) );
+    assertTrue( rf.wantsField( "sum(1,1)" ));
+    assertTrue( rf.wantsField( "exists(text)" ));
     assertFalse( rf.wantsAllFields() );
     assertFalse( rf.wantsField( "xxx" ) );
-    assertTrue( rf.getTransformer() instanceof ValueSourceAugmenter);
-    assertEquals("sum(1,1)", ((ValueSourceAugmenter) rf.getTransformer()).name);
+    assertTrue( rf.getTransformer() instanceof DocTransformers);
+    DocTransformers transformers = (DocTransformers)rf.getTransformer();
+    assertEquals("exists(text)", transformers.getTransformer(0).getName());
+    assertEquals("sum(1,1)", transformers.getTransformer(1).getName());
   }
 
   @Test
   public void testTransformers() {
     ReturnFields rf = new SolrReturnFields( req("fl", "[explain]") );
     assertFalse( rf.wantsScore() );
+    assertTrue(rf.wantsField("[explain]"));
     assertFalse(rf.wantsField("id"));
     assertFalse(rf.wantsAllFields());
     assertEquals( "[explain]", rf.getTransformer().getName() );
 
     rf = new SolrReturnFields( req("fl", "[shard],id") );
     assertFalse( rf.wantsScore() );
+    assertTrue(rf.wantsField("[shard]"));
     assertTrue(rf.wantsField("id"));
     assertFalse(rf.wantsField("xxx"));
     assertFalse(rf.wantsAllFields());
@@ -210,6 +213,7 @@ public class ReturnFieldsTest extends So
 
     rf = new SolrReturnFields( req("fl", "[docid]") );
     assertFalse( rf.wantsScore() );
+    assertTrue(rf.wantsField("[docid]"));
     assertFalse( rf.wantsField( "id" ) );
     assertFalse(rf.wantsField("xxx"));
     assertFalse(rf.wantsAllFields());
@@ -217,6 +221,7 @@ public class ReturnFieldsTest extends So
 
     rf = new SolrReturnFields( req("fl", "mydocid:[docid]") );
     assertFalse( rf.wantsScore() );
+    assertTrue(rf.wantsField("mydocid"));
     assertFalse( rf.wantsField( "id" ) );
     assertFalse(rf.wantsField("xxx"));
     assertFalse(rf.wantsAllFields());
@@ -224,6 +229,8 @@ public class ReturnFieldsTest extends So
 
     rf = new SolrReturnFields( req("fl", "[docid][shard]") );
     assertFalse( rf.wantsScore() );
+    assertTrue(rf.wantsField("[docid]"));
+    assertTrue(rf.wantsField("[shard]"));
     assertFalse(rf.wantsField("xxx"));
     assertFalse(rf.wantsAllFields());
     assertTrue( rf.getTransformer() instanceof DocTransformers);
@@ -231,6 +238,7 @@ public class ReturnFieldsTest extends So
 
     rf = new SolrReturnFields( req("fl", "[xxxxx]") );
     assertFalse( rf.wantsScore() );
+    assertTrue(rf.wantsField("[xxxxx]"));
     assertFalse( rf.wantsField( "id" ) );
     assertFalse(rf.wantsAllFields());
     assertNull(rf.getTransformer());
@@ -333,14 +341,14 @@ public class ReturnFieldsTest extends So
       final boolean aliasId = r.nextBoolean();
       final boolean aliasFoo = r.nextBoolean();
 
-      final String id = _TestUtil.randomWhitespace(r, 0, 3) + 
+      final String id = TestUtil.randomWhitespace(r, 0, 3) +
         (aliasId ? "aliasId:" : "") +
         "id" + 
-        _TestUtil.randomWhitespace(r, 1, 3);
-      final String foo_i = _TestUtil.randomWhitespace(r, 0, 3) + 
+        TestUtil.randomWhitespace(r, 1, 3);
+      final String foo_i = TestUtil.randomWhitespace(r, 0, 3) +
         (aliasFoo ? "aliasFoo:" : "") +
         "foo_i" + 
-        _TestUtil.randomWhitespace(r, 0, 3);
+        TestUtil.randomWhitespace(r, 0, 3);
 
       final String fl = id + (r.nextBoolean() ? "" : ",") + foo_i;
       ReturnFields rf = new SolrReturnFields(req("fl", fl));

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/search/TestDocSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/search/TestDocSet.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/search/TestDocSet.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/search/TestDocSet.java Wed Feb 26 14:43:56 2014
@@ -39,9 +39,9 @@ import org.apache.lucene.search.DocIdSet
 import org.apache.lucene.search.DocIdSetIterator;
 import org.apache.lucene.search.Filter;
 import org.apache.lucene.util.Bits;
+import org.apache.lucene.util.FixedBitSet;
+import org.apache.lucene.util.FixedBitSet.FixedBitSetIterator;
 import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util.OpenBitSet;
-import org.apache.lucene.util.OpenBitSetIterator;
 
 /**
  *
@@ -56,46 +56,45 @@ public class TestDocSet extends LuceneTe
     rand = random();
   }
   
-  public OpenBitSet getRandomSet(int sz, int bitsToSet) {
-    OpenBitSet bs = new OpenBitSet(sz);
+  public FixedBitSet getRandomSet(int sz, int bitsToSet) {
+    FixedBitSet bs = new FixedBitSet(sz);
     if (sz==0) return bs;
     for (int i=0; i<bitsToSet; i++) {
-      bs.fastSet(rand.nextInt(sz));
+      bs.set(rand.nextInt(sz));
     }
     return bs;
   }
 
-  public DocSet getHashDocSet(OpenBitSet bs) {
-    int[] docs = new int[(int)bs.cardinality()];
-    OpenBitSetIterator iter = new OpenBitSetIterator(bs);
+  public DocSet getHashDocSet(FixedBitSet bs) {
+    int[] docs = new int[bs.cardinality()];
+    FixedBitSetIterator iter = new FixedBitSetIterator(bs);
     for (int i=0; i<docs.length; i++) {
       docs[i] = iter.nextDoc();
     }
     return new HashDocSet(docs,0,docs.length);
   }
 
-  public DocSet getIntDocSet(OpenBitSet bs) {
-    int[] docs = new int[(int)bs.cardinality()];
-    OpenBitSetIterator iter = new OpenBitSetIterator(bs);
+  public DocSet getIntDocSet(FixedBitSet bs) {
+    int[] docs = new int[bs.cardinality()];
+    FixedBitSetIterator iter = new FixedBitSetIterator(bs);
     for (int i=0; i<docs.length; i++) {
       docs[i] = iter.nextDoc();
     }
     return new SortedIntDocSet(docs);
   }
 
-
-  public DocSet getBitDocSet(OpenBitSet bs) {
+  public DocSet getBitDocSet(FixedBitSet bs) {
     return new BitDocSet(bs);
   }
 
-  public DocSet getDocSlice(OpenBitSet bs) {
-    int len = (int)bs.cardinality();
+  public DocSet getDocSlice(FixedBitSet bs) {
+    int len = bs.cardinality();
     int[] arr = new int[len+5];
     arr[0]=10; arr[1]=20; arr[2]=30; arr[arr.length-1]=1; arr[arr.length-2]=2;
     int offset = 3;
     int end = offset + len;
 
-    OpenBitSetIterator iter = new OpenBitSetIterator(bs);
+    FixedBitSetIterator iter = new FixedBitSetIterator(bs);
     // put in opposite order... DocLists are not ordered.
     for (int i=end-1; i>=offset; i--) {
       arr[i] = iter.nextDoc();
@@ -105,7 +104,7 @@ public class TestDocSet extends LuceneTe
   }
 
 
-  public DocSet getDocSet(OpenBitSet bs) {
+  public DocSet getDocSet(FixedBitSet bs) {
     switch(rand.nextInt(10)) {
       case 0: return getHashDocSet(bs);
 
@@ -124,7 +123,7 @@ public class TestDocSet extends LuceneTe
     return null;
   }
 
-  public void checkEqual(OpenBitSet bs, DocSet set) {
+  public void checkEqual(FixedBitSet bs, DocSet set) {
     for (int i=0; i<set.size(); i++) {
       assertEquals(bs.get(i), set.exists(i));
     }
@@ -152,8 +151,8 @@ public class TestDocSet extends LuceneTe
   protected void doSingle(int maxSize) {
     int sz = rand.nextInt(maxSize+1);
     int sz2 = rand.nextInt(maxSize);
-    OpenBitSet bs1 = getRandomSet(sz, rand.nextInt(sz+1));
-    OpenBitSet bs2 = getRandomSet(sz, rand.nextInt(sz2+1));
+    FixedBitSet bs1 = getRandomSet(sz, rand.nextInt(sz+1));
+    FixedBitSet bs2 = getRandomSet(sz, rand.nextInt(sz2+1));
 
     DocSet a1 = new BitDocSet(bs1);
     DocSet a2 = new BitDocSet(bs2);
@@ -166,10 +165,10 @@ public class TestDocSet extends LuceneTe
     iter(a1,b1);
     iter(a2,b2);
 
-    OpenBitSet a_and = (OpenBitSet) bs1.clone(); a_and.and(bs2);
-    OpenBitSet a_or = (OpenBitSet) bs1.clone(); a_or.or(bs2);
-    // OpenBitSet a_xor = (OpenBitSet)bs1.clone(); a_xor.xor(bs2);
-    OpenBitSet a_andn = (OpenBitSet) bs1.clone(); a_andn.andNot(bs2);
+    FixedBitSet a_and = bs1.clone(); a_and.and(bs2);
+    FixedBitSet a_or = bs1.clone(); a_or.or(bs2);
+    // FixedBitSet a_xor = bs1.clone(); a_xor.xor(bs2);
+    FixedBitSet a_andn = bs1.clone(); a_andn.andNot(bs2);
 
     checkEqual(a_and, b1.intersection(b2));
     checkEqual(a_or, b1.union(b2));
@@ -180,7 +179,6 @@ public class TestDocSet extends LuceneTe
     assertEquals(a_andn.cardinality(), b1.andNotSize(b2));
   }
 
-
   public void doMany(int maxSz, int iter) {
     for (int i=0; i<iter; i++) {
       doSingle(maxSz);
@@ -197,7 +195,7 @@ public class TestDocSet extends LuceneTe
   }
 
   public DocSet getRandomDocSet(int n, int maxDoc) {
-    OpenBitSet obs = new OpenBitSet(maxDoc);
+    FixedBitSet obs = new FixedBitSet(maxDoc);
     int[] a = new int[n];
     for (int i=0; i<n; i++) {
       for(;;) {
@@ -264,7 +262,7 @@ public class TestDocSet extends LuceneTe
   }
   ***/
 
-  public static int smallSetType = 0;  // 0==sortedint, 1==hash, 2==openbitset
+  public static int smallSetType = 0;  // 0==sortedint, 1==hash, 2==FixedBitSet
   public static int smallSetCuttoff=3000;
 
   /***
@@ -474,7 +472,7 @@ public class TestDocSet extends LuceneTe
 
   public void doFilterTest(IndexReader reader) throws IOException {
     IndexReaderContext topLevelContext = reader.getContext();
-    OpenBitSet bs = getRandomSet(reader.maxDoc(), rand.nextInt(reader.maxDoc()+1));
+    FixedBitSet bs = getRandomSet(reader.maxDoc(), rand.nextInt(reader.maxDoc()+1));
     DocSet a = new BitDocSet(bs);
     DocSet b = getIntDocSet(bs);
 

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/search/TestFiltering.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/search/TestFiltering.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/search/TestFiltering.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/search/TestFiltering.java Wed Feb 26 14:43:56 2014
@@ -18,7 +18,7 @@
 package org.apache.solr.search;
 
 
-import org.apache.lucene.util.OpenBitSet;
+import org.apache.lucene.util.FixedBitSet;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.common.SolrException;
@@ -114,18 +114,18 @@ public class TestFiltering extends SolrT
 
   class Model {
     int indexSize;
-    OpenBitSet answer;
-    OpenBitSet multiSelect;
-    OpenBitSet facetQuery;
+    FixedBitSet answer;
+    FixedBitSet multiSelect;
+    FixedBitSet facetQuery;
 
     void clear() {
-      answer = new OpenBitSet(indexSize);
+      answer = new FixedBitSet(indexSize);
       answer.set(0, indexSize);
 
-      multiSelect = new OpenBitSet(indexSize);
+      multiSelect = new FixedBitSet(indexSize);
       multiSelect.set(0, indexSize);
 
-      facetQuery = new OpenBitSet(indexSize);
+      facetQuery = new FixedBitSet(indexSize);
       facetQuery.set(0, indexSize);
     }
   }
@@ -161,8 +161,8 @@ public class TestFiltering extends SolrT
     boolean positive = random().nextBoolean();
     boolean exclude = facetQuery ? false : random().nextBoolean();    // can't exclude a facet query from faceting
 
-    OpenBitSet[] sets = facetQuery ? new OpenBitSet[]{model.facetQuery} :
-        (exclude ? new OpenBitSet[]{model.answer, model.facetQuery} : new OpenBitSet[]{model.answer, model.multiSelect, model.facetQuery});
+    FixedBitSet[] sets = facetQuery ? new FixedBitSet[]{model.facetQuery} :
+        (exclude ? new FixedBitSet[]{model.answer, model.facetQuery} : new FixedBitSet[]{model.answer, model.multiSelect, model.facetQuery});
 
     if (random().nextInt(100) < 50) {
       // frange
@@ -183,33 +183,36 @@ public class TestFiltering extends SolrT
           }
         }
 
-        for (OpenBitSet set : sets) {
+        for (FixedBitSet set : sets) {
           set.clear(0,l);
-          set.clear(u+1, model.indexSize);
+          if (u + 1 < model.indexSize) {
+            set.clear(u+1, model.indexSize);
+          }
         }
       } else {
         // negative frange.. make it relatively small
         l = random().nextInt(model.indexSize);
         u = Math.max(model.indexSize-1, l+random().nextInt(Math.max(model.indexSize / 10, 2)));
 
-        for (OpenBitSet set : sets) {
-          set.clear(l,u+1);
+        for (FixedBitSet set : sets) {
+          int end = Math.min(u+1, set.length());
+          set.clear(l,end);
         }
       }
 
       return frangeStr(!positive, l, u, cache, cost, exclude);
     } else {
       // term or boolean query
-      OpenBitSet pset = new OpenBitSet(model.indexSize);
+      FixedBitSet pset = new FixedBitSet(model.indexSize);
       for (int i=0; i<pset.getBits().length; i++) {
         pset.getBits()[i] = random().nextLong();    // set 50% of the bits on average
       }
       if (positive) {
-        for (OpenBitSet set : sets) {
+        for (FixedBitSet set : sets) {
           set.and(pset);
         }
       } else {
-        for (OpenBitSet set : sets) {
+        for (FixedBitSet set : sets) {
           set.andNot(pset);
         }
       }
@@ -217,8 +220,9 @@ public class TestFiltering extends SolrT
 
       StringBuilder sb = new StringBuilder();
       for (int doc=-1;;) {
+        if (doc+1 >= model.indexSize) break;
         doc = pset.nextSetBit(doc+1);
-        if (doc < 0 || doc >= model.indexSize) break;
+        if (doc < 0) break;
         sb.append((positive ? " ":" -") + f+":"+doc);
       }
 

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/search/TestSort.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/search/TestSort.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/search/TestSort.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/search/TestSort.java Wed Feb 26 14:43:56 2014
@@ -18,7 +18,11 @@
 package org.apache.solr.search;
 
 import java.io.IOException;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import java.util.Random;
 
 import org.apache.lucene.analysis.core.SimpleAnalyzer;
 import org.apache.lucene.document.Document;
@@ -28,16 +32,27 @@ import org.apache.lucene.index.AtomicRea
 import org.apache.lucene.index.DirectoryReader;
 import org.apache.lucene.index.IndexWriter;
 import org.apache.lucene.index.IndexWriterConfig;
-import org.apache.lucene.search.*;
+import org.apache.lucene.search.BitsFilteredDocIdSet;
+import org.apache.lucene.search.Collector;
+import org.apache.lucene.search.DocIdSet;
+import org.apache.lucene.search.Filter;
+import org.apache.lucene.search.IndexSearcher;
+import org.apache.lucene.search.MatchAllDocsQuery;
+import org.apache.lucene.search.ScoreDoc;
+import org.apache.lucene.search.Scorer;
+import org.apache.lucene.search.Sort;
+import org.apache.lucene.search.SortField;
 import org.apache.lucene.search.SortField.Type;
+import org.apache.lucene.search.TopDocs;
+import org.apache.lucene.search.TopFieldCollector;
 import org.apache.lucene.store.Directory;
 import org.apache.lucene.store.RAMDirectory;
 import org.apache.lucene.util.Bits;
-import org.apache.lucene.util.OpenBitSet;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.FixedBitSet;
+import org.apache.lucene.util.TestUtil;
 import org.apache.solr.SolrTestCaseJ4;
-import org.apache.solr.schema.SchemaField;
 import org.apache.solr.request.SolrQueryRequest;
+import org.apache.solr.schema.SchemaField;
 import org.junit.BeforeClass;
 
 public class TestSort extends SolrTestCaseJ4 {
@@ -81,12 +96,12 @@ public class TestSort extends SolrTestCa
 
     for (int i = 0; i < iters; i++) {
       final StringBuilder input = new StringBuilder();
-      final String[] names = new String[_TestUtil.nextInt(r,1,10)];
+      final String[] names = new String[TestUtil.nextInt(r, 1, 10)];
       final boolean[] reverse = new boolean[names.length];
       for (int j = 0; j < names.length; j++) {
         names[j] = null;
         for (int k = 0; k < nonBlankAttempts && null == names[j]; k++) {
-          names[j] = _TestUtil.randomRealisticUnicodeString(r, 1, 100);
+          names[j] = TestUtil.randomRealisticUnicodeString(r, 1, 100);
 
           // munge anything that might make this a function
           names[j] = names[j].replaceFirst("\\{","\\{\\{");
@@ -320,10 +335,10 @@ public class TestSort extends SolrTestCa
   }
 
   public DocIdSet randSet(int sz) {
-    OpenBitSet obs = new OpenBitSet(sz);
+    FixedBitSet obs = new FixedBitSet(sz);
     int n = r.nextInt(sz);
     for (int i=0; i<n; i++) {
-      obs.fastSet(r.nextInt(sz));
+      obs.set(r.nextInt(sz));
     }
     return obs;
   }  

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/servlet/CacheHeaderTest.java Wed Feb 26 14:43:56 2014
@@ -23,24 +23,24 @@ import java.io.Writer;
 import java.util.Arrays;
 import java.util.Date;
 
-import com.google.common.base.Charsets;
 import org.apache.http.Header;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpRequestBase;
 import org.apache.http.impl.cookie.DateUtils;
+import org.apache.lucene.util.TestUtil;
 import org.apache.solr.common.params.CommonParams;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
-import org.apache.lucene.util._TestUtil;
+import com.google.common.base.Charsets;
 
 /**
  * A test case for the several HTTP cache headers emitted by Solr
  */
 public class CacheHeaderTest extends CacheHeaderTestBase {
     private static final File solrHomeDirectory = new File(TEMP_DIR, "CacheHeaderTest");
-
+    
   @BeforeClass
   public static void beforeTest() throws Exception {
     setupJettyTestHome(solrHomeDirectory, "collection1");
@@ -253,7 +253,7 @@ public class CacheHeaderTest extends Cac
 
   protected File makeFile(String contents, String charset) {
     try {
-      File f = _TestUtil.createTempFile("cachetest_csv", null, TEMP_DIR);
+      File f = TestUtil.createTempFile("cachetest_csv", null, TEMP_DIR);
       Writer out = new OutputStreamWriter(new FileOutputStream(f), charset);
       out.write(contents);
       out.close();

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/spelling/SpellCheckCollatorTest.java Wed Feb 26 14:43:56 2014
@@ -21,7 +21,7 @@ import java.util.List;
 import java.util.Set;
 
 import org.apache.lucene.util.LuceneTestCase.Slow;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.common.params.SolrParams;
 import org.apache.solr.common.params.CommonParams;
@@ -38,7 +38,6 @@ import org.apache.solr.request.SolrQuery
 import org.apache.solr.request.SolrRequestHandler;
 import org.apache.solr.response.SolrQueryResponse;
 import org.junit.BeforeClass;
-import org.junit.Ignore;
 import org.junit.Test;
 
 @Slow
@@ -502,7 +501,7 @@ public class SpellCheckCollatorTest exte
     // produce an estimate no more then the total number of docs
     final int iters = atLeast(10);
     for (int iter = 0; iter < iters; iter++) {
-      final int val = _TestUtil.nextInt(random(), 1, 17);
+      final int val = TestUtil.nextInt(random(), 1, 17);
       assertQ(req(reusedParams,
                   CommonParams.Q, "teststop:metnoia",
                   SpellingParams.SPELLCHECK_COLLATE_MAX_COLLECT_DOCS, ""+val)

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/update/SolrCmdDistributorTest.java Wed Feb 26 14:43:56 2014
@@ -62,7 +62,6 @@ public class SolrCmdDistributorTest exte
   
   @BeforeClass
   public static void beforeClass() throws Exception {
-
     // we can't use the Randomized merge policy because the test depends on
     // being able to call optimize to have all deletes expunged.
     System.setProperty("solr.tests.mergePolicy", LogDocMergePolicy.class.getName());
@@ -118,7 +117,7 @@ public class SolrCmdDistributorTest exte
           getSchemaFile());
       jettys.add(j);
       clients.add(createNewSolrServer(j.getLocalPort()));
-      String shardStr = "127.0.0.1:" + j.getLocalPort() + context;
+      String shardStr = buildUrl(j.getLocalPort());
       shardsArr[i] = shardStr;
       sb.append(shardStr);
     }

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/update/TestDocBasedVersionConstraints.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/update/TestDocBasedVersionConstraints.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/update/TestDocBasedVersionConstraints.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/update/TestDocBasedVersionConstraints.java Wed Feb 26 14:43:56 2014
@@ -17,7 +17,7 @@
 
 package org.apache.solr.update;
 
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
 import org.apache.solr.SolrTestCaseJ4;
 import org.apache.solr.common.SolrException;
 import org.apache.solr.util.DefaultSolrThreadFactory;
@@ -363,17 +363,17 @@ public class TestDocBasedVersionConstrai
     // runner = Executors.newFixedThreadPool(1);    // to test single threaded
     try {
       for (int id = 0; id < NUM_DOCS; id++) {
-        final int numAdds = _TestUtil.nextInt(random(),3,MAX_CONCURENT);
-        final int winner = _TestUtil.nextInt(random(),0,numAdds-1);
+        final int numAdds = TestUtil.nextInt(random(), 3, MAX_CONCURENT);
+        final int winner = TestUtil.nextInt(random(), 0, numAdds - 1);
         final int winnerVersion = atLeast(100);
-        final boolean winnerIsDeleted = (0 == _TestUtil.nextInt(random(),0,4));
+        final boolean winnerIsDeleted = (0 == TestUtil.nextInt(random(), 0, 4));
         List<Callable<Object>> tasks = new ArrayList<Callable<Object>>(numAdds);
         for (int variant = 0; variant < numAdds; variant++) {
           final boolean iShouldWin = (variant==winner);
           final long version = (iShouldWin ? winnerVersion 
-                                : _TestUtil.nextInt(random(),1,winnerVersion-1));
+                                : TestUtil.nextInt(random(), 1, winnerVersion - 1));
           if ((iShouldWin && winnerIsDeleted)
-              || (!iShouldWin && 0 == _TestUtil.nextInt(random(),0,4))) {
+              || (!iShouldWin && 0 == TestUtil.nextInt(random(), 0, 4))) {
             tasks.add(delayedDelete(""+id, ""+version));
           } else {
             tasks.add(delayedAdd("id",""+id,"name","name"+id+"_"+variant,

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/util/BitSetPerf.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/util/BitSetPerf.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/util/BitSetPerf.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/util/BitSetPerf.java Wed Feb 26 14:43:56 2014
@@ -17,13 +17,13 @@
 
 package org.apache.solr.util;
 
-import java.util.Random;
 import java.util.BitSet;
+import java.util.Random;
 
-import org.apache.lucene.util.OpenBitSet;
-import org.apache.lucene.util.OpenBitSetIterator;
+import org.apache.lucene.util.FixedBitSet;
+import org.apache.lucene.util.FixedBitSet.FixedBitSetIterator;
 
-/** Performance tester for OpenBitSet.
+/** Performance tester for FixedBitSet.
  * Use -Xbatch for more predictable results, and run tests such that the duration
  * is at least 10 seconds for better accuracy.  Close browsers on your system (javascript
  * or flash may be running and cause more erratic results).
@@ -33,7 +33,7 @@ import org.apache.lucene.util.OpenBitSet
 public class BitSetPerf {
   static Random rand = new Random(0);
 
-  static void randomSets(int maxSize, int bitsToSet, BitSet target1, OpenBitSet target2) {
+  static void randomSets(int maxSize, int bitsToSet, BitSet target1, FixedBitSet target2) {
     for (int i=0; i<bitsToSet; i++) {
       int idx;
       do {
@@ -50,7 +50,7 @@ public class BitSetPerf {
   public static void main(String[] args) {
     if (args.length<5) {
       System.out.println("BitSetTest <bitSetSize> <numSets> <numBitsSet> <testName> <iter> <impl>");
-      System.out.println("  impl => open for OpenBitSet");
+      System.out.println("  impl => open for FixedBitSet");
     }
     int bitSetSize = Integer.parseInt(args[0]);
     int numSets = Integer.parseInt(args[1]);
@@ -60,16 +60,16 @@ public class BitSetPerf {
     String impl = args.length>5 ? args[5].intern() : "bit";
 
     BitSet[] sets = new BitSet[numSets];
-    OpenBitSet[] osets = new OpenBitSet[numSets];
+    FixedBitSet[] osets = new FixedBitSet[numSets];
 
     for (int i=0; i<numSets; i++) {
       sets[i] = new BitSet(bitSetSize);
-      osets[i] = new OpenBitSet(bitSetSize);
+      osets[i] = new FixedBitSet(bitSetSize);
       randomSets(bitSetSize, numBitsSet, sets[i], osets[i]);
     }
 
     BitSet bs = new BitSet(bitSetSize);
-    OpenBitSet obs = new OpenBitSet(bitSetSize);
+    FixedBitSet obs = new FixedBitSet(bitSetSize);
     randomSets(bitSetSize, numBitsSet, bs, obs);
 
 
@@ -82,8 +82,8 @@ public class BitSetPerf {
       for (int it=0; it<iter; it++) {
         for (int i=0; i<numSets; i++) {
           if (impl=="open") {
-            OpenBitSet other=osets[i];
-            obs.union(other);
+            FixedBitSet other=osets[i];
+            obs.or(other);
           } else {
             BitSet other=sets[i];
             bs.or(other);
@@ -108,8 +108,8 @@ public class BitSetPerf {
       for (int it=0; it<iter; it++) {
         for (int i=0; i<numSets; i++) {
           if (impl=="open") {
-            OpenBitSet oset = osets[i];
-            for (int k=0; k<bitSetSize; k++) if (oset.fastGet(k)) ret++;
+            FixedBitSet oset = osets[i];
+            for (int k=0; k<bitSetSize; k++) if (oset.get(k)) ret++;
           } else {
             BitSet bset = sets[i];
             for (int k=0; k<bitSetSize; k++) if (bset.get(k)) ret++;
@@ -122,9 +122,9 @@ public class BitSetPerf {
       for (int it=0; it<iter; it++) {
         for (int i=0; i<numSets-1; i++) {
           if (impl=="open") {
-            OpenBitSet a=osets[i];
-            OpenBitSet b=osets[i+1];
-            ret += OpenBitSet.intersectionCount(a,b);
+            FixedBitSet a=osets[i];
+            FixedBitSet b=osets[i+1];
+            ret += FixedBitSet.intersectionCount(a,b);
           } else {
             BitSet a=sets[i];
             BitSet b=sets[i+1];
@@ -140,7 +140,7 @@ public class BitSetPerf {
       for (int it=0; it<iter; it++) {
         for (int i=0; i<numSets; i++) {
           if (impl=="open") {
-            osets[i] = (OpenBitSet)osets[i].clone();
+            osets[i] = osets[i].clone();
           } else {
             sets[i] = (BitSet)sets[i].clone();
           }
@@ -152,7 +152,7 @@ public class BitSetPerf {
       for (int it=0; it<iter; it++) {
         for (int i=0; i<numSets; i++) {
           if (impl=="open") {
-            final OpenBitSet set = osets[i];
+            final FixedBitSet set = osets[i];
             for(int next=set.nextSetBit(0); next>=0; next=set.nextSetBit(next+1)) {
               ret += next;
             }
@@ -171,8 +171,8 @@ public class BitSetPerf {
       for (int it=0; it<iter; it++) {
         for (int i=0; i<numSets; i++) {
           if (impl=="open") {
-            final OpenBitSet set = osets[i];
-            final OpenBitSetIterator iterator = new OpenBitSetIterator(set);
+            final FixedBitSet set = osets[i];
+            final FixedBitSetIterator iterator = new FixedBitSetIterator(set);
             for(int next=iterator.nextDoc(); next>=0; next=iterator.nextDoc()) {
               ret += next;
             }

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/util/TestFastOutputStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/util/TestFastOutputStream.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/util/TestFastOutputStream.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/util/TestFastOutputStream.java Wed Feb 26 14:43:56 2014
@@ -18,14 +18,9 @@
 package org.apache.solr.util;
 
 import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
 import org.apache.solr.update.MemOutputStream;
 
-import java.util.HashSet;
-import java.util.Locale;
 import java.util.Random;
-import java.util.Set;
-import java.util.TimeZone;
 
 public class TestFastOutputStream extends LuceneTestCase {
 

Modified: lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/util/TimeZoneUtilsTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/util/TimeZoneUtilsTest.java?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/util/TimeZoneUtilsTest.java (original)
+++ lucene/dev/branches/lucene5376/solr/core/src/test/org/apache/solr/util/TimeZoneUtilsTest.java Wed Feb 26 14:43:56 2014
@@ -18,7 +18,7 @@
 package org.apache.solr.util;
 
 import org.apache.lucene.util.LuceneTestCase;
-import org.apache.lucene.util._TestUtil;
+import org.apache.lucene.util.TestUtil;
 
 import java.util.Set;
 import java.util.HashSet;
@@ -117,8 +117,8 @@ public class TimeZoneUtilsTest extends L
     final Random r = random();
     final int iters = atLeast(r, 50);
     for (int i = 0; i <= iters; i++) {
-      int hour = _TestUtil.nextInt(r, 0, 23);
-      int min = _TestUtil.nextInt(r, 0, 59);
+      int hour = TestUtil.nextInt(r, 0, 23);
+      int min = TestUtil.nextInt(r, 0, 59);
 
       String hours = String.format(Locale.ROOT, 
                                    (r.nextBoolean() ? ONE_DIGIT : TWO_DIGIT),

Modified: lucene/dev/branches/lucene5376/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene5376/solr/example/example-schemaless/solr/collection1/conf/solrconfig.xml Wed Feb 26 14:43:56 2014
@@ -72,17 +72,17 @@
        The examples below can be used to load some solr-contribs along 
        with their external dependencies.
     -->
-  <lib dir="../../../contrib/extraction/lib" regex=".*\.jar" />
-  <lib dir="../../../dist/" regex="solr-cell-\d.*\.jar" />
+  <lib dir="../../../../contrib/extraction/lib" regex=".*\.jar" />
+  <lib dir="../../../../dist/" regex="solr-cell-\d.*\.jar" />
 
-  <lib dir="../../../contrib/clustering/lib/" regex=".*\.jar" />
-  <lib dir="../../../dist/" regex="solr-clustering-\d.*\.jar" />
+  <lib dir="../../../../contrib/clustering/lib/" regex=".*\.jar" />
+  <lib dir="../../../../dist/" regex="solr-clustering-\d.*\.jar" />
 
-  <lib dir="../../../contrib/langid/lib/" regex=".*\.jar" />
-  <lib dir="../../../dist/" regex="solr-langid-\d.*\.jar" />
+  <lib dir="../../../../contrib/langid/lib/" regex=".*\.jar" />
+  <lib dir="../../../../dist/" regex="solr-langid-\d.*\.jar" />
 
-  <lib dir="../../../contrib/velocity/lib" regex=".*\.jar" />
-  <lib dir="../../../dist/" regex="solr-velocity-\d.*\.jar" />
+  <lib dir="../../../../contrib/velocity/lib" regex=".*\.jar" />
+  <lib dir="../../../../dist/" regex="solr-velocity-\d.*\.jar" />
 
   <!-- an exact 'path' can be used instead of a 'dir' to specify a 
        specific jar file.  This will cause a serious error to be logged 

Modified: lucene/dev/branches/lucene5376/solr/example/multicore/solr.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/example/multicore/solr.xml?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/example/multicore/solr.xml (original)
+++ lucene/dev/branches/lucene5376/solr/example/multicore/solr.xml Wed Feb 26 14:43:56 2014
@@ -31,5 +31,10 @@
   <cores adminPath="/admin/cores" host="${host:}" hostPort="${jetty.port:8983}" hostContext="${hostContext:solr}">
     <core name="core0" instanceDir="core0" />
     <core name="core1" instanceDir="core1" />
+    
+    <shardHandlerFactory name="shardHandlerFactory" class="HttpShardHandlerFactory">
+      <str name="urlScheme">${urlScheme:}</str>
+    </shardHandlerFactory>
   </cores>
+        
 </solr>

Modified: lucene/dev/branches/lucene5376/solr/example/scripts/cloud-scripts/zkcli.bat
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5376/solr/example/scripts/cloud-scripts/zkcli.bat?rev=1572063&r1=1572062&r2=1572063&view=diff
==============================================================================
--- lucene/dev/branches/lucene5376/solr/example/scripts/cloud-scripts/zkcli.bat (original)
+++ lucene/dev/branches/lucene5376/solr/example/scripts/cloud-scripts/zkcli.bat Wed Feb 26 14:43:56 2014
@@ -8,4 +8,4 @@ REM  Find location of this script
 set SDIR=%~dp0
 if "%SDIR:~-1%"=="\" set SDIR=%SDIR:~0,-1%
 
-"%JVM%" -Dlog4j.configuration=file:%SDIR%\log4j.properties -classpath "%SDIR%\..\..\solr-webapp\webapp\WEB-INF\lib\*;%SDIR%\..\..\lib\ext\*" org.apache.solr.cloud.ZkCLI %*
+"%JVM%" -Dlog4j.configuration="file:%SDIR%\log4j.properties" -classpath "%SDIR%\..\..\solr-webapp\webapp\WEB-INF\lib\*;%SDIR%\..\..\lib\ext\*" org.apache.solr.cloud.ZkCLI %*



Mime
View raw message