Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id DFC88200C64 for ; Fri, 28 Apr 2017 14:46:58 +0200 (CEST) Received: by cust-asf.ponee.io (Postfix) id DE76C160B8C; Fri, 28 Apr 2017 12:46:58 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id C1D6E160BBE for ; Fri, 28 Apr 2017 14:46:57 +0200 (CEST) Received: (qmail 1456 invoked by uid 500); 28 Apr 2017 12:46:57 -0000 Mailing-List: contact commits-help@ignite.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.apache.org Delivered-To: mailing list commits@ignite.apache.org Received: (qmail 1322 invoked by uid 99); 28 Apr 2017 12:46:56 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 28 Apr 2017 12:46:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id AC92FE9655; Fri, 28 Apr 2017 12:46:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.apache.org Date: Fri, 28 Apr 2017 12:47:02 -0000 Message-Id: <7693984d8e53400d8325f72e3152aeb4@git.apache.org> In-Reply-To: <1463a575fe514ee5a66e266b66f16723@git.apache.org> References: <1463a575fe514ee5a66e266b66f16723@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [7/8] ignite git commit: IGNITE-4988 Fixed metadata import from RDBMS. archived-at: Fri, 28 Apr 2017 12:46:59 -0000 IGNITE-4988 Fixed metadata import from RDBMS. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/0e8e5dd9 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/0e8e5dd9 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/0e8e5dd9 Branch: refs/heads/ignite-5075-cacheStart Commit: 0e8e5dd99ec647a33f090cde02cf7cddf4a9b24c Parents: 73d4e11 Author: Alexey Kuznetsov Authored: Fri Apr 28 18:06:41 2017 +0700 Committer: Alexey Kuznetsov Committed: Fri Apr 28 18:06:41 2017 +0700 ---------------------------------------------------------------------- .../web-console/backend/app/browsersHandler.js | 4 ++-- .../app/modules/agent/AgentManager.service.js | 20 ++++++++-------- .../agent/handlers/DatabaseListener.java | 24 ++++++++++---------- 3 files changed, 24 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/0e8e5dd9/modules/web-console/backend/app/browsersHandler.js ---------------------------------------------------------------------- diff --git a/modules/web-console/backend/app/browsersHandler.js b/modules/web-console/backend/app/browsersHandler.js index 9f31046..4a03abe 100644 --- a/modules/web-console/backend/app/browsersHandler.js +++ b/modules/web-console/backend/app/browsersHandler.js @@ -155,8 +155,8 @@ module.exports.factory = (_, socketio, configure, errors) => { }); // Return tables from database to browser. - sock.on('schemaImport:tables', (...args) => { - this.executeOnAgent(token(), demo, 'schemaImport:tables', ...args); + sock.on('schemaImport:metadata', (...args) => { + this.executeOnAgent(token(), demo, 'schemaImport:metadata', ...args); }); } http://git-wip-us.apache.org/repos/asf/ignite/blob/0e8e5dd9/modules/web-console/frontend/app/modules/agent/AgentManager.service.js ---------------------------------------------------------------------- diff --git a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js index 4c388f1..db8b493 100644 --- a/modules/web-console/frontend/app/modules/agent/AgentManager.service.js +++ b/modules/web-console/frontend/app/modules/agent/AgentManager.service.js @@ -241,33 +241,33 @@ export default class IgniteAgentManager { } /** - * @param {Object} driverPath - * @param {Object} driverClass - * @param {Object} url + * @param {Object} jdbcDriverJar + * @param {Object} jdbcDriverClass + * @param {Object} jdbcUrl * @param {Object} user * @param {Object} password * @returns {Promise} */ - schemas({driverPath, driverClass, url, user, password}) { + schemas({jdbcDriverJar, jdbcDriverClass, jdbcUrl, user, password}) { const info = {user, password}; - return this._emit('schemaImport:schemas', {driverPath, driverClass, url, info}); + return this._emit('schemaImport:schemas', {jdbcDriverJar, jdbcDriverClass, jdbcUrl, info}); } /** - * @param {Object} driverPath - * @param {Object} driverClass - * @param {Object} url + * @param {Object} jdbcDriverJar + * @param {Object} jdbcDriverClass + * @param {Object} jdbcUrl * @param {Object} user * @param {Object} password * @param {Object} schemas * @param {Object} tablesOnly * @returns {Promise} Promise on list of tables (see org.apache.ignite.schema.parser.DbTable java class) */ - tables({driverPath, driverClass, url, user, password, schemas, tablesOnly}) { + tables({jdbcDriverJar, jdbcDriverClass, jdbcUrl, user, password, schemas, tablesOnly}) { const info = {user, password}; - return this._emit('schemaImport:tables', {driverPath, driverClass, url, info, schemas, tablesOnly}); + return this._emit('schemaImport:metadata', {jdbcDriverJar, jdbcDriverClass, jdbcUrl, info, schemas, tablesOnly}); } /** http://git-wip-us.apache.org/repos/asf/ignite/blob/0e8e5dd9/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/DatabaseListener.java ---------------------------------------------------------------------- diff --git a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/DatabaseListener.java b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/DatabaseListener.java index 745c1f2..d1394c9 100644 --- a/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/DatabaseListener.java +++ b/modules/web-console/web-agent/src/main/java/org/apache/ignite/console/agent/handlers/DatabaseListener.java @@ -59,18 +59,18 @@ public class DatabaseListener { @Override public Object execute(Map args) throws Exception { String driverPath = null; - if (args.containsKey("driverPath")) - driverPath = args.get("driverPath").toString(); + if (args.containsKey("jdbcDriverJar")) + driverPath = args.get("jdbcDriverJar").toString(); - if (!args.containsKey("driverClass")) + if (!args.containsKey("jdbcDriverClass")) throw new IllegalArgumentException("Missing driverClass in arguments: " + args); - String driverCls = args.get("driverClass").toString(); + String driverCls = args.get("jdbcDriverClass").toString(); - if (!args.containsKey("url")) + if (!args.containsKey("jdbcUrl")) throw new IllegalArgumentException("Missing url in arguments: " + args); - String url = args.get("url").toString(); + String url = args.get("jdbcUrl").toString(); if (!args.containsKey("info")) throw new IllegalArgumentException("Missing info in arguments: " + args); @@ -88,18 +88,18 @@ public class DatabaseListener { @Override public Object execute(Map args) throws Exception { String driverPath = null; - if (args.containsKey("driverPath")) - driverPath = args.get("driverPath").toString(); + if (args.containsKey("jdbcDriverJar")) + driverPath = args.get("jdbcDriverJar").toString(); - if (!args.containsKey("driverClass")) + if (!args.containsKey("jdbcDriverClass")) throw new IllegalArgumentException("Missing driverClass in arguments: " + args); - String driverCls = args.get("driverClass").toString(); + String driverCls = args.get("jdbcDriverClass").toString(); - if (!args.containsKey("url")) + if (!args.containsKey("jdbcUrl")) throw new IllegalArgumentException("Missing url in arguments: " + args); - String url = args.get("url").toString(); + String url = args.get("jdbcUrl").toString(); if (!args.containsKey("info")) throw new IllegalArgumentException("Missing info in arguments: " + args);