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/11/11 09:26:08 UTC
[1/3] ignite git commit: IGNITE-1870 WIP on agg functions.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc1 41d5a1436 -> ce83ff394
IGNITE-1870 WIP on agg functions.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/28b9e091
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/28b9e091
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/28b9e091
Branch: refs/heads/ignite-843-rc1
Commit: 28b9e0918bbdca9278033bb207a51b0f322f0b74
Parents: 0a76801
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Tue Nov 10 13:35:19 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Nov 10 13:35:19 2015 +0700
----------------------------------------------------------------------
.../control-center-web/src/main/js/controllers/sql-controller.js | 4 +---
.../control-center-web/src/main/js/public/stylesheets/style.scss | 2 +-
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/28b9e091/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 4048f9e..2eb38d5 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
@@ -114,8 +114,6 @@ consoleModule.controller('sqlController',
if (valCols.length == MAX_VAL_COLS - 1)
valCols.shift();
- item.aggFx = $scope.aggregateFxs[0];
-
valCols.push(item);
_chartApplySettings(paragraph, true);
@@ -471,7 +469,7 @@ consoleModule.controller('sqlController',
_.forEach(paragraph.meta, function (col, idx) {
if (paragraph.columnFilter(col)) {
if (_notObjectType(col.fieldTypeName))
- paragraph.chartColumns.push({value: idx, type: col.fieldTypeName, label: col.fieldName});
+ paragraph.chartColumns.push({value: idx, type: col.fieldTypeName, label: col.fieldName, aggFx: $scope.aggregateFxs[0]});
// Index for explain, execute and fieldName for scan.
var colValue = 'data[' + (paragraph.queryArgs.query ? idx : '"' + col.fieldName + '"') + ']';
http://git-wip-us.apache.org/repos/asf/ignite/blob/28b9e091/modules/control-center-web/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/public/stylesheets/style.scss b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
index 7c1f8a3..be0a341 100644
--- a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
+++ b/modules/control-center-web/src/main/js/public/stylesheets/style.scss
@@ -1629,7 +1629,7 @@ a {
.btn-chart-column-agg-fx {
border: 0;
- margin-left: 10px;
+ margin: 0 0 0 10px;
padding: 0 !important;
}
[2/3] ignite git commit: Merge remote-tracking branch
'origin/ignite-843-rc1' into ignite-843-rc1
Posted by ak...@apache.org.
Merge remote-tracking branch 'origin/ignite-843-rc1' into ignite-843-rc1
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/5d4f968a
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/5d4f968a
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/5d4f968a
Branch: refs/heads/ignite-843-rc1
Commit: 5d4f968a0acba8bdbac3aa91434b908fd0c158d5
Parents: 28b9e09 41d5a14
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Nov 11 15:02:40 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Nov 11 15:02:40 2015 +0700
----------------------------------------------------------------------
.../control-center-web/src/main/js/.gitignore | 3 +-
modules/control-center-web/src/main/js/app.js | 4 -
.../src/main/js/app/modules/navbar/main.js | 28 +
.../main/js/controllers/caches-controller.js | 2 +-
.../main/js/controllers/clusters-controller.js | 2 +-
.../src/main/js/controllers/common-module.js | 9 +-
.../src/main/js/controllers/igfs-controller.js | 2 +-
.../main/js/controllers/metadata-controller.js | 2 +-
.../src/main/js/controllers/models/caches.json | 30 -
.../src/main/js/controllers/models/summary.json | 15 -
.../main/js/controllers/summary-controller.js | 55 +-
modules/control-center-web/src/main/js/db.js | 10 +-
.../src/main/js/gulpfile.js/index.js | 14 +-
.../src/main/js/gulpfile.js/tasks/build.js | 6 +
.../src/main/js/gulpfile.js/tasks/clean.js | 6 +
.../src/main/js/gulpfile.js/tasks/copy.js | 24 +
.../main/js/gulpfile.js/tasks/inject-plugins.js | 47 +
.../src/main/js/gulpfile.js/tasks/jade.js | 16 +-
.../src/main/js/gulpfile.js/tasks/sass.js | 6 +-
.../src/main/js/helpers/data-structures.js | 10 -
.../js/helpers/generator/generator-common.js | 419 ++++
.../js/helpers/generator/generator-docker.js | 53 +
.../main/js/helpers/generator/generator-java.js | 1941 +++++++++++++++++
.../main/js/helpers/generator/generator-pom.js | 145 ++
.../helpers/generator/generator-properties.js | 99 +
.../js/helpers/generator/generator-readme.js | 65 +
.../main/js/helpers/generator/generator-xml.js | 1479 +++++++++++++
.../control-center-web/src/main/js/package.json | 4 +
.../src/main/js/public/js/Blob.js | 211 ++
.../src/main/js/public/js/FileSaver.min.js | 2 +
.../src/main/js/public/js/jszip.min.js | 14 +
.../src/main/js/public/stylesheets/style.scss | 2 -
.../src/main/js/routes/agent.js | 1 +
.../js/routes/generator/generator-common.js | 436 ----
.../js/routes/generator/generator-docker.js | 58 -
.../main/js/routes/generator/generator-java.js | 1956 ------------------
.../main/js/routes/generator/generator-pom.js | 157 --
.../js/routes/generator/generator-properties.js | 111 -
.../js/routes/generator/generator-readme.js | 60 -
.../main/js/routes/generator/generator-xml.js | 1493 -------------
.../src/main/js/routes/metadata.js | 1 +
.../src/main/js/routes/summary.js | 67 -
.../main/js/views/configuration/sidebar.jade | 6 +-
.../main/js/views/configuration/summary.jade | 17 +-
.../src/main/js/views/includes/header.jade | 7 +-
.../src/main/js/views/templates/layout.jade | 18 +-
46 files changed, 4661 insertions(+), 4452 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/5d4f968a/modules/control-center-web/src/main/js/public/stylesheets/style.scss
----------------------------------------------------------------------
[3/3] ignite git commit: IGNITE-843 Minor fixes.
Posted by ak...@apache.org.
IGNITE-843 Minor fixes.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ce83ff39
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ce83ff39
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ce83ff39
Branch: refs/heads/ignite-843-rc1
Commit: ce83ff3946a6f29a09b06dd176ac1b3767b1191f
Parents: 5d4f968
Author: Alexey Kuznetsov <ak...@apache.org>
Authored: Wed Nov 11 15:26:17 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Wed Nov 11 15:26:17 2015 +0700
----------------------------------------------------------------------
.../control-center-web/src/main/js/gulpfile.js/tasks/build.js | 4 ++--
.../control-center-web/src/main/js/gulpfile.js/tasks/clean.js | 2 +-
modules/control-center-web/src/main/js/gulpfile.js/tasks/copy.js | 2 +-
.../src/main/js/gulpfile.js/tasks/inject-plugins.js | 4 ++--
modules/control-center-web/src/main/js/gulpfile.js/tasks/jade.js | 4 ++--
5 files changed, 8 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce83ff39/modules/control-center-web/src/main/js/gulpfile.js/tasks/build.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/gulpfile.js/tasks/build.js b/modules/control-center-web/src/main/js/gulpfile.js/tasks/build.js
index 39191ae..92845cc 100644
--- a/modules/control-center-web/src/main/js/gulpfile.js/tasks/build.js
+++ b/modules/control-center-web/src/main/js/gulpfile.js/tasks/build.js
@@ -1,5 +1,5 @@
-var gulp = require('gulp');
-var gulpSequence = require('gulp-sequence');
+var gulp = require('gulp');
+var gulpSequence = require('gulp-sequence');
gulp.task('build', function(cb) {
gulpSequence('clean', ['copy', 'jade', 'sass'], 'inject:plugins', cb)
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce83ff39/modules/control-center-web/src/main/js/gulpfile.js/tasks/clean.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/gulpfile.js/tasks/clean.js b/modules/control-center-web/src/main/js/gulpfile.js/tasks/clean.js
index f0b6b93..961dd15 100644
--- a/modules/control-center-web/src/main/js/gulpfile.js/tasks/clean.js
+++ b/modules/control-center-web/src/main/js/gulpfile.js/tasks/clean.js
@@ -1,5 +1,5 @@
var gulp = require('gulp');
-var clean = require('gulp-clean');
+var clean = require('gulp-rimraf');
gulp.task('clean', function() {
return gulp.src('./build', {read: false}).pipe(clean());
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce83ff39/modules/control-center-web/src/main/js/gulpfile.js/tasks/copy.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/gulpfile.js/tasks/copy.js b/modules/control-center-web/src/main/js/gulpfile.js/tasks/copy.js
index 8982ba6..260f7f2 100644
--- a/modules/control-center-web/src/main/js/gulpfile.js/tasks/copy.js
+++ b/modules/control-center-web/src/main/js/gulpfile.js/tasks/copy.js
@@ -1,4 +1,4 @@
-var gulp = require('gulp');
+var gulp = require('gulp');
var sequence = require('gulp-sequence');
var paths = [
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce83ff39/modules/control-center-web/src/main/js/gulpfile.js/tasks/inject-plugins.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/gulpfile.js/tasks/inject-plugins.js b/modules/control-center-web/src/main/js/gulpfile.js/tasks/inject-plugins.js
index 5361b84..201a8cf 100644
--- a/modules/control-center-web/src/main/js/gulpfile.js/tasks/inject-plugins.js
+++ b/modules/control-center-web/src/main/js/gulpfile.js/tasks/inject-plugins.js
@@ -1,5 +1,5 @@
-var gulp = require('gulp');
-var inject = require('gulp-inject');
+var gulp = require('gulp');
+var inject = require('gulp-inject');
var common_options = {
read: false
http://git-wip-us.apache.org/repos/asf/ignite/blob/ce83ff39/modules/control-center-web/src/main/js/gulpfile.js/tasks/jade.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/gulpfile.js/tasks/jade.js b/modules/control-center-web/src/main/js/gulpfile.js/tasks/jade.js
index b8ff543..722d2ca 100644
--- a/modules/control-center-web/src/main/js/gulpfile.js/tasks/jade.js
+++ b/modules/control-center-web/src/main/js/gulpfile.js/tasks/jade.js
@@ -1,5 +1,5 @@
-var gulp = require('gulp');
-var jade = require('gulp-jade');
+var gulp = require('gulp');
+var jade = require('gulp-jade');
var sequence = require('gulp-sequence');
var paths = [