diff --git a/.gitignore b/.gitignore index c57b3f93f..6e6479952 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,8 @@ release.properties src/test/db/ /sqlg-hsqldb-parent/sqlg-hsqldb/src/test/db/ /sqlg-benchmark-hsqldb/src/test/db/ +/sqlg-h2-parent/sqlg-h2/src/test/db/ +/sqlg-benchmark-h2/src/test/db/ ### Eclipse files **/.classpath diff --git a/sqlg-core/src/main/model/sqlg_topology.notation b/sqlg-core/src/main/model/sqlg_topology.notation index 6852c5e91..7c9c9fc63 100644 --- a/sqlg-core/src/main/model/sqlg_topology.notation +++ b/sqlg-core/src/main/model/sqlg_topology.notation @@ -997,7 +997,7 @@ - + @@ -1048,7 +1048,7 @@ - + @@ -1121,7 +1121,7 @@ - + @@ -1155,7 +1155,7 @@ - + @@ -1189,7 +1189,7 @@ - + @@ -1239,6 +1239,58 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1250,13 +1302,15 @@
- + +
- + + @@ -1267,7 +1321,8 @@ name derived - + + @@ -1278,25 +1333,28 @@ name derived - + +
- + +
- + + - - + + @@ -1353,8 +1411,8 @@ - - + + @@ -1413,8 +1471,8 @@ - - + + @@ -1531,331 +1589,1031 @@ - - + + - - + + - - - - + + + + - - - + + + - - - + + multiplicity name derived - + + - - - + + multiplicity name derived - + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + - - - + + - - + + multiplicity name derived - - + - - + + multiplicity name derived - - + - - - + + - - - + + - - - - - + + + + + - - - - + + + + - - - + + + - - - + + multiplicity name derived - + + - - - + + multiplicity name derived - + + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + + + + + - - - + + + multiplicity + name + derived + + + - - - + + + multiplicity + name + derived + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + multiplicity name derived - + - - - + + + multiplicity name derived - + - - - + + + - - - + + + - - - - - + + + + + - - - - + + + + + + + + + + + + + multiplicity + name + derived + + + + + + + multiplicity + name + derived + + - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + multiplicity name derived - + - - - + + + multiplicity name derived - + - - - + + + - - - + + + - - - - - + + + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + +
+ + + + + + +
+ + multiplicity name derived - + + - - + + +
+ + multiplicity name derived - + + - - + + +
+ + + - - + + +
+ + + - + + + + + + + + + +
+ + + + + + +
+ + + + + + +
+ + + multiplicity + name + derived + + + + + + +
+ + + multiplicity + name + derived + + + + + + +
+ + + + + + +
+ + + + + + + + + + + + + +
+ + + + + + +
+ + + + + + +
+ + + multiplicity + name + derived + + + + + + +
+ + + multiplicity + name + derived + + + + + + +
+ + + + + + +
+ + + + + + + + + + + + + +
+ + + + + + +
+ + + + + + +
+ + + + multiplicity + name + derived + + + + + +
+ + + + multiplicity + name + derived + + + + + +
+ + + + + + +
+ + + + + + + + + + + + + +
+ + + + + + +
+ + + + + + +
+ + + multiplicity + name + derived + + + + + + +
+ + + multiplicity + name + derived + + + + + + +
+ + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + multiplicity + name + derived + + + + + + + multiplicity + name + derived + + + + + + + + + + + + + - - - + + + - - - + + + - - + + - - + + multiplicity name derived - + - - + + multiplicity name derived - + - - + + - - + + - + - - - + + + - - - - + + + + - - - + + + - - + + multiplicity name derived - - + + - - + + multiplicity name derived - - + + - - - + + + - - - + + + - + - - - + + + + + + + + + + + + + + + + + multiplicity + name + derived + + + + + + + multiplicity + name + derived + + + + + + + + + + + + + + + + diff --git a/sqlg-core/src/main/model/sqlg_topology.uml b/sqlg-core/src/main/model/sqlg_topology.uml index b1f262f61..b000b00f9 100644 --- a/sqlg-core/src/main/model/sqlg_topology.uml +++ b/sqlg-core/src/main/model/sqlg_topology.uml @@ -55,14 +55,9 @@ There will be 2 entries in 'EdgeLabel' - - - - - @@ -112,12 +107,6 @@ There will be 2 entries in 'EdgeLabel' - - -
- - - @@ -126,30 +115,6 @@ There will be 2 entries in 'EdgeLabel' - - -
- - - - - -
- - - - - -
- - - - - -
- - - @@ -187,6 +152,53 @@ There will be 2 entries in 'EdgeLabel' + + + + + + + +
+ + + + + + + + +
+ + + + + + + + +
+ + + + + + + + + + + + + + +
+ + + + + + diff --git a/sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/SqlgH2Provider.java b/sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/SqlgH2Provider.java index ca5b8fbd5..7c6b87298 100644 --- a/sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/SqlgH2Provider.java +++ b/sqlg-h2-parent/sqlg-h2/src/test/java/org/umlg/sqlg/test/tp3/SqlgH2Provider.java @@ -1,6 +1,8 @@ package org.umlg.sqlg.test.tp3; import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.umlg.sqlg.H2Plugin; import org.umlg.sqlg.SqlgPlugin; import org.umlg.sqlg.structure.SqlgGraph; @@ -13,6 +15,9 @@ * @since 1.3.0 */ public class SqlgH2Provider extends SqlgAbstractGraphProvider { + + private Logger logger = LoggerFactory.getLogger(SqlgH2Provider.class.getName()); + @Override public SqlgPlugin getSqlgPlugin() { return new H2Plugin(); @@ -20,6 +25,7 @@ public SqlgPlugin getSqlgPlugin() { @Override public Map getBaseConfiguration(String graphName, Class test, String testMethodName, LoadGraphWith.GraphData loadGraphWith) { + logger.info("H2, Starting test: " + test.getSimpleName() + "." + testMethodName); return new HashMap() {{ put("gremlin.graph", SqlgGraph.class.getName()); put("jdbc.url", "jdbc:h2:file:src/test/db/" + graphName + ""); diff --git a/sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/SqlgHsqldbProvider.java b/sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/SqlgHsqldbProvider.java index 2ec7e297d..a490086da 100644 --- a/sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/SqlgHsqldbProvider.java +++ b/sqlg-hsqldb-parent/sqlg-hsqldb/src/test/java/org/umlg/sqlg/test/tp3/SqlgHsqldbProvider.java @@ -1,6 +1,8 @@ package org.umlg.sqlg.test.tp3; import org.apache.tinkerpop.gremlin.LoadGraphWith; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import org.umlg.sqlg.HsqldbPlugin; import org.umlg.sqlg.SqlgPlugin; import org.umlg.sqlg.structure.SqlgGraph; @@ -14,8 +16,11 @@ */ public class SqlgHsqldbProvider extends SqlgAbstractGraphProvider { + private Logger logger = LoggerFactory.getLogger(SqlgHsqldbProvider.class.getName()); + @Override public Map getBaseConfiguration(String graphName, Class test, String testMethodName, LoadGraphWith.GraphData loadGraphWith) { + logger.info("Hsqldb, Starting test: " + test.getSimpleName() + "." + testMethodName); return new HashMap() {{ put("gremlin.graph", SqlgGraph.class.getName()); put("jdbc.url", "jdbc:hsqldb:file:src/test/db/" + graphName + ""); diff --git a/sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/SqlgPostgresProvider.java b/sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/SqlgPostgresProvider.java index f09e172dd..c3a870551 100644 --- a/sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/SqlgPostgresProvider.java +++ b/sqlg-postgres-parent/sqlg-postgres/src/test/java/org/umlg/sqlg/test/tp3/SqlgPostgresProvider.java @@ -23,6 +23,7 @@ public class SqlgPostgresProvider extends SqlgAbstractGraphProvider { @Override public Map getBaseConfiguration(String graphName, Class test, String testMethodName, LoadGraphWith.GraphData loadGraphWith) { + logger.info("Postgresql, Starting test: " + test.getSimpleName() + "." + testMethodName); Map m = new HashMap() {{ put("gremlin.graph", SqlgGraph.class.getName()); put("jdbc.url", "jdbc:postgresql://localhost:5432/" + graphName); @@ -31,8 +32,6 @@ public Map getBaseConfiguration(String graphName, Class test, put("maxPoolSize", 10); }}; - logger.info("Starting test: " + test.getSimpleName() + "." + testMethodName); - InputStream sqlProperties = Thread.currentThread().getContextClassLoader().getResourceAsStream("sqlg.properties"); if (sqlProperties != null) {