Encapsulate Cassandra lineage_graph_version_edge

Move lineage_graph_version_edge into lineage_graph_version (with set
lineage_edge_version_id_set)

Author: seanlobo

scripts/cassandra/cassandra.cql

@@ -147,14 +147,10 @@ create table lineage_graph (
 
 create table lineage_graph_version (
     id bigint PRIMARY KEY,
-    lineage_graph_id bigint
+    lineage_graph_id bigint,
+    lineage_edge_version_id_set set<bigint>
 );
 
-create table lineage_graph_version_edge (
-    lineage_graph_version_id bigint,
-    lineage_edge_version_id bigint,
-    PRIMARY KEY (lineage_graph_version_id, lineage_edge_version_id)
-);
 
 /* CREATE EMPTY VERSION */
 

scripts/cassandra/drop_cassandra.cql

@@ -12,7 +12,6 @@
  * limitations under the License.
  */
 
-drop table lineage_graph_version_edge;
 drop table lineage_graph_version;
 drop table lineage_graph;
 drop table lineage_edge_version;

scripts/cassandra/truncate.cql

@@ -12,7 +12,6 @@
  * limitations under the License.
  */
 
-truncate lineage_graph_version_edge;
 truncate lineage_graph_version;
 truncate lineage_graph;
 truncate lineage_edge_version;
@@ -27,7 +26,6 @@ truncate edge;
 truncate rich_version_tag;
 truncate rich_version_external_parameter;
 truncate rich_version;
-truncate structure_version_attribute;
 truncate structure_version;
 truncate structure;
 truncate version_history_dag;

src/main/java/edu/berkeley/ground/dao/usage/cassandra/CassandraLineageGraphVersionFactory.java

@@ -29,13 +29,15 @@
 import edu.berkeley.ground.model.usage.LineageGraphVersion;
 import edu.berkeley.ground.model.versions.GroundType;
 import edu.berkeley.ground.util.IdGenerator;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import java.util.Set;
+import java.util.stream.Collectors;
 
 public class CassandraLineageGraphVersionFactory
     extends CassandraRichVersionFactory<LineageGraphVersion>
@@ -104,13 +106,12 @@ public LineageGraphVersion create(Map<String, Tag> tags,
     this.dbClient.insert("lineage_graph_version", insertions);
 
     for (long lineageEdgeVersionId : lineageEdgeVersionIds) {
-      List<DbDataContainer> lineageEdgeInsertion = new ArrayList<>();
-      lineageEdgeInsertion.add(new DbDataContainer("lineage_graph_version_id", GroundType.LONG,
-          id));
-      lineageEdgeInsertion.add(new DbDataContainer("lineage_edge_version_id", GroundType.LONG,
-          lineageEdgeVersionId));
+      List<DbDataContainer> predicates = new ArrayList<>();
+      predicates.add(new DbDataContainer("id", GroundType.LONG, id));
+      Set<Long> edgeValue = new HashSet<>();
+      edgeValue.add(lineageEdgeVersionId);
 
-      this.dbClient.insert("lineage_graph_version_edge", lineageEdgeInsertion);
+      this.dbClient.addToSet("lineage_graph_version", "lineage_edge_version_id_set", edgeValue, predicates);
     }
 
     this.lineageGraphFactory.update(lineageGraphId, id, parentIds);
@@ -137,8 +138,8 @@ public LineageGraphVersion retrieveFromDatabase(long id) throws GroundException
     List<DbDataContainer> predicates = new ArrayList<>();
     predicates.add(new DbDataContainer("id", GroundType.LONG, id));
 
-    List<DbDataContainer> lineageEdgePredicate = new ArrayList<>();
-    lineageEdgePredicate.add(new DbDataContainer("lineage_graph_version_id", GroundType.LONG,
+    List<DbDataContainer> lineageGraphVersionPredicates = new ArrayList<>();
+    lineageGraphVersionPredicates.add(new DbDataContainer("id", GroundType.LONG,
         id));
 
     CassandraResults resultSet = this.dbClient.equalitySelect("lineage_graph_version",
@@ -148,15 +149,7 @@ public LineageGraphVersion retrieveFromDatabase(long id) throws GroundException
 
     long lineageGraphId = resultSet.getLong("lineage_graph_id");
 
-    List<Long> lineageEdgeVersionIds = new ArrayList<>();
-    CassandraResults lineageEdgeSet = this.dbClient.equalitySelect("lineage_graph_version_edge",
-        DbClient.SELECT_STAR, lineageEdgePredicate);
-
-    if (!lineageEdgeSet.isEmpty()) {
-      do {
-        lineageEdgeVersionIds.add(lineageEdgeSet.getLong("lineage_edge_version_id"));
-      } while (lineageEdgeSet.next());
-    }
+    List<Long> lineageEdgeVersionIds = resultSet.getSet("lineage_edge_version_id_set", Long.class).stream().collect(Collectors.toList());
 
     LOGGER.info("Retrieved lineage_graph version " + id + " in lineage_graph " + lineageGraphId
         + ".");