You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2014/12/26 13:27:35 UTC
svn commit: r1647962 - in /lucene/dev/trunk/solr/core/src:
java/org/apache/solr/handler/SolrConfigHandler.java
test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java
Author: noble
Date: Fri Dec 26 12:27:35 2014
New Revision: 1647962
URL: http://svn.apache.org/r1647962
Log:
SOLR-6770 changed command names to set, update
Modified:
lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java
Modified: lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java?rev=1647962&r1=1647961&r2=1647962&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java (original)
+++ lucene/dev/trunk/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java Fri Dec 26 12:27:35 2014
@@ -257,15 +257,13 @@ public class SolrConfigHandler extends R
for (CommandOperation op : ops) {
switch (op.name) {
case CREATE:
- case MODIFY:
case UPDATE: {
Map<String, Object> map = op.getDataMap();
if (op.hasError()) break;
for (Map.Entry<String, Object> entry : map.entrySet()) {
-
- Map val = map;
+ Map val =null;
String key = entry.getKey();
if (key == null || key.trim().isEmpty()) {
op.addError("null key ");
@@ -290,18 +288,7 @@ public class SolrConfigHandler extends R
}
MapSolrParams old = params.getParams(key);
- if (CREATE.equals(op.name) && (old != null)) {
- op.addError(MessageFormat.format("params exist ''{0}'' , use {1}", key, UPDATE));
- break;
- }
- if (MODIFY.equals(op.name) || UPDATE.equals(op.name)) {
- if (old == null) {
- op.addError(MessageFormat.format("params ''{0}'' does not exist , use {1}", key, CREATE));
- break;
- }
- }
-
- if (op.name.equals(MODIFY)) {
+ if (op.name.equals(UPDATE)) {
LinkedHashMap m = new LinkedHashMap(old.getMap());
m.putAll(val);
val = m;
@@ -554,8 +541,7 @@ public class SolrConfigHandler extends R
public static final String CREATE_REQHANDLER = "create-requesthandler";
public static final String DELETE_REQHANDLER = "delete-requesthandler";
public static final String UPDATE_REQHANDLER = "update-requesthandler";
- public static final String CREATE = "create";
+ public static final String CREATE = "set";
public static final String UPDATE = "update";
- public static final String MODIFY = "modify";
}
Modified: lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java?rev=1647962&r1=1647961&r2=1647962&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java (original)
+++ lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java Fri Dec 26 12:27:35 2014
@@ -85,7 +85,7 @@ public class TestSolrConfigHandlerCloud
RestTestHarness writeHarness = restTestHarnesses.get(random().nextInt(restTestHarnesses.size()));
String payload = " {\n" +
- " 'create' : {'x': {" +
+ " 'set' : {'x': {" +
" 'a':'A val',\n" +
" 'b': 'B val'}\n" +
" }\n" +
@@ -167,7 +167,7 @@ public class TestSolrConfigHandlerCloud
writeHarness = restTestHarnesses.get(random().nextInt(restTestHarnesses.size()));
payload = " {\n" +
- " 'create' : {'y':{\n" +
+ " 'set' : {'y':{\n" +
" 'c':'CY val',\n" +
" 'b': 'BY val'}\n" +
" }\n" +
@@ -211,7 +211,7 @@ public class TestSolrConfigHandlerCloud
5);
payload = " {\n" +
- " 'modify' : {'y': {\n" +
+ " 'update' : {'y': {\n" +
" 'c':'CY val modified',\n" +
" 'e':'EY val',\n" +
" 'b': 'BY val'" +
@@ -241,7 +241,7 @@ public class TestSolrConfigHandlerCloud
10);
payload = " {\n" +
- " 'update' : {'y': {\n" +
+ " 'set' : {'y': {\n" +
" 'p':'P val',\n" +
" 'q': 'Q val'" +
"}\n" +