You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2017/08/12 05:58:13 UTC
[1/2] lucene-solr:branch_7_0: SOLR-9735: Replace nocommit with link
to ref guide document
Repository: lucene-solr
Updated Branches:
refs/heads/branch_7_0 bb51e92c5 -> 22c5a49e9
SOLR-9735: Replace nocommit with link to ref guide document
(cherry picked from commit 67de1a3)
(cherry picked from commit 4de466e)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/014763d2
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/014763d2
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/014763d2
Branch: refs/heads/branch_7_0
Commit: 014763d22135065d2a0ef8a6e720407c3f53eccc
Parents: bb51e92
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Fri Aug 11 19:48:35 2017 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Sat Aug 12 11:27:50 2017 +0530
----------------------------------------------------------------------
solr/solrj/src/resources/apispec/autoscaling.Commands.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/014763d2/solr/solrj/src/resources/apispec/autoscaling.Commands.json
----------------------------------------------------------------------
diff --git a/solr/solrj/src/resources/apispec/autoscaling.Commands.json b/solr/solrj/src/resources/apispec/autoscaling.Commands.json
index 5ff89ef..93adc5e 100644
--- a/solr/solrj/src/resources/apispec/autoscaling.Commands.json
+++ b/solr/solrj/src/resources/apispec/autoscaling.Commands.json
@@ -1,5 +1,5 @@
{
- "documentation": "TODO NOCOMMIT",
+ "documentation": "https://lucene.apache.org/solr/guide/solrcloud-autoscaling-api.html",
"description": "The Scaling API provides API for adding cluster level scaling rules, triggers and event listeners",
"methods": [
"GET",
[2/2] lucene-solr:branch_7_0: Enable validation checks on JSON files
Posted by sh...@apache.org.
Enable validation checks on JSON files
(cherry picked from commit 575eead)
(cherry picked from commit 461711c)
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/22c5a49e
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/22c5a49e
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/22c5a49e
Branch: refs/heads/branch_7_0
Commit: 22c5a49e9164e880f3fbebba6eda62d9c132ce60
Parents: 014763d
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Sat Aug 12 11:05:19 2017 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Sat Aug 12 11:28:04 2017 +0530
----------------------------------------------------------------------
build.xml | 2 +-
.../src/test-files/modelExamples/fq-model.json | 41 ++++++-----
.../test-files/modelExamples/linear-model.json | 71 ++++++++++++--------
3 files changed, 67 insertions(+), 47 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/22c5a49e/build.xml
----------------------------------------------------------------------
diff --git a/build.xml b/build.xml
index 79326e9..f2043e2 100755
--- a/build.xml
+++ b/build.xml
@@ -138,7 +138,7 @@
'java', 'jflex', 'py', 'pl', 'g4', 'jj', 'html', 'js',
'css', 'xml', 'xsl', 'vm', 'sh', 'cmd', 'bat', 'policy',
'properties', 'mdtext',
- 'template', 'adoc',
+ 'template', 'adoc', 'json',
];
def invalidPatterns = [
(~$/@author\b/$) : '@author javadoc tag',
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/22c5a49e/solr/contrib/ltr/src/test-files/modelExamples/fq-model.json
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test-files/modelExamples/fq-model.json b/solr/contrib/ltr/src/test-files/modelExamples/fq-model.json
index b5d631f..93e69d7 100644
--- a/solr/contrib/ltr/src/test-files/modelExamples/fq-model.json
+++ b/solr/contrib/ltr/src/test-files/modelExamples/fq-model.json
@@ -1,20 +1,25 @@
{
- "class":"org.apache.solr.ltr.model.LinearModel",
- "name":"fqmodel",
- "features":[
- {
- "name":"matchedTitle",
- "norm": {
- "class":"org.apache.solr.ltr.norm.MinMaxNormalizer",
- "params":{ "min":"0.0f", "max":"10.0f" }
- }
- },
- { "name":"popularity"}
- ],
- "params":{
- "weights": {
- "matchedTitle": 0.5,
- "popularity": 0.5
- }
- }
+ "class":"org.apache.solr.ltr.model.LinearModel",
+ "name":"fqmodel",
+ "features":[
+ {
+ "name": "matchedTitle",
+ "norm": {
+ "class": "org.apache.solr.ltr.norm.MinMaxNormalizer",
+ "params": {
+ "min": "0.0f",
+ "max": "10.0f"
+ }
+ }
+ },
+ {
+ "name": "popularity"
+ }
+ ],
+ "params": {
+ "weights": {
+ "matchedTitle": 0.5,
+ "popularity": 0.5
+ }
+ }
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/22c5a49e/solr/contrib/ltr/src/test-files/modelExamples/linear-model.json
----------------------------------------------------------------------
diff --git a/solr/contrib/ltr/src/test-files/modelExamples/linear-model.json b/solr/contrib/ltr/src/test-files/modelExamples/linear-model.json
index 6b46dca..36d7961 100644
--- a/solr/contrib/ltr/src/test-files/modelExamples/linear-model.json
+++ b/solr/contrib/ltr/src/test-files/modelExamples/linear-model.json
@@ -1,30 +1,45 @@
{
- "class":"org.apache.solr.ltr.model.LinearModel",
- "name":"6029760550880411648",
- "features":[
- {"name":"title"},
- {"name":"description"},
- {"name":"keywords"},
- {
- "name":"popularity",
- "norm": {
- "class":"org.apache.solr.ltr.norm.MinMaxNormalizer",
- "params":{ "min":"0.0f", "max":"10.0f" }
- }
- },
- {"name":"text"},
- {"name":"queryIntentPerson"},
- {"name":"queryIntentCompany"}
- ],
- "params":{
- "weights": {
- "title": 0.0000000000,
- "description": 0.1000000000,
- "keywords": 0.2000000000,
- "popularity": 0.3000000000,
- "text": 0.4000000000,
- "queryIntentPerson":0.1231231,
- "queryIntentCompany":0.12121211
- }
- }
+ "class": "org.apache.solr.ltr.model.LinearModel",
+ "name": "6029760550880411648",
+ "features": [
+ {
+ "name": "title"
+ },
+ {
+ "name": "description"
+ },
+ {
+ "name": "keywords"
+ },
+ {
+ "name": "popularity",
+ "norm": {
+ "class": "org.apache.solr.ltr.norm.MinMaxNormalizer",
+ "params": {
+ "min": "0.0f",
+ "max": "10.0f"
+ }
+ }
+ },
+ {
+ "name": "text"
+ },
+ {
+ "name": "queryIntentPerson"
+ },
+ {
+ "name": "queryIntentCompany"
+ }
+ ],
+ "params": {
+ "weights": {
+ "title": 0.0000000000,
+ "description": 0.1000000000,
+ "keywords": 0.2000000000,
+ "popularity": 0.3000000000,
+ "text": 0.4000000000,
+ "queryIntentPerson": 0.1231231,
+ "queryIntentCompany": 0.12121211
+ }
+ }
}