Feature/fix validation params

pom.xml

@@ -31,6 +31,7 @@
         <maven.compiler.target>1.8</maven.compiler.target>
         <disruptor-version>3.3.2</disruptor-version>
         <mockito.version>4.6.0</mockito.version>
+        <duckdb.version>0.4.0</duckdb.version>
         <!-- TODO add fastutil? -->
         <!-- TODO sbe-version 1.1.3-RC2-->
         <sbe-version>1.0.3-RC2</sbe-version>
@@ -128,7 +129,7 @@
         <dependency>
             <groupId>org.duckdb</groupId>
             <artifactId>duckdb_jdbc</artifactId>
-            <version>0.3.3</version>
+            <version>${duckdb.version}</version>
         </dependency>
     </dependencies>
 

src/main/java/org/ldbcouncil/snb/driver/Operation.java

@@ -4,62 +4,16 @@
  * 
  * Describes Operation performed by the driver, e.g. queries.
  * Each Operation is expected to have a RESULT_TYPE, which is the expected
- * result of the opertion. The operation must be able to deserialize the
+ * result of the operation. The operation must be able to deserialize the
  * result object.
  */
 import org.ldbcouncil.snb.driver.temporal.TemporalUtil;
-import org.ldbcouncil.snb.driver.workloads.interactive.queries.*;
 
 import java.io.IOException;
 import java.util.Map;
 
-import com.fasterxml.jackson.annotation.JsonSubTypes;
-import com.fasterxml.jackson.annotation.JsonTypeInfo;
-
 import org.ldbcouncil.snb.driver.Operation;
 
-import static com.fasterxml.jackson.annotation.JsonTypeInfo.Id.DEDUCTION;
-
-@JsonTypeInfo(use=DEDUCTION)
-@JsonSubTypes( {
-    @JsonSubTypes.Type(LdbcQuery1.class),
-    @JsonSubTypes.Type(LdbcQuery2.class),
-    @JsonSubTypes.Type(LdbcQuery3.class),
-    @JsonSubTypes.Type(LdbcQuery4.class),
-    @JsonSubTypes.Type(LdbcQuery5.class),
-    @JsonSubTypes.Type(LdbcQuery6.class),
-    @JsonSubTypes.Type(LdbcQuery7.class),
-    @JsonSubTypes.Type(LdbcQuery8.class),
-    @JsonSubTypes.Type(LdbcQuery9.class),
-    @JsonSubTypes.Type(LdbcQuery10.class),
-    @JsonSubTypes.Type(LdbcQuery11.class),
-    @JsonSubTypes.Type(LdbcQuery12.class),
-    @JsonSubTypes.Type(LdbcQuery13.class),
-    @JsonSubTypes.Type(LdbcQuery14.class),
-    @JsonSubTypes.Type(LdbcShortQuery1PersonProfile.class),
-    @JsonSubTypes.Type(LdbcShortQuery2PersonPosts.class),
-    @JsonSubTypes.Type(LdbcShortQuery3PersonFriends.class),
-    @JsonSubTypes.Type(LdbcShortQuery4MessageContent.class),
-    @JsonSubTypes.Type(LdbcShortQuery5MessageCreator.class),
-    @JsonSubTypes.Type(LdbcShortQuery6MessageForum.class),
-    @JsonSubTypes.Type(LdbcShortQuery7MessageReplies.class),
-    @JsonSubTypes.Type(LdbcUpdate1AddPerson.class),
-    @JsonSubTypes.Type(LdbcUpdate2AddPostLike.class),
-    @JsonSubTypes.Type(LdbcUpdate3AddCommentLike.class),
-    @JsonSubTypes.Type(LdbcUpdate4AddForum.class),
-    @JsonSubTypes.Type(LdbcUpdate5AddForumMembership.class),
-    @JsonSubTypes.Type(LdbcUpdate6AddPost.class),
-    @JsonSubTypes.Type(LdbcUpdate7AddComment.class),
-    @JsonSubTypes.Type(LdbcUpdate8AddFriendship.class),
-    @JsonSubTypes.Type(LdbcDelete1RemovePerson.class),
-    @JsonSubTypes.Type(LdbcDelete2RemovePostLike.class),
-    @JsonSubTypes.Type(LdbcDelete3RemoveCommentLike.class),
-    @JsonSubTypes.Type(LdbcDelete4RemoveForum.class),
-    @JsonSubTypes.Type(LdbcDelete5RemoveForumMembership.class),
-    @JsonSubTypes.Type(LdbcDelete6RemovePostThread.class),
-    @JsonSubTypes.Type(LdbcDelete7RemoveCommentSubthread.class),
-    @JsonSubTypes.Type(LdbcDelete8RemoveFriendship.class)
-})
 public abstract class Operation<RESULT_TYPE>
 {
     private static final TemporalUtil temporalutil = new TemporalUtil();
@@ -98,7 +52,7 @@ public void setTimeStamp( long timeStamp )
     }
 
     /**
-     * Get type of operation
+     * Get type of operation e.g.
      * @see org.ldbcouncil.snb.driver.workloads.interactive.LdbcSnbInteractiveWorkloadConfiguration#operationTypeToClassMapping()
      * for mapping of LDBC queries
      * @return Type as integer
@@ -132,5 +86,4 @@ public Operation newInstance(){
      * @throws IOException in case the given string cannot be deserialized to the result type
      */
     public abstract RESULT_TYPE deserializeResult( String serializedOperationResult) throws IOException;
-
 }

src/main/java/org/ldbcouncil/snb/driver/Workload.java

@@ -56,6 +56,11 @@ public final void init( DriverConfiguration params ) throws WorkloadException
 
     public abstract void onInit( Map<String,String> params ) throws WorkloadException;
 
+    /**
+     * Gets the operation class object used for serialization.
+     * @return
+     */
+    public abstract Class<? extends Operation> getOperationClass();
 
     public final void close() throws IOException
     {
@@ -71,7 +76,7 @@ public final void close() throws IOException
 
     public final WorkloadStreams streams( GeneratorFactory gf, boolean hasDbConnected ) throws WorkloadException
     {
-        if ( false == isInitialized )
+        if (!isInitialized )
         { throw new WorkloadException( "Workload has not been initialized" ); }
         return getStreams( gf, hasDbConnected );
     }

src/main/java/org/ldbcouncil/snb/driver/validation/ValidationParamsFromCsvRows.java

@@ -1,7 +1,6 @@
 package org.ldbcouncil.snb.driver.validation;
 
 import org.ldbcouncil.snb.driver.Operation;
-import org.ldbcouncil.snb.driver.SerializingMarshallingException;
 import org.ldbcouncil.snb.driver.Workload;
 import org.ldbcouncil.snb.driver.generator.GeneratorException;
 
@@ -16,13 +15,13 @@
 public class ValidationParamsFromCsvRows implements Iterator<ValidationParam>
 {
     private final Iterator<String[]> csvRows;
-    private final Workload workload;
+    private final Class<? extends Operation> operationClass;
     ObjectMapper OBJECT_MAPPER = new ObjectMapper();
 
     public ValidationParamsFromCsvRows( Iterator<String[]> csvRows, Workload workload )
     {
         this.csvRows = csvRows;
-        this.workload = workload;
+        this.operationClass = workload.getOperationClass();
     }
 
     @Override
@@ -41,7 +40,7 @@ public ValidationParam next()
         Operation operation;
         try
         {
-            operation = OBJECT_MAPPER.readValue(serializedOperation, Operation.class);
+            operation = OBJECT_MAPPER.readValue(serializedOperation, this.operationClass);
         }
         catch ( IOException e )
         {

src/main/java/org/ldbcouncil/snb/driver/validation/ValidationParamsToCsvRows.java

@@ -1,15 +1,13 @@
 package org.ldbcouncil.snb.driver.validation;
 
 import org.ldbcouncil.snb.driver.Operation;
-import org.ldbcouncil.snb.driver.SerializingMarshallingException;
 import org.ldbcouncil.snb.driver.Workload;
 import org.ldbcouncil.snb.driver.generator.GeneratorException;
 
 import java.util.Iterator;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
 
 import static java.lang.String.format;
 

src/main/java/org/ldbcouncil/snb/driver/workloads/interactive/LdbcOperation.java

@@ -0,0 +1,59 @@
+package org.ldbcouncil.snb.driver.workloads.interactive;
+/**
+ * LdbcOperation.java
+ * Wrapper abstract class to define the types of Operation classes the
+ * LDBC SNB Interactive workload implements.
+ */
+
+import com.fasterxml.jackson.annotation.JsonSubTypes;
+import com.fasterxml.jackson.annotation.JsonTypeInfo;
+
+import org.ldbcouncil.snb.driver.Operation;
+import org.ldbcouncil.snb.driver.workloads.interactive.queries.*;
+
+import static com.fasterxml.jackson.annotation.JsonTypeInfo.Id;
+import static com.fasterxml.jackson.annotation.JsonTypeInfo.As;
+
+@JsonTypeInfo(use=Id.NAME, include=As.WRAPPER_OBJECT)
+@JsonSubTypes( {
+    @JsonSubTypes.Type(LdbcQuery1.class),
+    @JsonSubTypes.Type(LdbcQuery2.class),
+    @JsonSubTypes.Type(LdbcQuery3.class),
+    @JsonSubTypes.Type(LdbcQuery4.class),
+    @JsonSubTypes.Type(LdbcQuery5.class),
+    @JsonSubTypes.Type(LdbcQuery6.class),
+    @JsonSubTypes.Type(LdbcQuery7.class),
+    @JsonSubTypes.Type(LdbcQuery8.class),
+    @JsonSubTypes.Type(LdbcQuery9.class),
+    @JsonSubTypes.Type(LdbcQuery10.class),
+    @JsonSubTypes.Type(LdbcQuery11.class),
+    @JsonSubTypes.Type(LdbcQuery12.class),
+    @JsonSubTypes.Type(LdbcQuery13.class),
+    @JsonSubTypes.Type(LdbcQuery14.class),
+    @JsonSubTypes.Type(LdbcShortQuery1PersonProfile.class),
+    @JsonSubTypes.Type(LdbcShortQuery2PersonPosts.class),
+    @JsonSubTypes.Type(LdbcShortQuery3PersonFriends.class),
+    @JsonSubTypes.Type(LdbcShortQuery4MessageContent.class),
+    @JsonSubTypes.Type(LdbcShortQuery5MessageCreator.class),
+    @JsonSubTypes.Type(LdbcShortQuery6MessageForum.class),
+    @JsonSubTypes.Type(LdbcShortQuery7MessageReplies.class),
+    @JsonSubTypes.Type(LdbcUpdate1AddPerson.class),
+    @JsonSubTypes.Type(LdbcUpdate2AddPostLike.class),
+    @JsonSubTypes.Type(LdbcUpdate3AddCommentLike.class),
+    @JsonSubTypes.Type(LdbcUpdate4AddForum.class),
+    @JsonSubTypes.Type(LdbcUpdate5AddForumMembership.class),
+    @JsonSubTypes.Type(LdbcUpdate6AddPost.class),
+    @JsonSubTypes.Type(LdbcUpdate7AddComment.class),
+    @JsonSubTypes.Type(LdbcUpdate8AddFriendship.class),
+    @JsonSubTypes.Type(LdbcDelete1RemovePerson.class),
+    @JsonSubTypes.Type(LdbcDelete2RemovePostLike.class),
+    @JsonSubTypes.Type(LdbcDelete3RemoveCommentLike.class),
+    @JsonSubTypes.Type(LdbcDelete4RemoveForum.class),
+    @JsonSubTypes.Type(LdbcDelete5RemoveForumMembership.class),
+    @JsonSubTypes.Type(LdbcDelete6RemovePostThread.class),
+    @JsonSubTypes.Type(LdbcDelete7RemoveCommentSubthread.class),
+    @JsonSubTypes.Type(LdbcDelete8RemoveFriendship.class)
+})
+public abstract class LdbcOperation<LDBC_RESULT_TYPE> extends Operation<LDBC_RESULT_TYPE> {
+
+}

src/main/java/org/ldbcouncil/snb/driver/workloads/interactive/LdbcSnbInteractiveWorkload.java

@@ -718,6 +718,16 @@ public DbValidationParametersFilter dbValidationParametersFilter( Integer requir
         );
     }
 
+    /**
+     * Gets the operation class object used for serialization.
+     * @return LdbcOperation
+     */
+    @Override
+    public Class<? extends Operation> getOperationClass()
+    {
+        return LdbcOperation.class;
+    }
+
     @Override
     public int enabledValidationOperations()
     {

src/main/java/org/ldbcouncil/snb/driver/workloads/interactive/queries/LdbcDelete1RemovePerson.java

@@ -2,13 +2,12 @@
 
 import java.util.Map;
 
-import org.ldbcouncil.snb.driver.Operation;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
+import org.ldbcouncil.snb.driver.workloads.interactive.LdbcOperation;
 import com.google.common.collect.ImmutableMap;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 
-public class LdbcDelete1RemovePerson extends Operation<LdbcNoResult>{
+public class LdbcDelete1RemovePerson extends LdbcOperation<LdbcNoResult>{
     public static final int TYPE = 1009;
     public static final String PERSON_ID = "personId";
 

src/main/java/org/ldbcouncil/snb/driver/workloads/interactive/queries/LdbcDelete2RemovePostLike.java

@@ -2,13 +2,12 @@
 
 import java.util.Map;
 
-import org.ldbcouncil.snb.driver.Operation;
+import org.ldbcouncil.snb.driver.workloads.interactive.LdbcOperation;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;
 
-
-public class LdbcDelete2RemovePostLike extends Operation<LdbcNoResult> {
+public class LdbcDelete2RemovePostLike extends LdbcOperation<LdbcNoResult> {
     public static final int TYPE = 1010;
     public static final String PERSON_ID = "personId";
     public static final String POST_ID = "postId";

src/main/java/org/ldbcouncil/snb/driver/workloads/interactive/queries/LdbcDelete3RemoveCommentLike.java

@@ -2,13 +2,12 @@
 
 import java.util.Map;
 
-import org.ldbcouncil.snb.driver.Operation;
+import org.ldbcouncil.snb.driver.workloads.interactive.LdbcOperation;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;
 
-
-public class LdbcDelete3RemoveCommentLike extends Operation<LdbcNoResult> {
+public class LdbcDelete3RemoveCommentLike extends LdbcOperation<LdbcNoResult> {
     public static final int TYPE = 1011;
     public static final String PERSON_ID = "personId";
     public static final String COMMENT_ID = "commentId";

src/main/java/org/ldbcouncil/snb/driver/workloads/interactive/queries/LdbcDelete4RemoveForum.java

@@ -2,13 +2,12 @@
 
 import java.util.Map;
 
-import org.ldbcouncil.snb.driver.Operation;
+import org.ldbcouncil.snb.driver.workloads.interactive.LdbcOperation;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;
 
-
-public class LdbcDelete4RemoveForum extends Operation<LdbcNoResult> {
+public class LdbcDelete4RemoveForum extends LdbcOperation<LdbcNoResult> {
     public static final int TYPE = 1012;
     public static final String FORUM_ID = "forumId";
 

src/main/java/org/ldbcouncil/snb/driver/workloads/interactive/queries/LdbcDelete5RemoveForumMembership.java

@@ -2,13 +2,12 @@
 
 import java.util.Map;
 
-import org.ldbcouncil.snb.driver.Operation;
+import org.ldbcouncil.snb.driver.workloads.interactive.LdbcOperation;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;
 
-
-public class LdbcDelete5RemoveForumMembership extends Operation<LdbcNoResult> {
+public class LdbcDelete5RemoveForumMembership extends LdbcOperation<LdbcNoResult> {
     public static final int TYPE = 1013;
     public static final String FORUM_ID = "forumId";
     public static final String PERSON_ID = "personId";

src/main/java/org/ldbcouncil/snb/driver/workloads/interactive/queries/LdbcDelete6RemovePostThread.java

@@ -2,13 +2,12 @@
 
 import java.util.Map;
 
-import org.ldbcouncil.snb.driver.Operation;
+import org.ldbcouncil.snb.driver.workloads.interactive.LdbcOperation;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;
 
-
-public class LdbcDelete6RemovePostThread extends Operation<LdbcNoResult> {
+public class LdbcDelete6RemovePostThread extends LdbcOperation<LdbcNoResult> {
     public static final int TYPE = 1014;
     public static final String POST_ID = "postId";
 

src/main/java/org/ldbcouncil/snb/driver/workloads/interactive/queries/LdbcDelete7RemoveCommentSubthread.java

@@ -2,13 +2,12 @@
 
 import java.util.Map;
 
-import org.ldbcouncil.snb.driver.Operation;
+import org.ldbcouncil.snb.driver.workloads.interactive.LdbcOperation;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;
 
-
-public class LdbcDelete7RemoveCommentSubthread extends Operation<LdbcNoResult> {
+public class LdbcDelete7RemoveCommentSubthread extends LdbcOperation<LdbcNoResult> {
     public static final int TYPE = 1015;
     public static final String COMMENT_ID = "commentId";
 

src/main/java/org/ldbcouncil/snb/driver/workloads/interactive/queries/LdbcDelete8RemoveFriendship.java

@@ -2,12 +2,12 @@
 
 import java.util.Map;
 
-import org.ldbcouncil.snb.driver.Operation;
+import org.ldbcouncil.snb.driver.workloads.interactive.LdbcOperation;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.google.common.collect.ImmutableMap;
 
-public class LdbcDelete8RemoveFriendship extends Operation<LdbcNoResult> {
+public class LdbcDelete8RemoveFriendship extends LdbcOperation<LdbcNoResult> {
     public static final int TYPE = 1016;
     public static final String PERSON1_ID = "person1Id";
     public static final String PERSON2_ID = "person2Id";

src/main/java/org/ldbcouncil/snb/driver/workloads/interactive/queries/LdbcQuery1.java

@@ -14,14 +14,14 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.google.common.collect.ImmutableMap;
-import org.ldbcouncil.snb.driver.Operation;
+import org.ldbcouncil.snb.driver.workloads.interactive.LdbcOperation;
 
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-public class LdbcQuery1 extends Operation<List<LdbcQuery1Result>>
+public class LdbcQuery1 extends LdbcOperation<List<LdbcQuery1Result>>
 {
     private static final ObjectMapper OBJECT_MAPPER = new ObjectMapper();