You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2011/08/18 23:51:40 UTC
svn commit: r1159428 - in /lucene/dev/branches/branch_3x: ./ lucene/
lucene/backwards/ lucene/backwards/src/test-framework/
lucene/backwards/src/test/ solr/
solr/core/src/java/org/apache/solr/handler/admin/
solr/core/src/test/org/apache/solr/handler/ad...
Author: hossman
Date: Thu Aug 18 21:51:39 2011
New Revision: 1159428
URL: http://svn.apache.org/viewvc?rev=1159428&view=rev
Log:
SOLR-2675: backport r1159418 from trunk: CoreAdminHandler now allows arbitrary properties to be specified when CREATEing a new SolrCore using property.* request params
Added:
lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
- copied, changed from r1159418, lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java
Modified:
lucene/dev/branches/branch_3x/ (props changed)
lucene/dev/branches/branch_3x/lucene/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test/ (props changed)
lucene/dev/branches/branch_3x/lucene/backwards/src/test-framework/ (props changed)
lucene/dev/branches/branch_3x/solr/ (props changed)
lucene/dev/branches/branch_3x/solr/CHANGES.txt
lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
lucene/dev/branches/branch_3x/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java
Modified: lucene/dev/branches/branch_3x/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/CHANGES.txt?rev=1159428&r1=1159427&r2=1159428&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/CHANGES.txt (original)
+++ lucene/dev/branches/branch_3x/solr/CHANGES.txt Thu Aug 18 21:51:39 2011
@@ -94,6 +94,10 @@ New Features
relevant document of each group matching the query. This feature has the
same impact on the StatsComponent. (Martijn van Groningen)
+* SOLR-2675: CoreAdminHandler now allows arbitrary properties to be
+ specified when CREATEing a new SolrCore using property.* request
+ params. (Yury Kats, hossman)
+
Optimizations
----------------------
Modified: lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java?rev=1159428&r1=1159427&r2=1159428&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java Thu Aug 18 21:51:39 2011
@@ -42,6 +42,8 @@ import org.slf4j.LoggerFactory;
import java.io.File;
import java.io.IOException;
import java.util.Date;
+import java.util.Iterator;
+import java.util.Properties;
/**
* @version $Id$
@@ -285,7 +287,19 @@ public class CoreAdminHandler extends Re
if (opts != null)
dcore.setDataDir(opts);
- dcore.setCoreProperties(null);
+ // Process all property.name=value parameters and set them as name=value core properties
+ Properties coreProperties = new Properties();
+ Iterator<String> parameterNamesIterator = params.getParameterNamesIterator();
+ while (parameterNamesIterator.hasNext()) {
+ String parameterName = parameterNamesIterator.next();
+ if(parameterName.startsWith(CoreAdminParams.PROPERTY_PREFIX)) {
+ String parameterValue = params.get(parameterName);
+ String propertyName = parameterName.substring(CoreAdminParams.PROPERTY_PREFIX.length()); // skip prefix
+ coreProperties.put(propertyName, parameterValue);
+ }
+ }
+ dcore.setCoreProperties(coreProperties);
+
SolrCore core = coreContainer.create(dcore);
coreContainer.register(name, core, false);
rsp.add("core", core.getName());
Copied: lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java (from r1159418, lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java?p2=lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java&p1=lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java&r1=1159418&r2=1159428&rev=1159428&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java (original)
+++ lucene/dev/branches/branch_3x/solr/core/src/test/org/apache/solr/handler/admin/CoreAdminHandlerTest.java Thu Aug 18 21:51:39 2011
@@ -59,7 +59,7 @@ public class CoreAdminHandlerTest extend
{
SolrCore template = null;
try {
- template = cores.getCore("collection1");
+ template = cores.getCore("");
instDir = template.getCoreDescriptor().getInstanceDir();
} finally {
if (null != template) template.close();
Modified: lucene/dev/branches/branch_3x/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_3x/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java?rev=1159428&r1=1159427&r2=1159428&view=diff
==============================================================================
--- lucene/dev/branches/branch_3x/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java (original)
+++ lucene/dev/branches/branch_3x/solr/solrj/src/java/org/apache/solr/common/params/CoreAdminParams.java Thu Aug 18 21:51:39 2011
@@ -68,6 +68,9 @@ public interface CoreAdminParams
/** The shard id in solr cloud */
public final static String SHARD = "shard";
+
+ /** Prefix for core property name=value pair **/
+ public final static String PROPERTY_PREFIX = "property.";
/** If you unload a core, delete the index too */
public final static String DELETE_INDEX = "deleteIndex";