IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Rename cacheKey to exprID/requestID

Browse Source 
Depending on context in the code, rename cacheKey
to exprID when it identifies a unique expression,
and rename cacheKey to requestID when it is
identifying a request.
This commit is contained in:
stuart nelson
2016-06-09 12:57:55 +02:00
parent efdb990e56
commit cc64d65c2f
3 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/app/core/services/backend_srv.js
View File

@@ -96,18 +96,18 @@ function (angular, _, coreModule, config) {
this.datasourceRequest = function(options) { this.datasourceRequest = function(options) {
options.retry = options.retry || 0; options.retry = options.retry || 0;
// A cacheKey is provided by the datasource as a unique identifier for a // A requestID is provided by the datasource as a unique identifier for a
// particular query. If the cacheKey exists, the promise it is keyed to // particular query. If the requestID exists, the promise it is keyed to
// is canceled, canceling the previous datasource request if it is still // is canceled, canceling the previous datasource request if it is still
// in-flight. // in-flight.
var canceler; var canceler;
if (options.cacheKey) { if (options.requestID) {
if (canceler = datasourceInFlightRequests[options.cacheKey]) { if (canceler = datasourceInFlightRequests[options.requestID]) {
canceler.resolve(); canceler.resolve();
} }
canceler = $q.defer(); canceler = $q.defer();
options.timeout = canceler.promise; options.timeout = canceler.promise;
datasourceInFlightRequests[options.cacheKey] = canceler; datasourceInFlightRequests[options.requestID] = canceler;
} }
var requestIsLocal = options.url.indexOf('/') === 0; var requestIsLocal = options.url.indexOf('/') === 0;

2
public/app/features/panel/metrics_panel_ctrl.ts
View File

@@ -183,7 +183,7 @@ class MetricsPanelCtrl extends PanelCtrl {
}; };
metricsQuery.targets.forEach(function(target) { metricsQuery.targets.forEach(function(target) {
target.cacheKey = target.expr + target.refId + metricsQuery.panelId; target.exprID = target.expr + target.refId + metricsQuery.panelId;
}); });
return datasource.query(metricsQuery); return datasource.query(metricsQuery);

8
public/app/plugins/datasource/prometheus/datasource.ts
View File

@@ -21,11 +21,11 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
this.withCredentials = instanceSettings.withCredentials; this.withCredentials = instanceSettings.withCredentials;
this.lastErrors = {}; this.lastErrors = {};
this._request = function(method, url, cacheKey) { this._request = function(method, url, requestID) {
var options: any = { var options: any = {
url: this.url + url, url: this.url + url,
method: method, method: method,
cacheKey: cacheKey, requestID: requestID,
}; };
if (this.basicAuth || this.withCredentials) { if (this.basicAuth || this.withCredentials) {
@@ -77,7 +77,7 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
var query: any = {}; var query: any = {};
query.expr = templateSrv.replace(target.expr, options.scopedVars, self.interpolateQueryExpr); query.expr = templateSrv.replace(target.expr, options.scopedVars, self.interpolateQueryExpr);
query.cacheKey = target.cacheKey; query.requestID = target.exprID;
var interval = target.interval || options.interval; var interval = target.interval || options.interval;
var intervalFactor = target.intervalFactor || 1; var intervalFactor = target.intervalFactor || 1;
@@ -128,7 +128,7 @@ export function PrometheusDatasource(instanceSettings, $q, backendSrv, templateS
this.performTimeSeriesQuery = function(query, start, end) { this.performTimeSeriesQuery = function(query, start, end) {
var url = '/api/v1/query_range?query=' + encodeURIComponent(query.expr) + '&start=' + start + '&end=' + end + '&step=' + query.step; var url = '/api/v1/query_range?query=' + encodeURIComponent(query.expr) + '&start=' + start + '&end=' + end + '&step=' + query.step;
return this._request('GET', url, query.cacheKey); return this._request('GET', url, query.requestID);
}; };
this.performSuggestQuery = function(query) { this.performSuggestQuery = function(query) {