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/03/04 15:45:16 UTC
[1/2] incubator-ignite git commit: # sprint-2 Fixed typo in snippet
generator.
Repository: incubator-ignite
Updated Branches:
refs/heads/sprint-2 5d2a7c6ca -> 882ded509
# sprint-2 Fixed typo in snippet generator.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/e7f7f57d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/e7f7f57d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/e7f7f57d
Branch: refs/heads/sprint-2
Commit: e7f7f57d47305ad0c476f91ddcc1a748e17a7e7f
Parents: 5d2a7c6
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Mar 4 21:44:27 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Mar 4 21:44:27 2015 +0700
----------------------------------------------------------------------
.../java/org/apache/ignite/schema/generator/SnippetGenerator.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/e7f7f57d/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/SnippetGenerator.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/SnippetGenerator.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/SnippetGenerator.java
index e54c019..4abd5a6 100644
--- a/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/SnippetGenerator.java
+++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/generator/SnippetGenerator.java
@@ -113,7 +113,7 @@ public class SnippetGenerator {
src.add("// Key fields for " + tbl + ".");
src.add((first ? "Collection<CacheTypeFieldMetadata> " : "") + "keys = new ArrayList<>();");
- addFields(src, "keys", pojo.valueFields(includeKeys));
+ addFields(src, "keys", pojo.keyFields());
src.add("type.setKeyFields(keys);");
src.add("");
[2/2] incubator-ignite git commit: # sprint-2 Refactored to use JUL
logger.
Posted by ak...@apache.org.
# sprint-2 Refactored to use JUL logger.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/882ded50
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/882ded50
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/882ded50
Branch: refs/heads/sprint-2
Commit: 882ded509d7eac6e24fcc69206fab70c33aed60e
Parents: e7f7f57
Author: AKuznetsov <ak...@gridgain.com>
Authored: Wed Mar 4 21:45:05 2015 +0700
Committer: AKuznetsov <ak...@gridgain.com>
Committed: Wed Mar 4 21:45:05 2015 +0700
----------------------------------------------------------------------
.../apache/ignite/schema/parser/DatabaseMetadataParser.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/882ded50/modules/schema-load/src/main/java/org/apache/ignite/schema/parser/DatabaseMetadataParser.java
----------------------------------------------------------------------
diff --git a/modules/schema-load/src/main/java/org/apache/ignite/schema/parser/DatabaseMetadataParser.java b/modules/schema-load/src/main/java/org/apache/ignite/schema/parser/DatabaseMetadataParser.java
index a849bd2..696ca62 100644
--- a/modules/schema-load/src/main/java/org/apache/ignite/schema/parser/DatabaseMetadataParser.java
+++ b/modules/schema-load/src/main/java/org/apache/ignite/schema/parser/DatabaseMetadataParser.java
@@ -23,11 +23,15 @@ import org.apache.ignite.schema.parser.dialect.*;
import java.sql.*;
import java.util.*;
+import java.util.logging.*;
/**
* Database metadata parser.
*/
public class DatabaseMetadataParser {
+ /** Logger. */
+ private static final Logger log = Logger.getLogger(DatabaseMetadataParser.class.getName());
+
/**
* Parse database metadata.
*
@@ -50,8 +54,7 @@ public class DatabaseMetadataParser {
dialect = new JdbcMetadataDialect();
}
catch (SQLException e) {
- System.err.println("Failed to resolve dialect (JdbcMetaDataDialect will be used.");
- e.printStackTrace();
+ log.log(Level.SEVERE, "Failed to resolve dialect (JdbcMetaDataDialect will be used.", e);
dialect = new JdbcMetadataDialect();
}