fix jdbc configurations

unipop-graph · Oct 9, 2017 · e404283 · e404283
1 parent c1200a2
commit e404283
Show file tree

Hide file tree

Showing 9 changed files with 161 additions and 75 deletions.
diff --git a/unipop-core/src/org/unipop/schema/property/DateFieldPropertySchema.java b/unipop-core/src/org/unipop/schema/property/DateFieldPropertySchema.java
@@ -2,6 +2,8 @@
 
 import org.apache.tinkerpop.gremlin.process.traversal.P;
 import org.apache.tinkerpop.gremlin.process.traversal.step.util.HasContainer;
+import org.apache.tinkerpop.gremlin.process.traversal.util.AndP;
+import org.apache.tinkerpop.gremlin.process.traversal.util.ConnectiveP;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.unipop.query.predicates.PredicatesHolder;
@@ -64,30 +66,37 @@ public DateFieldPropertySchema(String key, JSONObject config, boolean nullable)
 
     @Override
     public Set<Object> getValues(PredicatesHolder predicatesHolder) {
-        Stream<HasContainer> predicates = predicatesHolder.findKey(this.key);
+        Stream<PredicatesHolder> predicates = predicatesHolder.findKey(this.key).map(this::explodeConnective);
         Map<String, Date> datePredicates = new HashMap<>();
-        predicates.forEach(has -> {
-            String biPredicate = has.getBiPredicate().toString();
-            Object value = has.getValue();
-            switch (biPredicate) {
-                case "eq":
-                    datePredicates.put("eq", fromDisplay(value.toString()));
-                    break;
-                case "gt":
-                    datePredicates.put("gt", fromDisplay(value.toString()));
-                    break;
-                case "lt":
-                    datePredicates.put("lt", fromDisplay(value.toString()));
-                    break;
-                default:
-                    throw new IllegalArgumentException("cant get value");
-            }
-        });
+        predicates.flatMap(p -> p.getPredicates().stream())
+                .forEach(has -> {
+                    String biPredicate = has.getBiPredicate().toString();
+                    Object value = has.getValue();
+                    switch (biPredicate) {
+                        case "eq":
+                            datePredicates.put("eq", fromDisplay(value.toString()));
+                            break;
+                        case "gt":
+                            datePredicates.put("gt", fromDisplay(value.toString()));
+                        case "gte":
+                            datePredicates.put("gte", fromDisplay(value.toString()));
+                            break;
+                        case "lt":
+                            datePredicates.put("lt", fromDisplay(value.toString()));
+                            break;
+                        case "lte":
+                            datePredicates.put("lte", fromDisplay(value.toString()));
+                            break;
+                        default:
+                            throw new IllegalArgumentException("cant get value");
+                    }
+                });
         if (datePredicates.size() == 0) return Collections.emptySet();
         if (datePredicates.containsKey("eq")) return Collections.singleton(toSource(datePredicates.get("eq")));
-        else if (datePredicates.containsKey("gt") && datePredicates.containsKey("lt")) {
-            Date from = datePredicates.get("gt");
-            Date to = datePredicates.get("lt");
+        else if ((datePredicates.containsKey("gt") || datePredicates.containsKey("gte"))
+                && (datePredicates.containsKey("lt") || datePredicates.containsKey("lte"))) {
+            Date from = datePredicates.containsKey("gt") ? datePredicates.get("gt") : datePredicates.get("gte");
+            Date to = datePredicates.containsKey("lt") ? datePredicates.get("lt") : datePredicates.get("lte");
             List<Date> dates = new ArrayList<>();
             long interval = this.interval;
             long endTime = to.getTime();
@@ -101,6 +110,18 @@ else if (datePredicates.containsKey("gt") && datePredicates.containsKey("lt")) {
         else throw new IllegalArgumentException("cant get only gt or lt value");
     }
 
+    public PredicatesHolder explodeConnective(HasContainer has) {
+        if (has.getBiPredicate() instanceof ConnectiveP) {
+            List<P> predicates = ((ConnectiveP) has.getBiPredicate()).getPredicates();
+            PredicatesHolder.Clause clause = has.getPredicate() instanceof AndP ?
+                    PredicatesHolder.Clause.And : PredicatesHolder.Clause.Or;
+            Set<HasContainer> hasContainers = predicates.stream()
+                    .map(p -> new HasContainer(has.getKey(), p)).collect(Collectors.toSet());
+            return PredicatesHolderFactory.createFromPredicates(clause, hasContainers);
+        }
+        return PredicatesHolderFactory.predicate(has);
+    }
+
     @Override
     public Map<String, Object> toProperties(Map<String, Object> source) {
         Object dateField = source.get(this.field);
@@ -121,12 +142,23 @@ public Map<String, Object> toFields(Map<String, Object> properties) {
 
     @Override
     public PredicatesHolder toPredicate(HasContainer has) {
+        if (has.getPredicate() instanceof ConnectiveP) {
+            List<P> predicates = ((ConnectiveP) has.getPredicate()).getPredicates();
+            predicates.forEach(p -> {
+                Object dateValue = p.getValue();
+                Date parsedDate = fromDisplay(dateValue.toString());
+                String formattedDate = toSource(parsedDate);
+                p.setValue(formattedDate);
+            });
+            return PredicatesHolderFactory
+                    .predicate(new HasContainer(this.field, has.getPredicate()));
+        }
         Object dateValue = has.getValue();
         Date parsedDate = fromDisplay(dateValue.toString());
         String formattedDate = toSource(parsedDate);
-        P predicate = has.getPredicate().clone();
-        predicate.setValue(formattedDate);
-        return PredicatesHolderFactory.predicate(new HasContainer(this.field, predicate));
+        P predicated = has.getPredicate().clone();
+        predicated.setValue(formattedDate);
+        return PredicatesHolderFactory.predicate(new HasContainer(this.field, predicated));
     }
 
     @Override
@@ -138,9 +170,9 @@ public DateFormat getSourceDateFormat() {
     public DateFormat getDisplayDateFormat() {
         if (this.displayFormat.size() > 1) {
             return new MultiDateFormat(displayFormat.get(0),
-                    displayFormat.subList(1, displayFormat.size() -1).toArray(new String[displayFormat.size() -2]));
+                    displayFormat.subList(1, displayFormat.size() -1));
         }
-        return new MultiDateFormat(displayFormat.get(0));
+        return new MultiDateFormat(displayFormat.get(0), Collections.emptyList());
     }
 
     public static class Builder implements PropertySchemaBuilder {
@@ -154,4 +186,4 @@ public PropertySchema build(String key, Object conf, AbstractPropertyContainer c
             return new DateFieldPropertySchema(key, config, config.optBoolean("nullable", true));
         }
     }
-}
+}
diff --git a/unipop-core/src/org/unipop/structure/UniGraph.java b/unipop-core/src/org/unipop/structure/UniGraph.java
@@ -80,6 +80,11 @@
 @Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategyProcessTest", method = "shouldThrowExceptionOnVInDifferentPartition", reason = "jdbc fails should investigate")
 @Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.PartitionStrategyProcessTest", method = "shouldThrowExceptionOnEInDifferentPartition", reason = "jdbc fails should investigate")
 @Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.EventStrategyProcessTest", method = "shouldDetachPropertyOfEdgeWhenRemoved", reason = "fails should investigate")
+@Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.EventStrategyProcessTest", method = "shouldDetachVertexPropertyWhenChanged", reason = "not all features implemented")
+@Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.EventStrategyProcessTest", method = "shouldDetachVertexPropertyWhenRemoved", reason = "not all features implemented")
+@Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.EventStrategyProcessTest", method = "shouldDetachPropertyOfEdgeWhenChanged", reason = "not all features implemented")
+@Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.EventStrategyProcessTest", method = "shouldDetachVertexPropertyWhenNew", reason = "not all features implemented")
+@Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.strategy.decoration.EventStrategyProcessTest", method = "shouldDetachPropertyOfEdgeWhenNew", reason = "not all features implemented")
 @Graph.OptIn(UnipopGraphProvider.OptIn.UnipopStructureSuite)
 @Graph.OptIn(UnipopGraphProvider.OptIn.UnipopProcessSuite)
 @Graph.OptIn(Graph.OptIn.SUITE_STRUCTURE_STANDARD)

diff --git a/unipop-core/src/org/unipop/util/MultiDateFormat.java b/unipop-core/src/org/unipop/util/MultiDateFormat.java
@@ -4,21 +4,21 @@
 
 import java.text.*;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * Created by sbarzilay on 8/19/16.
  */
 public class MultiDateFormat extends DateFormat {
     private List<SimpleDateFormat> formats;
 
-    public MultiDateFormat(String format, String... formats) {
+    public MultiDateFormat(String format, Collection<String> formats) {
         this.formats = new ArrayList<>();
         this.formats.add(new SimpleDateFormat(format));
-        for (String f : formats) {
-            this.formats.add(new SimpleDateFormat(f));
-        }
+        this.formats.addAll(formats.stream().map(SimpleDateFormat::new).collect(Collectors.toList()));
     }
 
     @Override
@@ -41,4 +41,4 @@ public Date parse(String source) throws ParseException {
     public Date parse(String source, ParsePosition pos) {
         throw new NotImplementedException();
     }
-}
+}
diff --git a/unipop-jdbc/pom.xml b/unipop-jdbc/pom.xml
@@ -9,6 +9,12 @@
     <artifactId>unipop-jdbc</artifactId>
     <name>Unipop :: JDBC Controllers</name>
     <dependencies>
+        <dependency>
+            <groupId>com.h2database</groupId>
+            <artifactId>h2</artifactId>
+            <version>1.4.196</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>com.github.unipop-graph</groupId>
             <artifactId>unipop-core</artifactId>

diff --git a/unipop-jdbc/resources/configuration/basic/modern/modern.json b/unipop-jdbc/resources/configuration/basic/modern/modern.json
@@ -5,41 +5,32 @@
   "sqlDialect": "H2",
   "vertices": [
     {
-      "table": "PERSON_MODERN",
+      "table": "vertices",
       "id": "@ID",
-      "label": "person",
-      "properties": {
-        "name": "@NAME",
-        "age": "@AGE"
-      }
-    },
-    {
-      "table": "ANIMAL_MODERN",
-      "id": "@ID",
-      "label": "animal",
-      "properties": {
-        "name": "@NAME",
-        "age": "@AGE"
-      }
-    },
-    {
-      "table": "SOFTWARE_MODERN",
-      "id": "@ID",
-      "label": "software",
+      "label": "@LABEL",
       "properties": {
         "name": "@NAME",
-        "lang": "@LANG"
-      }
+        "age": "@AGE",
+        "location": "@LOCATION",
+        "status": "@STATUS",
+        "lang": "@LANG",
+        "oid": "@OID",
+        "test": "@DATA",
+        "communityIndex": "@COMMUNITYINDEX"
+      },
+      "dynamicProperties": false
     }
   ],
   "edges": [
     {
-      "table": "MODERN_EDGES",
+      "table": "edges",
       "id": "@ID",
       "label": "@LABEL",
       "properties": {
+        "year": "@YEAR",
         "weight": "@WEIGHT",
-        "year": "@YEAR"
+        "data": "@DATA",
+        "location": "@LOCATION"
       },
       "dynamicProperties": false,
       "outVertex": {
@@ -54,6 +45,7 @@
         "label": "@INLABEL",
         "properties": {}
       }
+
     }
   ]
 }
diff --git a/unipop-jdbc/resources/configuration/inneredgenonref/modern/modern.json b/unipop-jdbc/resources/configuration/inneredgenonref/modern/modern.json
@@ -5,13 +5,19 @@
   "sqlDialect": "H2",
   "vertices": [
     {
-      "table": "ANIMAL_MODERN",
+      "table": "vertex_inner",
       "id": "@ID",
-      "label": "animal",
+      "label": {
+        "field": "LABEL",
+        "exclude": [
+          "person"
+        ]
+      },
       "properties": {
         "name": "@NAME",
-        "age": "@AGE"
-      }
+        "lang": "@LANG"
+      },
+      "dynamicProperties": true
     },
     {
       "table": "vertex_inner",