[HOPSWROKS-2925] refactor SqlCondition and SqlFilterLogic (#765)

logicalclocks · Jan 18, 2022 · b3c0619 · b3c0619
1 parent d4f4bb8
commit b3c0619
Show file tree

Hide file tree

Showing 24 changed files with 160 additions and 134 deletions.
diff --git a/hopsworks-api/pom.xml b/hopsworks-api/pom.xml
@@ -173,6 +173,19 @@
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
     </dependency>
+    <dependency>
+      <groupId>org.apache.calcite</groupId>
+      <artifactId>calcite-core</artifactId>
+    </dependency>
+    <!-- Here we are lying to Maven. Calcite has some dependency that depends on protobuf 3.0.0.
+    We are not going to use that codepath as we only use a small subset of calcite code.
+    Still the dependency to protobuf collides with the Hops dependency to protobuf and causes issues
+    during compilation. So here we add the protobuf-java dependency just for the compilation.
+    -->
+    <dependency>
+      <groupId>com.google.protobuf</groupId>
+      <artifactId>protobuf-java</artifactId>
+    </dependency>
   </dependencies>
 
   <build>

diff --git a/...ain/java/io/hops/hopsworks/api/featurestore/trainingdataset/PreparedStatementBuilder.java b/...ain/java/io/hops/hopsworks/api/featurestore/trainingdataset/PreparedStatementBuilder.java
@@ -29,7 +29,7 @@
 import io.hops.hopsworks.common.featurestore.query.filter.Filter;
 import io.hops.hopsworks.common.featurestore.query.filter.FilterController;
 import io.hops.hopsworks.common.featurestore.query.filter.FilterLogic;
-import io.hops.hopsworks.common.featurestore.query.SqlCondition;
+import io.hops.hopsworks.persistence.entity.featurestore.trainingdataset.SqlCondition;
 import io.hops.hopsworks.common.featurestore.trainingdatasets.TrainingDatasetController;
 import io.hops.hopsworks.exceptions.FeaturestoreException;
 import io.hops.hopsworks.persistence.entity.featurestore.Featurestore;

diff --git a/hopsworks-common/pom.xml b/hopsworks-common/pom.xml
@@ -188,19 +188,6 @@
       <groupId>com.github.ben-manes.caffeine</groupId>
       <artifactId>caffeine</artifactId>
     </dependency>
-    <dependency>
-      <groupId>org.apache.calcite</groupId>
-      <artifactId>calcite-core</artifactId>
-    </dependency>
-    <!-- Here we are lying to Maven. Calcite has some dependency that depends on protobuf 3.0.0.
-    We are not going to use that codepath as we only use a small subset of calcite code.
-    Still the dependency to protobuf collides with the Hops dependency to protobuf and causes issues
-    during compilation. So here we add the protobuf-java dependency just for the compilation.
-    -->
-    <dependency>
-      <groupId>com.google.protobuf</groupId>
-      <artifactId>protobuf-java</artifactId>
-    </dependency>
 
     <dependency>
       <groupId>com.logicalclocks</groupId>

diff --git a/...mmon/src/main/java/io/hops/hopsworks/common/featurestore/query/ConstructorController.java b/...mmon/src/main/java/io/hops/hopsworks/common/featurestore/query/ConstructorController.java
@@ -42,6 +42,7 @@
 import io.hops.hopsworks.persistence.entity.featurestore.featuregroup.FeaturegroupType;
 import io.hops.hopsworks.persistence.entity.featurestore.featuregroup.cached.FeatureGroupCommit;
 import io.hops.hopsworks.persistence.entity.featurestore.featuregroup.cached.TimeTravelFormat;
+import io.hops.hopsworks.persistence.entity.featurestore.trainingdataset.SqlCondition;
 import io.hops.hopsworks.persistence.entity.project.Project;
 import io.hops.hopsworks.persistence.entity.user.Users;
 import io.hops.hopsworks.restutils.RESTCodes;

diff --git a/...works-common/src/main/java/io/hops/hopsworks/common/featurestore/query/filter/Filter.java b/...works-common/src/main/java/io/hops/hopsworks/common/featurestore/query/filter/Filter.java
@@ -17,7 +17,7 @@
 package io.hops.hopsworks.common.featurestore.query.filter;
 
 import io.hops.hopsworks.common.featurestore.query.Feature;
-import io.hops.hopsworks.common.featurestore.query.SqlCondition;
+import io.hops.hopsworks.persistence.entity.featurestore.trainingdataset.SqlCondition;
 
 import java.util.Arrays;
 import java.util.List;

diff --git a/...on/src/main/java/io/hops/hopsworks/common/featurestore/query/filter/FilterController.java b/...on/src/main/java/io/hops/hopsworks/common/featurestore/query/filter/FilterController.java
@@ -24,6 +24,7 @@
 import io.hops.hopsworks.common.featurestore.query.Query;
 import io.hops.hopsworks.exceptions.FeaturestoreException;
 import io.hops.hopsworks.persistence.entity.featurestore.featuregroup.Featuregroup;
+import io.hops.hopsworks.persistence.entity.featurestore.trainingdataset.SqlFilterLogic;
 import io.hops.hopsworks.restutils.RESTCodes;
 import org.apache.calcite.sql.SqlIdentifier;
 import org.apache.calcite.sql.SqlLiteral;

diff --git a/...ks-common/src/main/java/io/hops/hopsworks/common/featurestore/query/filter/FilterDTO.java b/...ks-common/src/main/java/io/hops/hopsworks/common/featurestore/query/filter/FilterDTO.java
@@ -17,7 +17,7 @@
 package io.hops.hopsworks.common.featurestore.query.filter;
 
 import io.hops.hopsworks.common.featurestore.feature.FeatureGroupFeatureDTO;
-import io.hops.hopsworks.common.featurestore.query.SqlCondition;
+import io.hops.hopsworks.persistence.entity.featurestore.trainingdataset.SqlCondition;
 
 import javax.xml.bind.annotation.XmlRootElement;
 

diff --git a/...-common/src/main/java/io/hops/hopsworks/common/featurestore/query/filter/FilterLogic.java b/...-common/src/main/java/io/hops/hopsworks/common/featurestore/query/filter/FilterLogic.java
@@ -16,6 +16,8 @@
 
 package io.hops.hopsworks.common.featurestore.query.filter;
 
+import io.hops.hopsworks.persistence.entity.featurestore.trainingdataset.SqlFilterLogic;
+
 public class FilterLogic {
   private SqlFilterLogic type;
   private Filter leftFilter;

diff --git a/...mmon/src/main/java/io/hops/hopsworks/common/featurestore/query/filter/FilterLogicDTO.java b/...mmon/src/main/java/io/hops/hopsworks/common/featurestore/query/filter/FilterLogicDTO.java
@@ -16,6 +16,8 @@
 
 package io.hops.hopsworks.common.featurestore.query.filter;
 
+import io.hops.hopsworks.persistence.entity.featurestore.trainingdataset.SqlFilterLogic;
+
 import javax.xml.bind.annotation.XmlRootElement;
 
 @XmlRootElement

diff --git a/hopsworks-common/src/main/java/io/hops/hopsworks/common/featurestore/query/join/Join.java b/hopsworks-common/src/main/java/io/hops/hopsworks/common/featurestore/query/join/Join.java
@@ -18,7 +18,7 @@
 
 import io.hops.hopsworks.common.featurestore.query.Feature;
 import io.hops.hopsworks.common.featurestore.query.Query;
-import io.hops.hopsworks.common.featurestore.query.SqlCondition;
+import io.hops.hopsworks.persistence.entity.featurestore.trainingdataset.SqlCondition;
 import org.apache.calcite.sql.JoinType;
 
 import java.util.List;

diff --git a/...common/src/main/java/io/hops/hopsworks/common/featurestore/query/join/JoinController.java b/...common/src/main/java/io/hops/hopsworks/common/featurestore/query/join/JoinController.java
@@ -19,7 +19,7 @@
 import io.hops.hopsworks.common.featurestore.query.ConstructorController;
 import io.hops.hopsworks.common.featurestore.query.Feature;
 import io.hops.hopsworks.common.featurestore.query.Query;
-import io.hops.hopsworks.common.featurestore.query.SqlCondition;
+import io.hops.hopsworks.persistence.entity.featurestore.trainingdataset.SqlCondition;
 import org.apache.calcite.sql.JoinConditionType;
 import org.apache.calcite.sql.SqlIdentifier;
 import org.apache.calcite.sql.SqlJoin;

diff --git a/...mmon/src/main/java/io/hops/hopsworks/common/featurestore/query/pit/PitJoinController.java b/...mmon/src/main/java/io/hops/hopsworks/common/featurestore/query/pit/PitJoinController.java
@@ -21,7 +21,7 @@
 import io.hops.hopsworks.common.featurestore.query.Feature;
 import io.hops.hopsworks.common.featurestore.query.Query;
 import io.hops.hopsworks.common.featurestore.query.QueryDTO;
-import io.hops.hopsworks.common.featurestore.query.SqlCondition;
+import io.hops.hopsworks.persistence.entity.featurestore.trainingdataset.SqlCondition;
 import io.hops.hopsworks.common.featurestore.query.filter.Filter;
 import io.hops.hopsworks.common.featurestore.query.filter.FilterController;
 import io.hops.hopsworks.common.featurestore.query.join.Join;

diff --git a/...ava/io/hops/hopsworks/common/featurestore/trainingdatasets/TrainingDatasetController.java b/...ava/io/hops/hopsworks/common/featurestore/trainingdatasets/TrainingDatasetController.java
@@ -28,11 +28,10 @@
 import io.hops.hopsworks.common.featurestore.query.Feature;
 import io.hops.hopsworks.common.featurestore.query.Query;
 import io.hops.hopsworks.common.featurestore.query.QueryDTO;
-import io.hops.hopsworks.common.featurestore.query.SqlCondition;
 import io.hops.hopsworks.common.featurestore.query.filter.Filter;
 import io.hops.hopsworks.common.featurestore.query.filter.FilterLogic;
 import io.hops.hopsworks.common.featurestore.query.filter.FilterValue;
-import io.hops.hopsworks.common.featurestore.query.filter.SqlFilterLogic;
+import io.hops.hopsworks.persistence.entity.featurestore.trainingdataset.SqlFilterLogic;
 import io.hops.hopsworks.common.featurestore.query.join.Join;
 import io.hops.hopsworks.common.featurestore.query.pit.PitJoinController;
 import io.hops.hopsworks.common.featurestore.statistics.StatisticsController;
@@ -441,7 +440,7 @@ private TrainingDatasetFilter makeTrainingDatasetFilter(String path, TrainingDat
     TrainingDatasetFilterCondition condition = filter == null ? null : convertFilter(filter, trainingDatasetFilter);
     trainingDatasetFilter.setCondition(condition);
     trainingDatasetFilter.setPath(path);
-    trainingDatasetFilter.setType(type.name());
+    trainingDatasetFilter.setType(type);
     return trainingDatasetFilter;
   }
 
@@ -450,7 +449,7 @@ private TrainingDatasetFilterCondition convertFilter(Filter filter, TrainingData
         trainingDatasetFilter,
         filter.getFeatures().get(0).getFeatureGroup(),
         filter.getFeatures().get(0).getName(),
-        filter.getCondition().toString(),
+        filter.getCondition(),
         filter.getValue().getFeatureGroupId(),
         filter.getValue().getValue()
     );
@@ -812,9 +811,9 @@ FilterLogic convertToFilterLogic(Collection<TrainingDatasetFilter> trainingDatas
         .filter(filter -> filter.getPath().equals(headPath)).findFirst()
         .orElseThrow(() -> new FeaturestoreException(RESTCodes.FeaturestoreErrorCode.COULD_NOT_GET_QUERY_FILTER,
             Level.WARNING));
-    filterLogic.setType(SqlFilterLogic.valueOf(headNode.getType()));
+    filterLogic.setType(headNode.getType());
 
-    if (headNode.getType().equals(SqlFilterLogic.SINGLE.name())) {
+    if (headNode.getType().equals(SqlFilterLogic.SINGLE)) {
       Filter filter = convertToFilter(headNode.getCondition(), features);
       filterLogic.setLeftFilter(filter);
     } else {
@@ -854,7 +853,7 @@ private Filter convertToFilter(TrainingDatasetFilterCondition condition, Map<Str
     }
     return new Filter(
         features.get(makeFeatureLookupKey(condition.getFeatureGroup().getId(), condition.getFeature())),
-        SqlCondition.valueOf(condition.getCondition()),
+        condition.getCondition(),
         filterValue
     );
   }

diff --git a/...rc/test/io/hops/hopsworks/common/featurestore/featuregroup/pit/TestPitJoinController.java b/...rc/test/io/hops/hopsworks/common/featurestore/featuregroup/pit/TestPitJoinController.java
@@ -26,7 +26,7 @@
 import io.hops.hopsworks.common.featurestore.query.Feature;
 import io.hops.hopsworks.common.featurestore.query.Query;
 import io.hops.hopsworks.common.featurestore.query.QueryDTO;
-import io.hops.hopsworks.common.featurestore.query.SqlCondition;
+import io.hops.hopsworks.persistence.entity.featurestore.trainingdataset.SqlCondition;
 import io.hops.hopsworks.common.featurestore.query.filter.Filter;
 import io.hops.hopsworks.common.featurestore.query.filter.FilterController;
 import io.hops.hopsworks.common.featurestore.query.filter.FilterLogic;

diff --git a/...ommon/src/test/io/hops/hopsworks/common/featurestore/query/TestConstructorController.java b/...ommon/src/test/io/hops/hopsworks/common/featurestore/query/TestConstructorController.java
@@ -26,7 +26,7 @@
 import io.hops.hopsworks.common.featurestore.query.filter.Filter;
 import io.hops.hopsworks.common.featurestore.query.filter.FilterController;
 import io.hops.hopsworks.common.featurestore.query.filter.FilterLogic;
-import io.hops.hopsworks.common.featurestore.query.filter.SqlFilterLogic;
+import io.hops.hopsworks.persistence.entity.featurestore.trainingdataset.SqlFilterLogic;
 import io.hops.hopsworks.common.featurestore.query.join.Join;
 import io.hops.hopsworks.common.featurestore.query.join.JoinController;
 import io.hops.hopsworks.common.featurestore.query.join.JoinDTO;
@@ -35,6 +35,7 @@
 import io.hops.hopsworks.persistence.entity.featurestore.featuregroup.Featuregroup;
 import io.hops.hopsworks.persistence.entity.featurestore.featuregroup.cached.CachedFeaturegroup;
 import io.hops.hopsworks.persistence.entity.featurestore.featuregroup.cached.TimeTravelFormat;
+import io.hops.hopsworks.persistence.entity.featurestore.trainingdataset.SqlCondition;
 import io.hops.hopsworks.persistence.entity.project.Project;
 import io.hops.hopsworks.persistence.entity.user.Users;
 import org.apache.calcite.sql.JoinType;

diff --git a/...mon/src/test/io/hops/hopsworks/common/featurestore/query/filter/TestFilterController.java b/...mon/src/test/io/hops/hopsworks/common/featurestore/query/filter/TestFilterController.java
@@ -21,13 +21,14 @@
 import io.hops.hopsworks.common.featurestore.query.ConstructorController;
 import io.hops.hopsworks.common.featurestore.query.Feature;
 import io.hops.hopsworks.common.featurestore.query.Query;
-import io.hops.hopsworks.common.featurestore.query.SqlCondition;
+import io.hops.hopsworks.persistence.entity.featurestore.trainingdataset.SqlCondition;
 import io.hops.hopsworks.common.featurestore.query.join.Join;
 import io.hops.hopsworks.exceptions.FeaturestoreException;
 import io.hops.hopsworks.persistence.entity.featurestore.Featurestore;
 import io.hops.hopsworks.persistence.entity.featurestore.featuregroup.Featuregroup;
 import io.hops.hopsworks.persistence.entity.featurestore.featuregroup.cached.CachedFeaturegroup;
 import io.hops.hopsworks.persistence.entity.featurestore.featuregroup.cached.TimeTravelFormat;
+import io.hops.hopsworks.persistence.entity.featurestore.trainingdataset.SqlFilterLogic;
 import io.hops.hopsworks.persistence.entity.project.Project;
 import org.apache.calcite.sql.JoinType;
 import org.apache.calcite.sql.SqlDialect;

diff --git a/...-common/src/test/io/hops/hopsworks/common/featurestore/query/join/TestJoinController.java b/...-common/src/test/io/hops/hopsworks/common/featurestore/query/join/TestJoinController.java
@@ -19,7 +19,7 @@
 import io.hops.hopsworks.common.featurestore.query.ConstructorController;
 import io.hops.hopsworks.common.featurestore.query.Feature;
 import io.hops.hopsworks.common.featurestore.query.Query;
-import io.hops.hopsworks.common.featurestore.query.SqlCondition;
+import io.hops.hopsworks.persistence.entity.featurestore.trainingdataset.SqlCondition;
 import io.hops.hopsworks.persistence.entity.featurestore.Featurestore;
 import io.hops.hopsworks.persistence.entity.featurestore.featuregroup.Featuregroup;
 import io.hops.hopsworks.persistence.entity.featurestore.featuregroup.cached.CachedFeaturegroup;