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 2016/11/26 17:40:24 UTC
[1/3] lucene-solr:apiv2: SOLR-8029: refactoring
Repository: lucene-solr
Updated Branches:
refs/heads/apiv2 4942f3325 -> 166291751
SOLR-8029: refactoring
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/a919579f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/a919579f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/a919579f
Branch: refs/heads/apiv2
Commit: a919579f42123d626bc4b873325ba1ee37fec479
Parents: 31933ec
Author: Noble Paul <no...@apache.org>
Authored: Sat Nov 26 08:56:00 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Sat Nov 26 08:56:00 2016 +0530
----------------------------------------------------------------------
.../apache/solr/handler/admin/CoreAdminHandlerApi.java | 2 +-
.../java/org/apache/solr/util/JsonSchemaValidator.java | 4 ++--
solr/core/src/java/org/apache/solr/util/PathTrie.java | 12 ++++++------
.../collections.collection.shards.shard.Commands.json | 2 +-
.../src/resources/apispec/core.config.Commands.json | 5 +++--
5 files changed, 13 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a919579f/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandlerApi.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandlerApi.java b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandlerApi.java
index 306bf1e..50579fa 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandlerApi.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandlerApi.java
@@ -55,7 +55,7 @@ public class CoreAdminHandlerApi extends BaseHandlerApiSupport {
SPLIT(PER_CORE_COMMANDS, POST, SPLIT_OP, null, ImmutableMap.of("split.key", "splitKey")),
PREPRECOVERY(PER_CORE_COMMANDS, POST, PREPRECOVERY_OP, "prep-recovery", null),
REQUESTRECOVERY(PER_CORE_COMMANDS, POST, REQUESTRECOVERY_OP, null, null),
- REQUESTSYNCSHARD(PER_CORE_COMMANDS, POST, REQUESTRECOVERY_OP, "request-sync-shard", null),
+ REQUESTSYNCSHARD(PER_CORE_COMMANDS, POST, REQUESTSYNCSHARD_OP, "request-sync-shard", null),
REQUESTBUFFERUPDATES(PER_CORE_COMMANDS, POST, REQUESTBUFFERUPDATES_OP, "request-buffer-updates", null),
REQUESTAPPLYUPDATES(PER_CORE_COMMANDS, POST, REQUESTAPPLYUPDATES_OP, "request-apply-updates", null),
REQUESTSTATUS(PER_CORE_COMMANDS, POST, REQUESTSTATUS_OP, null, null),
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a919579f/solr/core/src/java/org/apache/solr/util/JsonSchemaValidator.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/util/JsonSchemaValidator.java b/solr/core/src/java/org/apache/solr/util/JsonSchemaValidator.java
index 1284678..8775c28 100644
--- a/solr/core/src/java/org/apache/solr/util/JsonSchemaValidator.java
+++ b/solr/core/src/java/org/apache/solr/util/JsonSchemaValidator.java
@@ -261,7 +261,7 @@ public class JsonSchemaValidator {
}
interface TypeValidator {
- void valdateData(String key, Object o, SchemaNode schemaNode, List<String> errs);
+ void validateData(String key, Object o, SchemaNode schemaNode, List<String> errs);
}
enum Type {
@@ -338,7 +338,7 @@ public class JsonSchemaValidator {
void validateData(String key, Object o, SchemaNode attr, List<String> errs) {
if (validator != null) {
- validator.valdateData(key, o, attr, errs);
+ validator.validateData(key, o, attr, errs);
return;
}
if (!typeValidator.test(o))
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a919579f/solr/core/src/java/org/apache/solr/util/PathTrie.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/util/PathTrie.java b/solr/core/src/java/org/apache/solr/util/PathTrie.java
index 3326737..80a613f 100644
--- a/solr/core/src/java/org/apache/solr/util/PathTrie.java
+++ b/solr/core/src/java/org/apache/solr/util/PathTrie.java
@@ -161,23 +161,23 @@ public class PathTrie<T> {
/**
*
- * @param pieces pieces in the url /a/b/c has pieces as 'a' , 'b' , 'c'
+ * @param pathSegments pieces in the url /a/b/c has pieces as 'a' , 'b' , 'c'
* @param index current index of the pieces that we are looking at in /a/b/c 0='a' and 1='b'
* @param templateVariables The mapping of template variable to its value
* @param availableSubPaths If not null , available sub paths will be returned in this set
*/
- public T lookup(List<String> pieces, int index, Map<String, String> templateVariables, Set<String> availableSubPaths) {
- if (templateName != null) templateVariables.put(templateName, pieces.get(index - 1));
- if (pieces.size() < index + 1) {
+ public T lookup(List<String> pathSegments, int index, Map<String, String> templateVariables, Set<String> availableSubPaths) {
+ if (templateName != null) templateVariables.put(templateName, pathSegments.get(index - 1));
+ if (pathSegments.size() < index + 1) {
findAvailableChildren("", availableSubPaths);
return obj;
}
- String piece = pieces.get(index);
+ String piece = pathSegments.get(index);
if (children == null) return null;
Node n = children.get(piece);
if (n == null && !reserved.contains(piece)) n = children.get("");
if (n == null) return null;
- return n.lookup(pieces, index + 1, templateVariables, availableSubPaths);
+ return n.lookup(pathSegments, index + 1, templateVariables, availableSubPaths);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a919579f/solr/core/src/resources/apispec/collections.collection.shards.shard.Commands.json
----------------------------------------------------------------------
diff --git a/solr/core/src/resources/apispec/collections.collection.shards.shard.Commands.json b/solr/core/src/resources/apispec/collections.collection.shards.shard.Commands.json
index 18de4b8..54e4abf 100644
--- a/solr/core/src/resources/apispec/collections.collection.shards.shard.Commands.json
+++ b/solr/core/src/resources/apispec/collections.collection.shards.shard.Commands.json
@@ -16,7 +16,7 @@
"documentation": "https://cwiki.apache.org/confluence/display/solr/Collections+API#CollectionsAPI-ForceLeader",
"type": "object"
},
- "synch-shard": {
+ "sync-shard": {
"type": "object"
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a919579f/solr/core/src/resources/apispec/core.config.Commands.json
----------------------------------------------------------------------
diff --git a/solr/core/src/resources/apispec/core.config.Commands.json b/solr/core/src/resources/apispec/core.config.Commands.json
index 6dc8d4a..d428aee 100644
--- a/solr/core/src/resources/apispec/core.config.Commands.json
+++ b/solr/core/src/resources/apispec/core.config.Commands.json
@@ -147,8 +147,9 @@
"additionalProperties": true
},
"update-listener": {
- "type": "object",
- "additionalProperties": true
+ "#extends#":"core.config.Commands.generic",
+ "description":"",
+ "documentation":""
},
"delete-listener": {
"type": "array",
[2/3] lucene-solr:apiv2: Merge remote-tracking branch 'origin/apiv2'
into apiv2
Posted by no...@apache.org.
Merge remote-tracking branch 'origin/apiv2' into apiv2
Conflicts:
solr/core/src/resources/apispec/core.config.Commands.json
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/6ec8a14f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/6ec8a14f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/6ec8a14f
Branch: refs/heads/apiv2
Commit: 6ec8a14fadc1104becb611508276989aa4fd7e34
Parents: a919579 4942f33
Author: Noble Paul <no...@apache.org>
Authored: Sat Nov 26 08:57:25 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Sat Nov 26 08:57:25 2016 +0530
----------------------------------------------------------------------
.../core/src/java/org/apache/solr/util/JsonSchemaValidator.java | 2 +-
solr/core/src/resources/apispec/core.config.Commands.json | 5 ++---
2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/6ec8a14f/solr/core/src/resources/apispec/core.config.Commands.json
----------------------------------------------------------------------
diff --cc solr/core/src/resources/apispec/core.config.Commands.json
index d428aee,a7e039a..6dc8d4a
--- a/solr/core/src/resources/apispec/core.config.Commands.json
+++ b/solr/core/src/resources/apispec/core.config.Commands.json
@@@ -147,9 -147,9 +147,8 @@@
"additionalProperties": true
},
"update-listener": {
- "#extends#":"core.config.Commands.generic",
- "type":"object",
-- "description":"",
-- "documentation":""
++ "type": "object",
++ "additionalProperties": true
},
"delete-listener": {
"type": "array",
[3/3] lucene-solr:apiv2: SOLR-8029: typos
Posted by no...@apache.org.
SOLR-8029: typos
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/16629175
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/16629175
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/16629175
Branch: refs/heads/apiv2
Commit: 16629175125ef896fa38874739f2e5d38d3cc8e3
Parents: 6ec8a14
Author: Noble Paul <no...@apache.org>
Authored: Sat Nov 26 23:10:05 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Sat Nov 26 23:10:05 2016 +0530
----------------------------------------------------------------------
.../apispec/collections.collection.Commands.json | 15 ++++++++++-----
1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/16629175/solr/core/src/resources/apispec/collections.collection.Commands.json
----------------------------------------------------------------------
diff --git a/solr/core/src/resources/apispec/collections.collection.Commands.json b/solr/core/src/resources/apispec/collections.collection.Commands.json
index ac2120e..dea722e 100644
--- a/solr/core/src/resources/apispec/collections.collection.Commands.json
+++ b/solr/core/src/resources/apispec/collections.collection.Commands.json
@@ -32,7 +32,8 @@
"type": "string",
"description": "Request ID to track this action which will be processed asynchronously"
}
- }
+ },
+ "required":["target", "splitKey"]
},
"balanceshardunique":{
"type":"object",
@@ -50,7 +51,8 @@
"type":"string",
"description": "the actual property"
}
- }
+ },
+ "required":["property"]
},
"rebalance-leaders" :{
"type":"object",
@@ -84,7 +86,7 @@
},
"value": {
"type": "string",
- "description": "he value to assign to the property"
+ "description": "The value to assign to the property"
},
"shardUnique": {
"type": "boolean",
@@ -93,7 +95,9 @@
},
"required": [
"name",
- "value"
+ "value",
+ "shard",
+ "replica"
]
},
"delete-replica-property": {
@@ -113,7 +117,8 @@
"type": "string",
"description": "The property name"
}
- }
+ },
+ "required":["shard","replica","property"]
}
}
}