Merge pull request #105 from datadrivencz/96-replication-master-rebase

96 replication master rebase
datadrivencz · Jul 18, 2018 · 6bb40f4 · 6bb40f4
2 parents 1918358 + c7d1ba2
commit 6bb40f4
Show file tree

Hide file tree

Showing 53 changed files with 4,599 additions and 714 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,7 +8,6 @@ jdk:
 addons:
   apt:
     packages:
-      - oracle-java8-installer
       - realpath
   sonarcloud:
     organization: datadriven

diff --git a/...o2/proxima/repository/ProxyTransform.java → .../cz/o2/proxima/functional/BiFunction.java b/...o2/proxima/repository/ProxyTransform.java → .../cz/o2/proxima/functional/BiFunction.java
@@ -13,29 +13,18 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package cz.o2.proxima.repository;
+package cz.o2.proxima.functional;
 
 import cz.o2.proxima.annotations.Stable;
 import java.io.Serializable;
 
 /**
- * A transformation of attribute name applied both on reading and writing attribute.
+ * Binary function of two arguments.
  */
 @Stable
-public interface ProxyTransform extends Serializable {
+@FunctionalInterface
+public interface BiFunction<A, B, OUT> extends Serializable {
 
-  /**
-   * Apply transformation to attribute name from proxy naming.
-   * @param proxy name of the attribute in proxy namespace
-   * @return the raw attribute
-   */
-  String fromProxy(String proxy);
-
-  /**
-   * Apply transformation to attribute name to proxy naming.
-   * @param raw the raw attribute name
-   * @return the proxy attribute name
-   */
-  String toProxy(String raw);
+  OUT apply(A first, B second);
 
 }
diff --git a/core/src/main/java/cz/o2/proxima/repository/AttributeDescriptor.java b/core/src/main/java/cz/o2/proxima/repository/AttributeDescriptor.java
@@ -15,6 +15,7 @@
  */
 package cz.o2.proxima.repository;
 
+import cz.o2.proxima.transform.ProxyTransform;
 import cz.o2.proxima.annotations.Stable;
 import cz.o2.proxima.scheme.ValueSerializerFactory;
 import java.io.Serializable;
@@ -49,6 +50,9 @@ private Builder(Repository repo) {
     @Setter
     private URI schemeURI;
 
+    @Setter
+    private boolean replica = false;
+
     @SuppressWarnings("unchecked")
     public <T> AttributeDescriptorImpl<T> build() {
       Objects.requireNonNull(name, "Please specify name");
@@ -57,8 +61,13 @@ public <T> AttributeDescriptorImpl<T> build() {
 
       ValueSerializerFactory factory = repo.getValueSerializerFactory(schemeURI.getScheme());
 
-      return new AttributeDescriptorImpl<>(name, entity, schemeURI,
-          factory == null ? null : (ValueSerializer<T>) factory.getValueSerializer(schemeURI));
+      return new AttributeDescriptorImpl<>(
+          name, entity,
+          schemeURI,
+          factory == null
+              ? null
+              : factory.getValueSerializer(schemeURI),
+          replica);
     }
   }
 
@@ -68,9 +77,25 @@ static Builder newBuilder(Repository repo) {
 
   static <T> AttributeDescriptorBase<T> newProxy(
       String name,
-      AttributeDescriptorBase<T> target,
-      ProxyTransform transform) {
-    return new AttributeProxyDescriptorImpl<>(name, target, transform);
+      AttributeDescriptor<T> targetRead,
+      ProxyTransform transformRead,
+      AttributeDescriptor<T> targetWrite,
+      ProxyTransform transformWrite) {
+
+    return newProxy(
+        name, targetRead, transformRead, targetWrite, transformWrite, false);
+  }
+
+  static <T> AttributeDescriptorBase<T> newProxy(
+      String name,
+      AttributeDescriptor<T> targetRead,
+      ProxyTransform transformRead,
+      AttributeDescriptor<T> targetWrite,
+      ProxyTransform transformWrite,
+      boolean replica) {
+
+    return new AttributeProxyDescriptorImpl<>(
+        name, targetRead, transformRead, targetWrite, transformWrite, replica);
   }
 
   /**

diff --git a/core/src/main/java/cz/o2/proxima/repository/AttributeDescriptorBase.java b/core/src/main/java/cz/o2/proxima/repository/AttributeDescriptorBase.java
@@ -15,6 +15,7 @@
  */
 package cz.o2.proxima.repository;
 
+import com.google.common.base.Preconditions;
 import cz.o2.proxima.annotations.Internal;
 import cz.o2.proxima.scheme.ValueSerializer;
 import java.net.URI;
@@ -43,18 +44,23 @@ public abstract class AttributeDescriptorBase<T> implements AttributeDescriptor<
   @Getter
   protected final boolean wildcard;
 
+  @Getter
+  protected final boolean replica;
+
   protected @Nullable final ValueSerializer<T> valueSerializer;
 
   public AttributeDescriptorBase(
       String name, String entity, URI schemeURI,
-      @Nullable ValueSerializer<T> valueSerializer) {
+      @Nullable ValueSerializer<T> valueSerializer,
+      boolean replica) {
 
     this.name = Objects.requireNonNull(name);
     this.entity = Objects.requireNonNull(entity);
     this.schemeURI = Objects.requireNonNull(schemeURI);
     this.wildcard = this.name.endsWith(".*");
     this.proxy = false;
     this.valueSerializer = valueSerializer;
+    this.replica = replica;
     if (this.wildcard) {
       if (name.length() < 3
           || name.substring(0, name.length() - 1).contains("*")
@@ -69,13 +75,32 @@ public AttributeDescriptorBase(
     }
   }
 
-  public AttributeDescriptorBase(String name, AttributeDescriptorBase<T> target) {
+  public AttributeDescriptorBase(
+      String name,
+      AttributeDescriptor<T> targetRead,
+      AttributeDescriptor<T> targetWrite,
+      boolean replica) {
+
     this.name = Objects.requireNonNull(name);
-    this.entity = target.getEntity();
-    this.schemeURI = target.getSchemeURI();
+    Preconditions.checkArgument(
+        targetRead.getEntity().equals(targetWrite.getEntity()),
+        String.format(
+            "Cannot mix entities in proxies, got %s and %s",
+            targetRead.getEntity(), targetWrite.getEntity()));
+    Preconditions.checkArgument(
+        targetRead.getSchemeURI().equals(targetWrite.getSchemeURI()),
+        String.format(
+            "Cannot mix attributes with different schemes, got %s and %s",
+            targetRead.getSchemeURI(), targetWrite.getSchemeURI()));
+    Preconditions.checkArgument(
+        targetRead.isWildcard() == targetWrite.isWildcard(),
+        "Cannot mix non-wildcard and wildcard attributes in proxy");
+    this.entity = targetRead.getEntity();
+    this.schemeURI = targetRead.getSchemeURI();
     this.proxy = true;
-    this.wildcard = target.isWildcard();
-    this.valueSerializer = target.getValueSerializer();
+    this.replica = replica;
+    this.wildcard = targetRead.isWildcard();
+    this.valueSerializer = targetRead.getValueSerializer();
   }
 
   @Override
@@ -123,4 +148,11 @@ public Builder toBuilder(Repository repo) {
         .setSchemeURI(getSchemeURI());
   }
 
+  AttributeProxyDescriptorImpl<T> toProxy() {
+    Preconditions.checkArgument(
+        this instanceof AttributeProxyDescriptorImpl,
+        "Attribute " + this + " is not proxy attribute");
+    return (AttributeProxyDescriptorImpl<T>) this;
+  }
+
 }
diff --git a/core/src/main/java/cz/o2/proxima/repository/AttributeDescriptorImpl.java b/core/src/main/java/cz/o2/proxima/repository/AttributeDescriptorImpl.java
@@ -31,9 +31,10 @@ public class AttributeDescriptorImpl<T>
 
   AttributeDescriptorImpl(
       String name, String entity,
-      URI schemeURI, @Nullable ValueSerializer<T> serializer) {
+      URI schemeURI, @Nullable ValueSerializer<T> serializer,
+      boolean replica) {
 
-    super(name, entity, schemeURI, serializer);
+    super(name, entity, schemeURI, serializer, replica);
   }
 
 

diff --git a/core/src/main/java/cz/o2/proxima/repository/AttributeFamilyDescriptor.java b/core/src/main/java/cz/o2/proxima/repository/AttributeFamilyDescriptor.java
@@ -26,8 +26,10 @@
 import cz.o2.proxima.storage.randomaccess.RandomAccessReader;
 import cz.o2.proxima.view.PartitionedCachedView;
 import cz.o2.proxima.view.PartitionedView;
+import cz.seznam.euphoria.shadow.com.google.common.collect.Lists;
 import java.io.Serializable;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -83,6 +85,11 @@ public static final class Builder {
 
     private Builder() { }
 
+    public Builder clearAttributes() {
+      attributes.clear();
+      return this;
+    }
+
     public Builder addAttribute(AttributeDescriptor<?> desc) {
       attributes.add(desc);
       return this;
@@ -143,7 +150,7 @@ public static Builder newBuilder() {
 
   AttributeFamilyDescriptor(String name,
       StorageType type,
-      List<AttributeDescriptor<?>> attributes,
+      Collection<AttributeDescriptor<?>> attributes,
       @Nullable AttributeWriterBase writer,
       @Nullable CommitLogReader commitLogReader,
       @Nullable BatchLogObservable batchObservable,
@@ -156,7 +163,7 @@ public static Builder newBuilder() {
 
     this.name = Objects.requireNonNull(name);
     this.type = type;
-    this.attributes = Objects.requireNonNull(attributes);
+    this.attributes = Lists.newArrayList(Objects.requireNonNull(attributes));
     this.writer = writer;
     this.commitLogReader = commitLogReader;
     this.batchObservable = batchObservable;
@@ -174,7 +181,7 @@ public List<AttributeDescriptor<?>> getAttributes() {
 
   @Override
   public String toString() {
-    return "AttributeFamily(" + name + ")";
+    return "AttributeFamily(name=" + name + ", attributes=" + attributes + ")";
   }
 
   @Override
@@ -281,4 +288,29 @@ public Optional<String> getSource() {
     return Optional.ofNullable(source);
   }
 
+  Builder toBuilder() {
+    Builder ret = new Builder()
+        .setAccess(access)
+        .setBatchObservable(batchObservable)
+        .setCachedView(cachedView)
+        .setCommitLog(commitLogReader)
+        .setFilter(filter)
+        .setName(name)
+        .setPartitionedView(partitionedView)
+        .setRandomAccess(randomAccess)
+        .setSource(source)
+        .setType(type)
+        .setWriter(writer);
+    attributes.forEach(ret::addAttribute);
+    return ret;
+  }
+
+  /**
+   * Check if this proxied family.
+   * @return {@code true} if proxied family
+   */
+  boolean isProxy() {
+    return false;
+  }
+
 }