Fix to version metadata

Author: KodaiD

core/src/main/java/com/scalar/db/storage/objectstorage/ObjectStorageNamespaceMetadata.java

@@ -6,22 +6,33 @@
 
 @Immutable
 public class ObjectStorageNamespaceMetadata {
+  public static final Integer DEFAULT_VERSION = 1;
   private final String name;
+  private final Integer version;
 
   // The default constructor is required by Jackson to deserialize JSON object
   @SuppressWarnings("unused")
   public ObjectStorageNamespaceMetadata() {
-    this(null);
+    this(null, null);
   }
 
-  public ObjectStorageNamespaceMetadata(@Nullable String name) {
+  public ObjectStorageNamespaceMetadata(@Nullable String name, @Nullable Integer version) {
     this.name = name != null ? name : "";
+    this.version = version != null ? version : DEFAULT_VERSION;
+  }
+
+  public ObjectStorageNamespaceMetadata(@Nullable String name) {
+    this(name, DEFAULT_VERSION);
   }
 
   public String getName() {
     return name;
   }
 
+  public Integer getVersion() {
+    return version;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -32,11 +43,11 @@ public boolean equals(Object o) {
     }
     ObjectStorageNamespaceMetadata that = (ObjectStorageNamespaceMetadata) o;
 
-    return name.equals(that.name);
+    return name.equals(that.name) && version.equals(that.version);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(name);
+    return Objects.hash(name, version);
   }
 }

core/src/main/java/com/scalar/db/storage/objectstorage/ObjectStorageTableMetadata.java

@@ -19,23 +19,26 @@
 @SuppressFBWarnings({"EI_EXPOSE_REP", "EI_EXPOSE_REP2"})
 @Immutable
 public class ObjectStorageTableMetadata {
+  public static final Integer DEFAULT_VERSION = 1;
   private final LinkedHashSet<String> partitionKeyNames;
   private final LinkedHashSet<String> clusteringKeyNames;
   private final Map<String, String> clusteringOrders;
   private final Set<String> secondaryIndexNames;
   private final Map<String, String> columns;
+  private final Integer version;
 
   // The default constructor is required by Jackson to deserialize JSON object
   public ObjectStorageTableMetadata() {
-    this(null, null, null, null, null);
+    this(null, null, null, null, null, null);
   }
 
   public ObjectStorageTableMetadata(
       @Nullable LinkedHashSet<String> partitionKeyNames,
       @Nullable LinkedHashSet<String> clusteringKeyNames,
       @Nullable Map<String, String> clusteringOrders,
       @Nullable Set<String> secondaryIndexNames,
-      @Nullable Map<String, String> columns) {
+      @Nullable Map<String, String> columns,
+      @Nullable Integer version) {
     this.partitionKeyNames =
         partitionKeyNames != null ? new LinkedHashSet<>(partitionKeyNames) : new LinkedHashSet<>();
     this.clusteringKeyNames =
@@ -47,9 +50,10 @@ public ObjectStorageTableMetadata(
     this.secondaryIndexNames =
         secondaryIndexNames != null ? new HashSet<>(secondaryIndexNames) : Collections.emptySet();
     this.columns = columns != null ? new HashMap<>(columns) : Collections.emptyMap();
+    this.version = version != null ? version : DEFAULT_VERSION;
   }
 
-  public ObjectStorageTableMetadata(TableMetadata tableMetadata) {
+  public ObjectStorageTableMetadata(TableMetadata tableMetadata, Integer version) {
     Map<String, String> clusteringOrders =
         tableMetadata.getClusteringKeyNames().stream()
             .collect(
@@ -67,6 +71,11 @@ public ObjectStorageTableMetadata(TableMetadata tableMetadata) {
     this.clusteringOrders = clusteringOrders;
     this.secondaryIndexNames = tableMetadata.getSecondaryIndexNames();
     this.columns = columnTypeByName;
+    this.version = version;
+  }
+
+  public ObjectStorageTableMetadata(TableMetadata tableMetadata) {
+    this(tableMetadata, DEFAULT_VERSION);
   }
 
   private ObjectStorageTableMetadata(Builder builder) {
@@ -75,7 +84,8 @@ private ObjectStorageTableMetadata(Builder builder) {
         builder.clusteringKeyNames,
         builder.clusteringOrders,
         builder.secondaryIndexNames,
-        builder.columns);
+        builder.columns,
+        builder.version);
   }
 
   public LinkedHashSet<String> getPartitionKeyNames() {
@@ -98,6 +108,10 @@ public Map<String, String> getColumns() {
     return columns;
   }
 
+  public Integer getVersion() {
+    return version;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -111,13 +125,19 @@ public boolean equals(Object o) {
         && Objects.equals(clusteringKeyNames, that.clusteringKeyNames)
         && Objects.equals(clusteringOrders, that.clusteringOrders)
         && Objects.equals(secondaryIndexNames, that.secondaryIndexNames)
-        && Objects.equals(columns, that.columns);
+        && Objects.equals(columns, that.columns)
+        && Objects.equals(version, that.version);
   }
 
   @Override
   public int hashCode() {
     return Objects.hash(
-        partitionKeyNames, clusteringKeyNames, clusteringOrders, secondaryIndexNames, columns);
+        partitionKeyNames,
+        clusteringKeyNames,
+        clusteringOrders,
+        secondaryIndexNames,
+        columns,
+        version);
   }
 
   public TableMetadata toTableMetadata() {
@@ -169,6 +189,7 @@ public static final class Builder {
     private Map<String, String> clusteringOrders;
     private Set<String> secondaryIndexNames;
     private Map<String, String> columns;
+    private Integer version;
 
     private Builder() {}
 
@@ -197,6 +218,11 @@ public ObjectStorageTableMetadata.Builder columns(Map<String, String> val) {
       return this;
     }
 
+    public ObjectStorageTableMetadata.Builder version(Integer val) {
+      version = val;
+      return this;
+    }
+
     public ObjectStorageTableMetadata build() {
       return new ObjectStorageTableMetadata(this);
     }