Return-Path: X-Original-To: apmail-ignite-commits-archive@minotaur.apache.org Delivered-To: apmail-ignite-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BD18A1739E for ; Tue, 13 Jan 2015 04:27:59 +0000 (UTC) Received: (qmail 39365 invoked by uid 500); 13 Jan 2015 04:28:01 -0000 Delivered-To: apmail-ignite-commits-archive@ignite.apache.org Received: (qmail 39336 invoked by uid 500); 13 Jan 2015 04:28:01 -0000 Mailing-List: contact commits-help@ignite.incubator.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@ignite.incubator.apache.org Delivered-To: mailing list commits@ignite.incubator.apache.org Received: (qmail 39327 invoked by uid 99); 13 Jan 2015 04:28:01 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Jan 2015 04:28:01 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED,T_RP_MATCHES_RCVD X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO mail.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with SMTP; Tue, 13 Jan 2015 04:27:34 +0000 Received: (qmail 35909 invoked by uid 99); 13 Jan 2015 04:27:31 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 13 Jan 2015 04:27:31 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 47BD6A058F4; Tue, 13 Jan 2015 04:27:31 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sboikov@apache.org To: commits@ignite.incubator.apache.org Message-Id: <4ff096a9a5a940c387ce18f0de443239@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: incubator-ignite git commit: # IGNITE-32 WIP: GUI: added sort for schemas and tables. Date: Tue, 13 Jan 2015 04:27:31 +0000 (UTC) X-Virus-Checked: Checked by ClamAV on apache.org Repository: incubator-ignite Updated Branches: refs/heads/ignite-32 81d251141 -> 2a89ce079 # IGNITE-32 WIP: GUI: added sort for schemas and tables. Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/2a89ce07 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/2a89ce07 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/2a89ce07 Branch: refs/heads/ignite-32 Commit: 2a89ce07916886d464ab65aa4197a84b3adecb65 Parents: 81d2511 Author: AKuznetsov Authored: Tue Jan 13 11:27:55 2015 +0700 Committer: AKuznetsov Committed: Tue Jan 13 11:27:55 2015 +0700 ---------------------------------------------------------------------- .../org/apache/ignite/schema/db/DbMetadataParser.java | 6 +++--- .../org/apache/ignite/schema/ui/SchemaLoadApp.java | 14 +++++++------- 2 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a89ce07/modules/schema-load/src/main/java/org/apache/ignite/schema/db/DbMetadataParser.java ---------------------------------------------------------------------- diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/db/DbMetadataParser.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/db/DbMetadataParser.java index e43394f..ecc7ef2 100644 --- a/modules/schema-load/src/main/java/org/apache/ignite/schema/db/DbMetadataParser.java +++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/db/DbMetadataParser.java @@ -184,11 +184,11 @@ public class DbMetadataParser { * @return Map with schemes and tables metadata. * @throws SQLException If parsing failed. */ - public static LinkedHashMap> parse(Connection conn) + public static Map> parse(Connection conn) throws SQLException { DatabaseMetaData meta = conn.getMetaData(); - LinkedHashMap> res = new LinkedHashMap<>(); + Map> res = new HashMap<>(); try (ResultSet schemas = meta.getSchemas()) { while (schemas.next()) { @@ -200,7 +200,7 @@ public class DbMetadataParser { String catalog = schemas.getString(2); - LinkedHashMap items = new LinkedHashMap<>(); + Map items = new HashMap<>(); try (ResultSet tbls = meta.getTables(catalog, schema, "%", null)) { while (tbls.next()) { http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/2a89ce07/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java ---------------------------------------------------------------------- diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java index 92fa7ea..6a57d8d 100644 --- a/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java +++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/ui/SchemaLoadApp.java @@ -129,7 +129,7 @@ public class SchemaLoadApp extends Application { private String replace; /** Map with types metadata. */ - private LinkedHashMap> metas; + private Map> metas; /** Map with fields descriptors. */ private Map>> fields = Collections.emptyMap(); @@ -213,16 +213,16 @@ public class SchemaLoadApp extends Application { metas = DbMetadataParser.parse(conn); } - fields = U.newHashMap(metas.size()); - fieldsPrev = U.newHashMap(metas.size()); + fields = new TreeMap<>(); + fieldsPrev = new TreeMap<>(); - for (Map.Entry> meta : metas.entrySet()) { + for (Map.Entry> meta : metas.entrySet()) { String schema = meta.getKey(); - LinkedHashMap tbls = meta.getValue(); + Map tbls = meta.getValue(); - Map> tblsFields = U.newHashMap(tbls.size()); - Map> tblsFieldsPrev = U.newHashMap(tbls.size()); + Map> tblsFields = new TreeMap<>(); + Map> tblsFieldsPrev = new TreeMap<>(); fields.put(schema, tblsFields); fieldsPrev.put(schema, tblsFieldsPrev);