Apache
/
lucene
mirror of https://github.com/apache/lucene.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SOLR-6770 changed command names to set, update 

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1647962 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Noble Paul 2014-12-26 12:27:35 +00:00
parent a46a46720a
commit e9395306b7
2 changed files with 7 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
View File

@ -257,15 +257,13 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa
for (CommandOperation op : ops) { for (CommandOperation op : ops) {
switch (op.name) { switch (op.name) {
case CREATE: case CREATE:
case MODIFY:
case UPDATE: { case UPDATE: {
Map<String, Object> map = op.getDataMap(); Map<String, Object> map = op.getDataMap();
if (op.hasError()) break; if (op.hasError()) break;
for (Map.Entry<String, Object> entry : map.entrySet()) { for (Map.Entry<String, Object> entry : map.entrySet()) {
Map val =null;
Map val = map;
String key = entry.getKey(); String key = entry.getKey();
if (key == null || key.trim().isEmpty()) { if (key == null || key.trim().isEmpty()) {
op.addError("null key "); op.addError("null key ");
@ -290,18 +288,7 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa
} }
MapSolrParams old = params.getParams(key); MapSolrParams old = params.getParams(key);
if (CREATE.equals(op.name) && (old != null)) { if (op.name.equals(UPDATE)) {
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)) {
LinkedHashMap m = new LinkedHashMap(old.getMap()); LinkedHashMap m = new LinkedHashMap(old.getMap());
m.putAll(val); m.putAll(val);
val = m; val = m;
@ -554,8 +541,7 @@ public class SolrConfigHandler extends RequestHandlerBase implements SolrCoreAwa
public static final String CREATE_REQHANDLER = "create-requesthandler"; public static final String CREATE_REQHANDLER = "create-requesthandler";
public static final String DELETE_REQHANDLER = "delete-requesthandler"; public static final String DELETE_REQHANDLER = "delete-requesthandler";
public static final String UPDATE_REQHANDLER = "update-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 UPDATE = "update";
public static final String MODIFY = "modify";
} }

8
solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerCloud.java
View File

@ -85,7 +85,7 @@ public class TestSolrConfigHandlerCloud extends AbstractFullDistribZkTestBase {
RestTestHarness writeHarness = restTestHarnesses.get(random().nextInt(restTestHarnesses.size())); RestTestHarness writeHarness = restTestHarnesses.get(random().nextInt(restTestHarnesses.size()));
String payload = " {\n" + String payload = " {\n" +
" 'create' : {'x': {" + " 'set' : {'x': {" +
" 'a':'A val',\n" + " 'a':'A val',\n" +
" 'b': 'B val'}\n" + " 'b': 'B val'}\n" +
" }\n" + " }\n" +
@ -167,7 +167,7 @@ public class TestSolrConfigHandlerCloud extends AbstractFullDistribZkTestBase {
writeHarness = restTestHarnesses.get(random().nextInt(restTestHarnesses.size())); writeHarness = restTestHarnesses.get(random().nextInt(restTestHarnesses.size()));
payload = " {\n" + payload = " {\n" +
" 'create' : {'y':{\n" + " 'set' : {'y':{\n" +
" 'c':'CY val',\n" + " 'c':'CY val',\n" +
" 'b': 'BY val'}\n" + " 'b': 'BY val'}\n" +
" }\n" + " }\n" +
@ -211,7 +211,7 @@ public class TestSolrConfigHandlerCloud extends AbstractFullDistribZkTestBase {
5); 5);
payload = " {\n" + payload = " {\n" +
" 'modify' : {'y': {\n" + " 'update' : {'y': {\n" +
" 'c':'CY val modified',\n" + " 'c':'CY val modified',\n" +
" 'e':'EY val',\n" + " 'e':'EY val',\n" +
" 'b': 'BY val'" + " 'b': 'BY val'" +
@ -241,7 +241,7 @@ public class TestSolrConfigHandlerCloud extends AbstractFullDistribZkTestBase {
10); 10);
payload = " {\n" + payload = " {\n" +
" 'update' : {'y': {\n" + " 'set' : {'y': {\n" +
" 'p':'P val',\n" + " 'p':'P val',\n" +
" 'q': 'Q val'" + " 'q': 'Q val'" +
"}\n" + "}\n" +