You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by ak...@apache.org on 2015/09/25 13:15:10 UTC
[1/2] ignite git commit: IGNITE-843 WIP Live charts.
Repository: ignite
Updated Branches:
refs/heads/ignite-843 5b29c1ad8 -> 6e984c871
IGNITE-843 WIP Live charts.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/99b8a1c4
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/99b8a1c4
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/99b8a1c4
Branch: refs/heads/ignite-843
Commit: 99b8a1c495143ca14ec2910d2a5294ae318e9b65
Parents: 5b29c1a
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Sep 25 18:14:14 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Sep 25 18:14:14 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/sql-controller.js | 74 ++++++++++++++------
1 file changed, 53 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/99b8a1c4/modules/control-center-web/src/main/js/controllers/sql-controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/controllers/sql-controller.js b/modules/control-center-web/src/main/js/controllers/sql-controller.js
index 1e4bbf0..1f66919 100644
--- a/modules/control-center-web/src/main/js/controllers/sql-controller.js
+++ b/modules/control-center-web/src/main/js/controllers/sql-controller.js
@@ -21,6 +21,11 @@ controlCenterModule.controller('sqlController',
function ($scope, $window, $controller, $http, $timeout, $common, $confirm, $interval, $popover, $loading) {
// Initialize the super class and extend it.
angular.extend(this, $controller('agent-download', {$scope: $scope}));
+
+ var TIME_LINE = 'TIME_LINE';
+
+ var chartHistory = [];
+
$scope.agentGoal = 'execute sql statements';
$scope.agentTestDriveOption = '--test-drive-sql';
@@ -57,7 +62,7 @@ controlCenterModule.controller('sqlController',
};
$scope.acceptValColumn = function(paragraph, item) {
- var accepted = acceptableColumn(paragraph.chartValCols, item);
+ var accepted = acceptableColumn(paragraph.chartValCols, item) && item.label != TIME_LINE;
if (accepted) {
$timeout(function () {
@@ -106,16 +111,20 @@ controlCenterModule.controller('sqlController',
var paragraphId = 0;
function enhanceParagraph(paragraph) {
+ paragraph.nonEmpty = function () {
+ return this.rows && this.rows.length > 0;
+ };
+
paragraph.chart = function () {
return this.result != 'table' && this.result != 'none';
};
- paragraph.nonEmpty = function () {
- return this.rows && this.rows.length > 0;
+ paragraph.chartColumnsConfigured = function () {
+ return !$common.isEmptyArray(this.chartKeyCols) && !$common.isEmptyArray(this.chartValCols);
};
- paragraph.hasChartColumns = function () {
- return !$common.isEmptyArray(this.chartKeyCols) && !$common.isEmptyArray(this.chartValCols);
+ paragraph.chartTimeLineEnabled = function () {
+ return !$common.isEmptyArray(this.chartKeyCols) && this.chartKeyCols[0].label == TIME_LINE;
};
Object.defineProperty(paragraph, 'gridOptions', { value: {
@@ -343,6 +352,9 @@ controlCenterModule.controller('sqlController',
}
});
+ if (paragraph.chartColumns.length > 0)
+ paragraph.chartColumns.push({value: -1, label: TIME_LINE});
+
paragraph.gridOptions.api.setColumnDefs(columnDefs);
paragraph.chartKeyCols = _retainColumns(paragraph.chartColumns, paragraph.chartKeyCols, 0);
@@ -418,6 +430,12 @@ controlCenterModule.controller('sqlController',
paragraph.rows = res.rows;
+ // Add results to history.
+ chartHistory.push({tm: new Date(), rows: res.rows});
+
+ if (chartHistory.size > 100)
+ chartHistory.shift();
+
paragraph.gridOptions.api.showLoading(false);
paragraph.gridOptions.api.setRowData(res.rows);
@@ -434,10 +452,6 @@ controlCenterModule.controller('sqlController',
};
var _executeRefresh = function (paragraph) {
- // TODO IGNITE-843 Temporary disable charts refresh by timer
- if (paragraph.rate.installed && paragraph.chart())
- return;
-
$http.post('/agent/query', paragraph.queryArgs)
.success(_processQueryResult(paragraph))
.error(function (errMsg) {
@@ -448,6 +462,16 @@ controlCenterModule.controller('sqlController',
$scope.execute = function (paragraph) {
_saveNotebook();
+ if (paragraph.prevQuery) {
+ if (paragraph.prevQuery != paragraph.query) {
+ chartHistory = [];
+
+ paragraph.prevQuery = paragraph.query;
+ }
+ }
+ else
+ paragraph.prevQuery = paragraph.query;
+
paragraph.queryArgs = { query: paragraph.query, pageSize: paragraph.pageSize, cacheName: paragraph.cacheName };
paragraph.gridOptions.api.showLoading(true);
@@ -669,7 +693,7 @@ controlCenterModule.controller('sqlController',
function _chartDatumLblNum(paragraph) {
var datum = [];
- if (paragraph.hasChartColumns()) {
+ if (paragraph.chartColumnsConfigured() && !paragraph.chartTimeLineEnabled()) {
paragraph.chartValCols.forEach(function (valCol) {
var index = 0;
@@ -687,20 +711,28 @@ controlCenterModule.controller('sqlController',
return datum;
}
-
function _chartDatumNumNum(paragraph) {
var datum = [];
- if (paragraph.hasChartColumns()) {
+ if (paragraph.chartColumnsConfigured()) {
paragraph.chartValCols.forEach(function (valCol) {
var index = 0;
-
- var values = _.map(paragraph.rows, function (row) {
- return {
- x: _chartNumber(row, paragraph.chartKeyCols[0].value, index++),
- y: _chartNumber(row, valCol.value, 0)
- }
- });
+ var values = [];
+
+ if (paragraph.chartTimeLineEnabled())
+ values = _.map(chartHistory, function (history) {
+ return {
+ x: history.tm,
+ y: _chartNumber(history.rows[0], valCol.value, 0)
+ }
+ });
+ else
+ values = _.map(paragraph.rows, function (row) {
+ return {
+ x: _chartNumber(row, paragraph.chartKeyCols[0].value, index++),
+ y: _chartNumber(row, valCol.value, 0)
+ }
+ });
datum.push({key: valCol.label, values: values});
});
@@ -719,7 +751,7 @@ controlCenterModule.controller('sqlController',
var xAxisLabel = 'X';
var yAxisLabel = 'Y';
- if (paragraph.hasChartColumns()) {
+ if (paragraph.chartColumnsConfigured()) {
xAxisLabel = _.map(paragraph.chartKeyCols, _colLabel).join(', ');
yAxisLabel = _.map(paragraph.chartValCols, _colLabel).join(', ');
}
@@ -810,7 +842,7 @@ controlCenterModule.controller('sqlController',
var datum = [];
- if (paragraph.hasChartColumns())
+ if (paragraph.chartColumnsConfigured())
datum = paragraph.rows;
_insertChart(paragraph, d.values, chart, first);
[2/2] ignite git commit: IGNITE-1546 Fixed DB datasource code
generation.
Posted by ak...@apache.org.
IGNITE-1546 Fixed DB datasource code generation.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/6e984c87
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/6e984c87
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/6e984c87
Branch: refs/heads/ignite-843
Commit: 6e984c871d952609e9499cf5b648d5526ec5e56b
Parents: 99b8a1c
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Fri Sep 25 18:15:11 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Fri Sep 25 18:15:11 2015 +0700
----------------------------------------------------------------------
.../src/main/js/routes/generator/generator-java.js | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/6e984c87/modules/control-center-web/src/main/js/routes/generator/generator-java.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/routes/generator/generator-java.js b/modules/control-center-web/src/main/js/routes/generator/generator-java.js
index 880e159..dc4eebc 100644
--- a/modules/control-center-web/src/main/js/routes/generator/generator-java.js
+++ b/modules/control-center-web/src/main/js/routes/generator/generator-java.js
@@ -775,7 +775,18 @@ $generatorJava.cacheStore = function (cache, varName, res) {
$generatorJava.declareVariable(res, true, dsVarName, dsClsName);
- res.line(dsVarName + '.setURL(_URL_);');
+ switch (storeFactory.dialect) {
+ case 'DB2':
+ res.line(dsVarName + '.setServerName(_SERVER_NAME_);');
+ res.line(dsVarName + '.setPortNumber(_PORT_NUMBER_);');
+ res.line(dsVarName + '.setDatabaseName(_DATABASE_NAME_);');
+ res.line(dsVarName + '.setDriverType(_DRIVER_TYPE_);');
+ break;
+
+ default:
+ res.line(dsVarName + '.setURL(_URL_);');
+ }
+
res.line(dsVarName + '.setUsername(_User_Name_);');
res.line(dsVarName + '.setPassword(_Password_);');
}