You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by to...@apache.org on 2015/01/20 10:15:16 UTC
svn commit: r1653213 - in /jackrabbit/oak/trunk/oak-run: ./
src/main/java/org/apache/jackrabbit/oak/benchmark/
Author: tommaso
Date: Tue Jan 20 09:15:16 2015
New Revision: 1653213
URL: http://svn.apache.org/r1653213
Log:
OAK-1799 - added full text benchmark for solr
Added:
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java (with props)
Modified:
jackrabbit/oak/trunk/oak-run/pom.xml
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSearchTest.java
Modified: jackrabbit/oak/trunk/oak-run/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/pom.xml?rev=1653213&r1=1653212&r2=1653213&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-run/pom.xml Tue Jan 20 09:15:16 2015
@@ -257,6 +257,27 @@
</dependency>
<dependency>
<groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-solr-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-solrj</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.solr</groupId>
+ <artifactId>solr-core</artifactId>
+ <version>${lucene.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-core</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
<artifactId>oak-mk-remote</artifactId>
<version>${project.version}</version>
</dependency>
@@ -403,6 +424,17 @@
<artifactId>lucene-queries</artifactId>
<version>${lucene.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-suggest</artifactId>
+ <version>${lucene.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.jackrabbit</groupId>
+ <artifactId>oak-solr-osgi</artifactId> <!-- this is declared here to avoid having it in the jr2 profile too -->
+ <version>${project.version}</version>
+ </dependency>
+
</dependencies>
</profile>
</profiles>
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java?rev=1653213&r1=1653212&r2=1653213&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/BenchmarkRunner.java Tue Jan 20 09:15:16 2015
@@ -77,6 +77,9 @@ public class BenchmarkRunner {
OptionSpec<Boolean> withStorage = parser
.accepts("storage", "Index storage enabled").withOptionalArg()
.ofType(Boolean.class);
+ OptionSpec<String> withServer = parser
+ .accepts("server", "Solr server host").withOptionalArg()
+ .ofType(String.class);
OptionSpec<Boolean> runAsAdmin = parser.accepts("runAsAdmin", "Run test using admin session")
.withRequiredArg().ofType(Boolean.class).defaultsTo(Boolean.FALSE);
OptionSpec<String> runAsUser = parser.accepts("runAsUser", "Run test using admin, anonymous or a test user")
@@ -263,6 +266,10 @@ public class BenchmarkRunner {
wikipedia.value(options),
flatStructure.value(options),
report.value(options), withStorage.value(options)),
+ new FullTextSolrSearchTest(
+ wikipedia.value(options),
+ flatStructure.value(options),
+ report.value(options), withStorage.value(options), withServer.value(options)),
new FindAuthorizableWithScopeTest(numberOfUsers.value(options), setScope.value(options))
};
Modified: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSearchTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSearchTest.java?rev=1653213&r1=1653212&r2=1653213&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSearchTest.java (original)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSearchTest.java Tue Jan 20 09:15:16 2015
@@ -74,7 +74,7 @@ public class FullTextSearchTest extends
/**
* null means true; true means true
*/
- private Boolean storageEnabled;
+ protected Boolean storageEnabled;
public FullTextSearchTest(File dump, boolean flat, boolean doReport, Boolean storageEnabled) {
this.importer = new WikipediaImport(dump, flat, doReport) {
Added: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java?rev=1653213&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java (added)
+++ jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java Tue Jan 20 09:15:16 2015
@@ -0,0 +1,135 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.jackrabbit.oak.benchmark;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.InputStream;
+import java.io.StringReader;
+import javax.jcr.Repository;
+
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
+import org.apache.jackrabbit.oak.Oak;
+import org.apache.jackrabbit.oak.fixture.JcrCreator;
+import org.apache.jackrabbit.oak.fixture.OakRepositoryFixture;
+import org.apache.jackrabbit.oak.fixture.RepositoryFixture;
+import org.apache.jackrabbit.oak.jcr.Jcr;
+import org.apache.jackrabbit.oak.plugins.index.solr.configuration.DefaultSolrConfiguration;
+import org.apache.jackrabbit.oak.plugins.index.solr.configuration.EmbeddedSolrServerConfiguration;
+import org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfiguration;
+import org.apache.jackrabbit.oak.plugins.index.solr.configuration.OakSolrConfigurationProvider;
+import org.apache.jackrabbit.oak.plugins.index.solr.configuration.RemoteSolrServerConfiguration;
+import org.apache.jackrabbit.oak.plugins.index.solr.index.SolrIndexEditorProvider;
+import org.apache.jackrabbit.oak.plugins.index.solr.query.SolrQueryIndexProvider;
+import org.apache.jackrabbit.oak.plugins.index.solr.server.DefaultSolrServerProvider;
+import org.apache.jackrabbit.oak.plugins.index.solr.server.EmbeddedSolrServerProvider;
+import org.apache.jackrabbit.oak.plugins.index.solr.server.SolrServerProvider;
+import org.apache.jackrabbit.oak.plugins.index.solr.util.SolrIndexInitializer;
+import org.apache.solr.client.solrj.SolrServer;
+import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class FullTextSolrSearchTest extends FullTextSearchTest {
+
+ private final Logger log = LoggerFactory.getLogger(getClass());
+
+ private SolrServerProvider serverProvider;
+ private String server;
+
+ public FullTextSolrSearchTest(File dump, boolean flat, boolean doReport, Boolean storageEnabled, String server) {
+ super(dump, flat, doReport, storageEnabled);
+ this.server = server;
+ }
+
+ @Override
+ protected Repository[] createRepository(RepositoryFixture fixture) throws Exception {
+ initializeProvider();
+ if (fixture instanceof OakRepositoryFixture) {
+ return ((OakRepositoryFixture) fixture).setUpCluster(1, new JcrCreator() {
+ @Override
+ public Jcr customize(Oak oak) {
+ OakSolrConfigurationProvider configurationProvider = new OakSolrConfigurationProvider() {
+ public OakSolrConfiguration getConfiguration() {
+ return new DefaultSolrConfiguration() {
+ @Override
+ public int getRows() {
+ return 50;
+ }
+ };
+ }
+ };
+ oak.with(new SolrQueryIndexProvider(serverProvider, configurationProvider))
+ .with(new SolrIndexEditorProvider(serverProvider, configurationProvider))
+ .with(new SolrIndexInitializer(false));
+ return new Jcr(oak);
+ }
+ });
+ }
+ return super.createRepository(fixture);
+ }
+
+ private void initializeProvider() throws Exception {
+ if (server == null || "default".equals(server)) {
+ log.info("spawning Solr locally");
+ serverProvider = createEmbeddedSolrServerProvider(true);
+ } else if (server != null && "embedded".equals(server)) {
+ log.info("using embedded Solr");
+ serverProvider = createEmbeddedSolrServerProvider(false);
+ } else if (server != null && (server.startsWith("http") || server.matches("\\w+\\:\\d{3,5}"))) {
+ log.info("using remote Solr {}", server);
+ RemoteSolrServerConfiguration remoteSolrServerConfiguration = new RemoteSolrServerConfiguration(server, "oak", 2, 2, null, server);
+ serverProvider = remoteSolrServerConfiguration.getProvider();
+ } else {
+ throw new IllegalArgumentException("server parameter value must be either 'embedded', 'default', an URL or an host:port String");
+ }
+ }
+
+ private EmbeddedSolrServerProvider createEmbeddedSolrServerProvider(boolean http) throws Exception {
+ String tempDirectoryPath = FileUtils.getTempDirectoryPath();
+ File solrHome = new File(tempDirectoryPath, "solr" + System.nanoTime());
+ EmbeddedSolrServerConfiguration embeddedSolrServerConfiguration = new EmbeddedSolrServerConfiguration(solrHome.getAbsolutePath(), "", "oak");
+ if (http) {
+ embeddedSolrServerConfiguration = embeddedSolrServerConfiguration.withHttpConfiguration("/solr", 8983);
+ }
+ EmbeddedSolrServerProvider embeddedSolrServerProvider = embeddedSolrServerConfiguration.getProvider();
+ SolrServer solrServer = embeddedSolrServerProvider.getSolrServer();
+ if (storageEnabled != null && !storageEnabled) {
+ // change schema.xml and reload the core
+ File schemaXML = new File(solrHome.getAbsolutePath() + "/oak/conf", "schema.xml");
+ InputStream inputStream = getClass().getResourceAsStream("/solr/oak/conf/schema.xml");
+ String schemaString = IOUtils.toString(inputStream).replace("<dynamicField name=\"*\" type=\"text_general\" indexed=\"true\" stored=\"true\" multiValued=\"true\"/>",
+ "<dynamicField name=\"*\" type=\"text_general\" indexed=\"true\" stored=\"false\" multiValued=\"true\"/>");
+ FileOutputStream fileOutputStream = new FileOutputStream(schemaXML);
+ IOUtils.copy(new StringReader(schemaString), fileOutputStream);
+ fileOutputStream.flush();
+ ((EmbeddedSolrServer) solrServer).getCoreContainer().reload("oak");
+ }
+ return embeddedSolrServerProvider;
+ }
+
+ @Override
+ protected void afterSuite() throws Exception {
+ SolrServer solrServer = serverProvider.getSolrServer();
+ if (solrServer != null) {
+ solrServer.shutdown();
+ }
+ }
+}
Propchange: jackrabbit/oak/trunk/oak-run/src/main/java/org/apache/jackrabbit/oak/benchmark/FullTextSolrSearchTest.java
------------------------------------------------------------------------------
svn:eol-style = native