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/03 04:13:24 UTC
[1/2] ignite git commit: IGNITE-1703 Show query result.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc1 3c762c5de -> c1325c896
IGNITE-1703 Show query result.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/d1d30253
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/d1d30253
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/d1d30253
Branch: refs/heads/ignite-843-rc1
Commit: d1d302534eec33833bba9231ab3e4cd3d3f8b920
Parents: 3c762c5
Author: vsisko <vs...@gridgain.com>
Authored: Tue Nov 3 10:07:30 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Nov 3 10:07:30 2015 +0700
----------------------------------------------------------------------
.../src/main/js/controllers/sql-controller.js | 29 ++++++++++++++++++--
.../src/main/js/views/sql/sql.jade | 4 +--
2 files changed, 28 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/d1d30253/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 5341c78..f25eef1 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
@@ -26,8 +26,6 @@ consoleModule.controller('sqlController',
$scope.agentGoal = 'execute sql statements';
$scope.agentTestDriveOption = '--test-drive-sql';
- $scope.showMessage = $message.message;
-
$scope.joinTip = $common.joinTip;
$scope.caches = [];
@@ -1306,5 +1304,32 @@ consoleModule.controller('sqlController',
$loading.finish('loadingCacheMetadata');
});
}
+ };
+
+ $scope.showResultQuery = function (paragraph) {
+ if ($common.isDefined(paragraph)) {
+ var title;
+ var queryMsg;
+
+ switch (paragraph.queryArgs.type) {
+ case 'QUERY':
+ title = 'SQL query';
+ queryMsg = paragraph.queryArgs.query;
+
+ break;
+
+ case 'EXPLAIN':
+ title = 'Explain query';
+ queryMsg = paragraph.queryArgs.query;
+
+ break;
+
+ default:
+ title = 'SCAN query';
+ queryMsg = 'SCAN query for cache <b>' + paragraph.queryArgs.cacheName + '</b>';
+ }
+
+ $message.message(title, [queryMsg]);
+ }
}
}]);
http://git-wip-us.apache.org/repos/asf/ignite/blob/d1d30253/modules/control-center-web/src/main/js/views/sql/sql.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/views/sql/sql.jade b/modules/control-center-web/src/main/js/views/sql/sql.jade
index aebae6a..58c739f 100644
--- a/modules/control-center-web/src/main/js/views/sql/sql.jade
+++ b/modules/control-center-web/src/main/js/views/sql/sql.jade
@@ -199,10 +199,8 @@ block container
|  query
div(ng-show='queryExecuted(paragraph) && !paragraph.refreshExecuting()')
-var nextVisibleCondition = 'paragraph.queryId && (paragraph.table() || paragraph.chart() && paragraph.queryExecute() && (paragraph.timeLineSupported() || !paragraph.chartTimeLineEnabled()))'
- -var queryLinkStyle = 'float: left; margin-left: 5px; margin-bottom: 5px;'
hr(style='margin-top: 0; margin-bottom: 5px')
- a(ng-show='paragraph.queryArgs.type != "SCAN"' style=queryLinkStyle ng-click='showMessage("Query", [paragraph.queryArgs.query])') Show query
- label(ng-show='paragraph.queryArgs.type == "SCAN"' style=queryLinkStyle) Scan query
+ a(ng-show='paragraph.queryArgs.type' style='float: left; margin-left: 5px; margin-bottom: 5px' ng-click='showResultQuery(paragraph)') Show query
i.fa.fa-chevron-circle-right(ng-show=nextVisibleCondition style='float: right;margin-right: 10px;' ng-click='nextPage(paragraph)')
a(ng-show=nextVisibleCondition style='float: right; margin-bottom: 5px;margin-right: 5px;' ng-click='nextPage(paragraph)') Next
[2/2] ignite git commit: IGNITE-1749 Fixed properties usage.
Posted by ak...@apache.org.
IGNITE-1749 Fixed properties usage.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c1325c89
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c1325c89
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c1325c89
Branch: refs/heads/ignite-843-rc1
Commit: c1325c89693ad78a61fbdc9cbbeffc6a028d6449
Parents: d1d3025
Author: vsisko <vs...@gridgain.com>
Authored: Tue Nov 3 10:13:32 2015 +0700
Committer: Alexey Kuznetsov <ak...@apache.org>
Committed: Tue Nov 3 10:13:32 2015 +0700
----------------------------------------------------------------------
.../main/js/routes/generator/generator-java.js | 20 ++++++++++----------
1 file changed, 10 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c1325c89/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 74d76d1..32a15e1 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
@@ -802,16 +802,16 @@ $generatorJava.cacheQuery = function (cache, varName, res) {
if (cache.indexedTypes && cache.indexedTypes.length > 0) {
res.emptyLineIfNeeded();
- res.append(varName + '.setIndexedTypes(');
+ res.startBlock(varName + '.setIndexedTypes(');
- _.forEach(cache.indexedTypes, function(pair, ix) {
- if (ix > 0)
- res.append(', ');
+ var len = cache.indexedTypes.length - 1;
- res.append($generatorJava.toJavaCode(res.importClass(pair.keyClass), 'class')).append(', ').append($generatorJava.toJavaCode(res.importClass(pair.valueClass), 'class'))
+ _.forEach(cache.indexedTypes, function(pair, ix) {
+ res.line($generatorJava.toJavaCode(res.importClass(pair.keyClass), 'class') + ', ' +
+ $generatorJava.toJavaCode(res.importClass(pair.valueClass), 'class') + (ix < len ? ',' : ''));
});
- res.line(');');
+ res.endBlock(');');
}
$generatorJava.multiparamProperty(res, varName, cache, 'sqlFunctionClasses', 'class');
@@ -862,9 +862,9 @@ $generatorJava.cacheStore = function (cache, cacheVarName, res) {
switch (storeFactory.dialect) {
case 'DB2':
res.line('dataSource.setServerName(props.getProperty("' + dataSourceBean + '.jdbc.server_name"));');
- res.line('dataSource.setPortNumber(props.getProperty("' + dataSourceBean + '.jdbc.port_number"));');
+ res.line('dataSource.setPortNumber(Integer.valueOf(props.getProperty("' + dataSourceBean + '.jdbc.port_number")));');
res.line('dataSource.setDatabaseName(props.getProperty("' + dataSourceBean + '.jdbc.database_name"));');
- res.line('dataSource.setDriverType(props.getProperty("' + dataSourceBean + '.jdbc.driver_type"));');
+ res.line('dataSource.setDriverType(Integer.valueOf(props.getProperty("' + dataSourceBean + '.jdbc.driver_type")));');
break;
default:
@@ -1578,10 +1578,10 @@ $generatorJava.clusterSsl = function(cluster, res) {
res = $generatorCommon.builder();
if (cluster.sslEnabled && $commonUtils.isDefined(cluster.sslContextFactory)) {
- cluster.sslContextFactory.keyStorePassword = 'props.getProperty("ssl.key.storage.password")';
+ cluster.sslContextFactory.keyStorePassword = 'props.getProperty("ssl.key.storage.password").toCharArray()';
cluster.sslContextFactory.trustStorePassword = ($commonUtils.isDefinedAndNotEmpty(cluster.sslContextFactory.trustStoreFilePath)) ?
- 'props.getProperty("ssl.trust.storage.password")' : undefined;
+ 'props.getProperty("ssl.trust.storage.password").toCharArray()' : undefined;
var propsDesc = $commonUtils.isDefinedAndNotEmpty(cluster.sslContextFactory.trustManagers) ?
$generatorCommon.SSL_CONFIGURATION_TRUST_MANAGER_FACTORY.fields :