You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2017/02/09 20:09:42 UTC
[25/50] lucene-solr:jira/solr-9858: SOLR-10035 Fix dataimport to use
the new names.
SOLR-10035 Fix dataimport to use the new names.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/51ff50d7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/51ff50d7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/51ff50d7
Branch: refs/heads/jira/solr-9858
Commit: 51ff50d76da23137e2b0afe4af130601ba17eab1
Parents: d4ece81
Author: Andrzej Bialecki <ab...@apache.org>
Authored: Mon Feb 6 09:00:56 2017 +0100
Committer: Andrzej Bialecki <ab...@apache.org>
Committed: Mon Feb 6 09:02:06 2017 +0100
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/metrics/SolrMetricInfo.java | 6 +++---
solr/webapp/web/js/angular/controllers/dataimport.js | 2 +-
solr/webapp/web/js/scripts/dataimport.js | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/51ff50d7/solr/core/src/java/org/apache/solr/metrics/SolrMetricInfo.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/metrics/SolrMetricInfo.java b/solr/core/src/java/org/apache/solr/metrics/SolrMetricInfo.java
index f0bc8a1..4d093eb 100644
--- a/solr/core/src/java/org/apache/solr/metrics/SolrMetricInfo.java
+++ b/solr/core/src/java/org/apache/solr/metrics/SolrMetricInfo.java
@@ -30,7 +30,7 @@ public final class SolrMetricInfo {
/**
* Creates a new instance of {@link SolrMetricInfo}.
*
- * @param category the category of the metric (e.g. `QUERYHANDLERS`)
+ * @param category the category of the metric (e.g. `QUERY`)
* @param scope the scope of the metric (e.g. `/admin/ping`)
* @param name the name of the metric (e.g. `Requests`)
*/
@@ -63,8 +63,8 @@ public final class SolrMetricInfo {
/**
* Returns the metric name defined by this object.
* For example, if the name is `Requests`, scope is `/admin/ping`,
- * and category is `QUERYHANDLERS`, then the metric name is
- * `QUERYHANDLERS./admin/ping.Requests`.
+ * and category is `QUERY`, then the metric name is
+ * `QUERY./admin/ping.Requests`.
*
* @return the metric name defined by this object
*/
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/51ff50d7/solr/webapp/web/js/angular/controllers/dataimport.js
----------------------------------------------------------------------
diff --git a/solr/webapp/web/js/angular/controllers/dataimport.js b/solr/webapp/web/js/angular/controllers/dataimport.js
index d8fbc4f..3a26324 100644
--- a/solr/webapp/web/js/angular/controllers/dataimport.js
+++ b/solr/webapp/web/js/angular/controllers/dataimport.js
@@ -22,7 +22,7 @@ solrAdminApp.controller('DataImportController',
$scope.resetMenu("dataimport", Constants.IS_COLLECTION_PAGE);
$scope.refresh = function () {
- Mbeans.info({core: $routeParams.core, cat: 'QUERYHANDLER'}, function (data) {
+ Mbeans.info({core: $routeParams.core, cat: 'QUERY'}, function (data) {
var mbeans = data['solr-mbeans'][1];
$scope.handlers = [];
for (var key in mbeans) {
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/51ff50d7/solr/webapp/web/js/scripts/dataimport.js
----------------------------------------------------------------------
diff --git a/solr/webapp/web/js/scripts/dataimport.js b/solr/webapp/web/js/scripts/dataimport.js
index ef2b896..20532c6 100644
--- a/solr/webapp/web/js/scripts/dataimport.js
+++ b/solr/webapp/web/js/scripts/dataimport.js
@@ -28,7 +28,7 @@ sammy.bind
$.ajax
(
{
- url : core_basepath + '/admin/mbeans?cat=QUERYHANDLER&wt=json',
+ url : core_basepath + '/admin/mbeans?cat=QUERY&wt=json',
dataType : 'json',
beforeSend : function( xhr, settings )
{