Merge branch 'preview'

Author: rashtao

.github/workflows/maven.yml

@@ -4,9 +4,11 @@ on:
   pull_request:
     branches:
       - master
+      - preview
   push:
     branches:
       - master
+      - preview
 
 jobs:
   package:
@@ -30,14 +32,12 @@ jobs:
       fail-fast: false
       matrix:
         docker-img:
-          - docker.io/arangodb:3.4.9
-          - docker.io/arangodb:3.5.4
-          - docker.io/arangodb:3.6.2
-          - docker.io/arangodb/arangodb-preview:3.7.0-alpha.2
-          - docker.io/arangodb/enterprise:3.4.9
-          - docker.io/arangodb/enterprise:3.5.4
-          - docker.io/arangodb/enterprise:3.6.2
-          - docker.io/arangodb/enterprise-preview:3.7.0-alpha.2
+          - docker.io/arangodb:3.5.5
+          - docker.io/arangodb:3.6.4
+          - docker.io/arangodb/arangodb-preview:3.7.1-rc.1
+          - docker.io/arangodb/enterprise:3.5.5
+          - docker.io/arangodb/enterprise:3.6.4
+          - docker.io/arangodb/enterprise-preview:3.7.1-rc.1
         topology:
           - single
           - cluster
@@ -54,3 +54,6 @@ jobs:
           ARANGO_LICENSE_KEY: ${{ secrets.ARANGO_LICENSE_KEY }}
       - name: Test
         run: mvn --no-transfer-progress test
+      - name: Debug containers
+        if: ${{ cancelled() || failure() }}
+        run: ./docker/debug_containers_${{ matrix.topology }}.sh

ChangeLog.md

@@ -6,6 +6,15 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 ## [Unreleased]
 
+## [6.7.0_PREVIEW_3.7.1-alpha.1] - 2020-05-22
+
+- added support of `DisjointSmartGraphs` and `SatelliteGraphs` (ArangoDB v3.7)
+- added support of `storedValues` in `ArangoSearchProperties` (ArangoDB v3.7)
+- added support of `primarySortCompression` in `ArangoSearchProperties` (ArangoDB v3.7)
+- added support of `overwriteMode` on document creation, to allow `insert-ignore`, `insert-replace` and `insert-update` (ArangoDB v3.7)
+- added support of `mergeObjects` for insert document with `overwriteMode: update` (ArangoDB v3.7)
+- velocypack v2.3.1
+
 ## [6.6.3] - 2020-05-06
 
 - velocypack v2.3.1
@@ -14,6 +23,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
 
 - bugfix VelocyJack deserialization
 - bugfix `allowImplicit` parameter in stream transactions
+
+## [6.7.0_PREVIEW_3.7.0-alpha.2_0] - 2020-03-24
+
+- added `overwriteMode` parameter to support insert-update (ArangoDB v3.7)
+- satellite graphs support (ArangoDB v3.7)
+- schema validation (ArangoDB v3.7)
 - added `peakMemoryUsage` to aql statistics
 
 ## [6.6.1] - 2020-03-18

docker/debug_containers_cluster.sh

@@ -0,0 +1,24 @@
+debug_container() {
+  echo "=== === === ==="
+  echo "=== $1"
+
+  running=$(docker inspect -f '{{.State.Running}}' "$1")
+
+  if [ "$running" = false ]; then
+    echo "=== $1 IS NOT RUNNING!"
+  fi
+
+  echo "=== === === ==="
+
+  docker logs "$1"
+}
+
+for c in agent1 \
+  agent2 \
+  agent3 \
+  dbserver1 \
+  dbserver2 \
+  coordinator1 \
+  coordinator2; do
+  debug_container $c
+done

docker/debug_containers_single.sh

@@ -0,0 +1,18 @@
+container_name="arangodb"
+
+debug_container() {
+  echo "=== === === ==="
+  echo "=== $1"
+
+  running=$(docker inspect -f '{{.State.Running}}' "$1")
+
+  if [ "$running" = false ]; then
+    echo "=== $1 IS NOT RUNNING!"
+  fi
+
+  echo "=== === === ==="
+
+  docker logs "$1"
+}
+
+debug_container $container_name

docker/start_db_single.sh

@@ -11,7 +11,7 @@ docker pull "$1"
 
 docker network create arangodb --subnet 172.28.0.0/16
 
-docker run -d -p 8529:8529 -e ARANGO_ROOT_PASSWORD=test -e ARANGO_LICENSE_KEY="$ARANGO_LICENSE_KEY" --network arangodb --ip 172.28.3.1 "$1"
+docker run -d -p 8529:8529 -e ARANGO_ROOT_PASSWORD=test -e ARANGO_LICENSE_KEY="$ARANGO_LICENSE_KEY" --network arangodb --ip 172.28.3.1 --name arangodb "$1"
 
 echo "waiting for arangodb ..."
 

pom.xml

@@ -5,7 +5,7 @@
 
     <groupId>com.arangodb</groupId>
     <artifactId>arangodb-java-driver</artifactId>
-    <version>6.6.3</version>
+    <version>6.7.0_PREVIEW_3.7.1-alpha.1</version>
     <inceptionYear>2016</inceptionYear>
     <packaging>jar</packaging>
 

src/main/java/com/arangodb/entity/CollectionEntity.java

@@ -20,6 +20,8 @@
 
 package com.arangodb.entity;
 
+import com.arangodb.model.CollectionSchema;
+
 /**
  * @author Mark Vollmary
  * @see <a href="https://www.arangodb.com/docs/stable/http/collection-creating.html">API Documentation</a>
@@ -33,6 +35,7 @@ public class CollectionEntity implements Entity {
     private Boolean isSystem;
     private CollectionStatus status;
     private CollectionType type;
+    private CollectionSchema schema;
 
     public CollectionEntity() {
         super();
@@ -66,4 +69,12 @@ public CollectionType getType() {
         return type;
     }
 
+    /**
+     * @return Optional object that specifies the collection level schema for documents.
+     * @since ArangoDB 3.7
+     */
+    public CollectionSchema getSchema() {
+        return schema;
+    }
+
 }

src/main/java/com/arangodb/entity/GraphEntity.java

@@ -36,9 +36,10 @@ public class GraphEntity implements Entity {
     private Collection<EdgeDefinition> edgeDefinitions;
     private Collection<String> orphanCollections;
     private Boolean isSmart;
+    private Boolean isDisjoint;
     private Integer numberOfShards;
     private String smartGraphAttribute;
-    private Integer replicationFactor;
+    private ReplicationFactor replicationFactor;
     private Integer minReplicationFactor;
 
     public String getName() {
@@ -57,12 +58,20 @@ public Boolean getIsSmart() {
         return isSmart;
     }
 
+    public Boolean getIsDisjoint() {
+        return isDisjoint;
+    }
+
     public Integer getNumberOfShards() {
         return numberOfShards;
     }
 
     public Integer getReplicationFactor() {
-        return replicationFactor;
+        return replicationFactor.getReplicationFactor();
+    }
+
+    public Boolean getSatellite() {
+        return this.replicationFactor.getSatellite();
     }
 
     public Integer getMinReplicationFactor() {

src/main/java/com/arangodb/entity/arangosearch/ArangoSearchCompression.java

@@ -0,0 +1,51 @@
+/*
+ * DISCLAIMER
+ *
+ * Copyright 2016 ArangoDB GmbH, Cologne, Germany
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright holder is ArangoDB GmbH, Cologne, Germany
+ */
+
+package com.arangodb.entity.arangosearch;
+
+
+/**
+ * @author Michele Rastelli
+ * @see <a href="https://www.arangodb.com/docs/stable/http/views-arangosearch.html">API Documentation</a>
+ * @since ArangoDB 3.7
+ */
+public enum ArangoSearchCompression {
+
+    /**
+     * (default): use LZ4 fast compression.
+     */
+    lz4("lz4"),
+
+    /**
+     * disable compression to trade space for speed.
+     */
+    none("none");
+
+    private final String value;
+
+    ArangoSearchCompression(String value) {
+        this.value = value;
+    }
+
+    public String getValue() {
+        return value;
+    }
+
+}

src/main/java/com/arangodb/entity/arangosearch/ArangoSearchProperties.java

@@ -27,6 +27,8 @@
 /**
  * @author Mark Vollmary
  * @author Heiko Kernbach
+ * @author Michele Rastelli
+ * @see <a href="https://www.arangodb.com/docs/stable/http/views-arangosearch.html">API Documentation</a>
  */
 public class ArangoSearchProperties {
 
@@ -36,11 +38,14 @@ public class ArangoSearchProperties {
     private ConsolidationPolicy consolidationPolicy;
     private final Collection<PrimarySort> primarySorts;
     private final Collection<CollectionLink> links;
+    private ArangoSearchCompression primarySortCompression;
+    private final Collection<StoredValue> storedValues;
 
     public ArangoSearchProperties() {
         super();
         links = new ArrayList<>();
         primarySorts = new ArrayList<>();
+        storedValues = new ArrayList<>();
     }
 
     public Long getCommitIntervalMsec() {
@@ -90,4 +95,32 @@ public Collection<PrimarySort> getPrimarySort() {
     public void addPrimarySort(final PrimarySort... primarySorts) {
         this.primarySorts.addAll(Arrays.asList(primarySorts));
     }
+
+    /**
+     * @return Defines how to compress the primary sort data (introduced in v3.7.0). ArangoDB v3.5 and v3.6 always
+     * compress the index using LZ4.
+     * @since ArangoDB 3.7
+     */
+    public ArangoSearchCompression getPrimarySortCompression() {
+        return primarySortCompression;
+    }
+
+    public void setPrimarySortCompression(ArangoSearchCompression primarySortCompression) {
+        this.primarySortCompression = primarySortCompression;
+    }
+
+    /**
+     * @return An array of objects to describe which document attributes to store in the View index. It can then cover
+     * search queries, which means the data can be taken from the index directly and accessing the storage engine can be
+     * avoided.
+     * @since ArangoDB 3.7
+     */
+    public Collection<StoredValue> getStoredValues() {
+        return storedValues;
+    }
+
+    public void addStoredValues(final StoredValue... storedValues) {
+        this.storedValues.addAll(Arrays.asList(storedValues));
+    }
+
 }

src/main/java/com/arangodb/entity/arangosearch/ArangoSearchPropertiesEntity.java

@@ -27,6 +27,8 @@
 
 /**
  * @author Mark Vollmary
+ * @author Michele Rastelli
+ * @see <a href="https://www.arangodb.com/docs/stable/http/views-arangosearch.html">API Documentation</a>
  */
 public class ArangoSearchPropertiesEntity extends ViewEntity {
 
@@ -94,4 +96,24 @@ public Collection<CollectionLink> getLinks() {
     public Collection<PrimarySort> getPrimarySort() {
         return properties.getPrimarySort();
     }
+
+    /**
+     * @return Defines how to compress the primary sort data (introduced in v3.7.0). ArangoDB v3.5 and v3.6 always
+     * compress the index using LZ4.
+     * @since ArangoDB 3.7
+     */
+    public ArangoSearchCompression getPrimarySortCompression() {
+        return properties.getPrimarySortCompression();
+    }
+
+    /**
+     * @return An array of objects to describe which document attributes to store in the View index. It can then cover
+     * search queries, which means the data can be taken from the index directly and accessing the storage engine can be
+     * avoided.
+     * @since ArangoDB 3.7
+     */
+    public Collection<StoredValue> getStoredValues() {
+        return properties.getStoredValues();
+    }
+
 }

src/main/java/com/arangodb/entity/arangosearch/StoredValue.java

@@ -0,0 +1,61 @@
+/*
+ * DISCLAIMER
+ *
+ * Copyright 2016 ArangoDB GmbH, Cologne, Germany
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Copyright holder is ArangoDB GmbH, Cologne, Germany
+ */
+
+package com.arangodb.entity.arangosearch;
+
+
+import java.util.List;
+
+/**
+ * @author Michele Rastelli
+ * @see <a href="https://www.arangodb.com/docs/stable/http/views-arangosearch.html">API Documentation</a>
+ * @since ArangoDB 3.7
+ */
+public class StoredValue {
+
+    private final List<String> fields;
+    private final ArangoSearchCompression compression;
+
+    public StoredValue(List<String> fields, ArangoSearchCompression compression) {
+        this.fields = fields;
+        this.compression = compression;
+    }
+
+    public StoredValue(List<String> fields) {
+        this(fields, null);
+    }
+
+    /**
+     * @return an array of strings with one or more document attribute paths. The specified attributes are placed into a
+     * single column of the index. A column with all fields that are involved in common search queries is ideal for
+     * performance. The column should not include too many unneeded fields however.
+     */
+    public List<String> getFields() {
+        return fields;
+    }
+
+    /**
+     * @return defines the compression type used for the internal column-store
+     */
+    public ArangoSearchCompression getCompression() {
+        return compression;
+    }
+
+}