You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cayenne.apache.org by aa...@apache.org on 2016/12/14 18:29:53 UTC
[4/9] cayenne git commit: New DbLoader for dbsync utils - loading
process split in independent small steps - DbLoader always return new DataMap,
it doesn't accept it from outside
New DbLoader for dbsync utils
- loading process split in independent small steps
- DbLoader always return new DataMap, it doesn't accept it from outside
Final clean up
Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo
Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/e68c72c2
Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/e68c72c2
Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/e68c72c2
Branch: refs/heads/master
Commit: e68c72c245c1799b725a52d5821850b9d89da01d
Parents: 8c27302
Author: Nikita Timofeev <st...@gmail.com>
Authored: Mon Dec 12 11:38:13 2016 +0300
Committer: Nikita Timofeev <st...@gmail.com>
Committed: Mon Dec 12 11:38:13 2016 +0300
----------------------------------------------------------------------
.../cayenne/dbsync/reverse/dbload/AttributeLoader.java | 4 ++--
.../cayenne/dbsync/reverse/dbload/DbLoadDataStore.java | 8 +++++---
.../org/apache/cayenne/dbsync/reverse/dbload/DbLoader.java | 2 +-
.../dbsync/reverse/dbload/DbRelationshipDetected.java | 4 ++--
.../dbsync/reverse/dbload/DefaultDbLoaderDelegate.java | 1 -
.../apache/cayenne/dbsync/reverse/dbload/EntityLoader.java | 4 ++--
.../apache/cayenne/dbsync/reverse/dbload/ExportedKey.java | 4 ++--
.../dbsync/reverse/dbload/LoggingDbLoaderDelegate.java | 1 -
.../dbsync/reverse/dbload/PerCatalogAndSchemaLoader.java | 4 ++--
.../cayenne/dbsync/reverse/dbload/PrimaryKeyLoader.java | 2 +-
.../cayenne/dbsync/reverse/dbload/ProcedureColumnLoader.java | 4 ++--
.../cayenne/dbsync/reverse/dbload/ProcedureLoader.java | 4 ++--
.../cayenne/dbsync/reverse/dbload/RelationshipLoader.java | 2 +-
13 files changed, 22 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e68c72c2/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/AttributeLoader.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/AttributeLoader.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/AttributeLoader.java
index 25f64d2..af44f7b 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/AttributeLoader.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/AttributeLoader.java
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFactory;
class AttributeLoader extends PerCatalogAndSchemaLoader {
- private static final Log LOGGER = LogFactory.getLog(AttributeLoader.class);
+ private static final Log LOGGER = LogFactory.getLog(DbLoader.class);
private boolean firstRow;
private boolean supportAutoIncrement;
@@ -52,7 +52,7 @@ class AttributeLoader extends PerCatalogAndSchemaLoader {
}
@Override
- protected void processResultSet(CatalogFilter catalog, SchemaFilter schema, DbLoadDataStore map, ResultSet rs) throws SQLException {
+ protected void processResultSetRow(CatalogFilter catalog, SchemaFilter schema, DbLoadDataStore map, ResultSet rs) throws SQLException {
if (firstRow) {
supportAutoIncrement = checkForAutoIncrement(rs);
firstRow = false;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e68c72c2/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoadDataStore.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoadDataStore.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoadDataStore.java
index c0e79a8..ec06163 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoadDataStore.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoadDataStore.java
@@ -19,7 +19,6 @@
package org.apache.cayenne.dbsync.reverse.dbload;
-import java.util.Collection;
import java.util.HashMap;
import java.util.Map;
import java.util.Set;
@@ -34,8 +33,11 @@ import org.apache.cayenne.map.Procedure;
* Temporary storage for loaded from DB DbEntities and Procedures.
* DataMap is used but it's functionality is excessive and
* there can be unwanted side effects.
- * To get rid of it parallel data structure for dbEntity, attributes,
- * procedures etc.. must be created
+ * But we can't get rid of it right now as parallel data structure
+ * for dbEntity, attributes, procedures etc.. must be created
+ * or some other work around should be implemented because
+ * some functionality relies on side effects (e.g. entity resolution
+ * in relationship)
*/
public class DbLoadDataStore extends DataMap {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e68c72c2/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoader.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoader.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoader.java
index 5c1cfde..e350b04 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoader.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DbLoader.java
@@ -35,7 +35,7 @@ import org.apache.cayenne.map.DataMap;
* Creates DbEntities and Procedures based on DB meta data.
* Consists of list of loaders that iteratively loads small parts of data,
* e.g. Entity name, Attributes, Relationships...
- * @see AbstractLoader and its children
+ * @see AbstractLoader and its descendants
*/
public class DbLoader {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e68c72c2/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DbRelationshipDetected.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DbRelationshipDetected.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DbRelationshipDetected.java
index 5a8b8cd..f827bde 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DbRelationshipDetected.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DbRelationshipDetected.java
@@ -34,7 +34,7 @@ public class DbRelationshipDetected extends DbRelationship {
super(uniqueRelName);
}
- public DbRelationshipDetected() {
+ DbRelationshipDetected() {
}
/**
@@ -47,7 +47,7 @@ public class DbRelationshipDetected extends DbRelationship {
/**
* Set the name of the underlying foreign key. Typically FK_NAME from jdbc metadata.
*/
- public void setFkName(String fkName) {
+ void setFkName(String fkName) {
this.fkName = fkName;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e68c72c2/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DefaultDbLoaderDelegate.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DefaultDbLoaderDelegate.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DefaultDbLoaderDelegate.java
index 607bd2c..6b06be8 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DefaultDbLoaderDelegate.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/DefaultDbLoaderDelegate.java
@@ -19,7 +19,6 @@
package org.apache.cayenne.dbsync.reverse.dbload;
-import org.apache.cayenne.dbsync.reverse.dbload.DbLoaderDelegate;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbRelationship;
import org.apache.cayenne.map.ObjEntity;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e68c72c2/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/EntityLoader.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/EntityLoader.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/EntityLoader.java
index bbccc15..9f2afb2 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/EntityLoader.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/EntityLoader.java
@@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFactory;
class EntityLoader extends PerCatalogAndSchemaLoader {
- private static final Log LOGGER = LogFactory.getLog(EntityLoader.class);
+ private static final Log LOGGER = LogFactory.getLog(DbLoader.class);
private final String[] types;
@@ -50,7 +50,7 @@ class EntityLoader extends PerCatalogAndSchemaLoader {
}
@Override
- protected void processResultSet(CatalogFilter catalog, SchemaFilter schema, DbLoadDataStore map, ResultSet rs) throws SQLException {
+ protected void processResultSetRow(CatalogFilter catalog, SchemaFilter schema, DbLoadDataStore map, ResultSet rs) throws SQLException {
String name = rs.getString("TABLE_NAME");
String catalogName = rs.getString("TABLE_CAT");
String schemaName = rs.getString("TABLE_SCHEM");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e68c72c2/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ExportedKey.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ExportedKey.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ExportedKey.java
index a288fe8..e9c90eb 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ExportedKey.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ExportedKey.java
@@ -45,7 +45,7 @@ public class ExportedKey implements Comparable {
* @param rs ResultSet pointing to a exported key, fetched using
* DataBaseMetaData.getExportedKeys(...)
*/
- public ExportedKey(ResultSet rs) throws SQLException {
+ ExportedKey(ResultSet rs) throws SQLException {
String pkCatalog = rs.getString("PKTABLE_CAT");
String pkSchema = rs.getString("PKTABLE_SCHEM");
String pkTable = rs.getString("PKTABLE_NAME");
@@ -121,7 +121,7 @@ public class ExportedKey implements Comparable {
return getStrKey() + " # " + keySeq;
}
- public String getStrKey() {
+ String getStrKey() {
return pk + " <- " + fk;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e68c72c2/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/LoggingDbLoaderDelegate.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/LoggingDbLoaderDelegate.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/LoggingDbLoaderDelegate.java
index 58635f7..70279c1 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/LoggingDbLoaderDelegate.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/LoggingDbLoaderDelegate.java
@@ -18,7 +18,6 @@
****************************************************************/
package org.apache.cayenne.dbsync.reverse.dbload;
-import org.apache.cayenne.dbsync.reverse.dbload.DefaultDbLoaderDelegate;
import org.apache.cayenne.map.DbEntity;
import org.apache.cayenne.map.DbRelationship;
import org.apache.commons.logging.Log;
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e68c72c2/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/PerCatalogAndSchemaLoader.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/PerCatalogAndSchemaLoader.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/PerCatalogAndSchemaLoader.java
index 5ec1b67..376defb 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/PerCatalogAndSchemaLoader.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/PerCatalogAndSchemaLoader.java
@@ -41,7 +41,7 @@ public abstract class PerCatalogAndSchemaLoader extends AbstractLoader {
}
try (ResultSet rs = getResultSet(catalog.name, schema.name, metaData)) {
while (rs.next()) {
- processResultSet(catalog, schema, map, rs);
+ processResultSetRow(catalog, schema, map, rs);
}
}
}
@@ -54,5 +54,5 @@ public abstract class PerCatalogAndSchemaLoader extends AbstractLoader {
abstract ResultSet getResultSet(String catalogName, String schemaName, DatabaseMetaData metaData) throws SQLException;
- abstract void processResultSet(CatalogFilter catalog, SchemaFilter schema, DbLoadDataStore map, ResultSet rs) throws SQLException;
+ abstract void processResultSetRow(CatalogFilter catalog, SchemaFilter schema, DbLoadDataStore map, ResultSet rs) throws SQLException;
}
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e68c72c2/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/PrimaryKeyLoader.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/PrimaryKeyLoader.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/PrimaryKeyLoader.java
index 9a1d206..4f80534 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/PrimaryKeyLoader.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/PrimaryKeyLoader.java
@@ -31,7 +31,7 @@ import org.apache.commons.logging.LogFactory;
class PrimaryKeyLoader extends PerEntityLoader {
- private static final Log LOGGER = LogFactory.getLog(PrimaryKeyLoader.class);
+ private static final Log LOGGER = LogFactory.getLog(DbLoader.class);
PrimaryKeyLoader(DbLoaderConfiguration config, DbLoaderDelegate delegate) {
super(null, config, delegate);
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e68c72c2/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ProcedureColumnLoader.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ProcedureColumnLoader.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ProcedureColumnLoader.java
index 4ff77c0..8ac0fde 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ProcedureColumnLoader.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ProcedureColumnLoader.java
@@ -35,7 +35,7 @@ import org.apache.commons.logging.LogFactory;
public class ProcedureColumnLoader extends PerCatalogAndSchemaLoader {
- private static final Log LOGGER = LogFactory.getLog(ProcedureColumnLoader.class);
+ private static final Log LOGGER = LogFactory.getLog(DbLoader.class);
ProcedureColumnLoader(DbAdapter adapter, DbLoaderConfiguration config, DbLoaderDelegate delegate) {
super(adapter, config, delegate);
@@ -53,7 +53,7 @@ public class ProcedureColumnLoader extends PerCatalogAndSchemaLoader {
}
@Override
- protected void processResultSet(CatalogFilter catalog, SchemaFilter schema, DbLoadDataStore map, ResultSet rs) throws SQLException {
+ protected void processResultSetRow(CatalogFilter catalog, SchemaFilter schema, DbLoadDataStore map, ResultSet rs) throws SQLException {
String procSchema = rs.getString("PROCEDURE_SCHEM");
String procCatalog = rs.getString("PROCEDURE_CAT");
String name = rs.getString("PROCEDURE_NAME");
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e68c72c2/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ProcedureLoader.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ProcedureLoader.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ProcedureLoader.java
index 633f033..34808a0 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ProcedureLoader.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/ProcedureLoader.java
@@ -33,7 +33,7 @@ import org.apache.commons.logging.LogFactory;
public class ProcedureLoader extends PerCatalogAndSchemaLoader {
- private static final Log LOGGER = LogFactory.getLog(ProcedureLoader.class);
+ private static final Log LOGGER = LogFactory.getLog(DbLoader.class);
ProcedureLoader(DbAdapter adapter, DbLoaderConfiguration config, DbLoaderDelegate delegate) {
super(adapter, config, delegate);
@@ -51,7 +51,7 @@ public class ProcedureLoader extends PerCatalogAndSchemaLoader {
}
@Override
- protected void processResultSet(CatalogFilter catalog, SchemaFilter schema, DbLoadDataStore map, ResultSet rs) throws SQLException {
+ protected void processResultSetRow(CatalogFilter catalog, SchemaFilter schema, DbLoadDataStore map, ResultSet rs) throws SQLException {
PatternFilter filter = config.getFiltersConfig().proceduresFilter(catalog.name, schema.name);
String name = rs.getString("PROCEDURE_NAME");
if (!filter.isIncluded(name)) {
http://git-wip-us.apache.org/repos/asf/cayenne/blob/e68c72c2/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/RelationshipLoader.java
----------------------------------------------------------------------
diff --git a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/RelationshipLoader.java b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/RelationshipLoader.java
index 91a48f4..52de8a6 100644
--- a/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/RelationshipLoader.java
+++ b/cayenne-dbsync/src/main/java/org/apache/cayenne/dbsync/reverse/dbload/RelationshipLoader.java
@@ -36,7 +36,7 @@ import org.apache.commons.logging.LogFactory;
public class RelationshipLoader extends AbstractLoader {
- private static final Log LOGGER = LogFactory.getLog(RelationshipLoader.class);
+ private static final Log LOGGER = LogFactory.getLog(DbLoader.class);
private final ObjectNameGenerator nameGenerator;