Skip to content

Commit d7f1761

Browse files
rashtaorashtao
committed
Merge branch 'master' into api-test
2 parents 040554f + 67a5409 commit d7f1761

File tree

12 files changed

+162
-16
lines changed

12 files changed

+162
-16
lines changed

‎ChangeLog.md

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,19 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a
66

77
## [Unreleased]
88

9-
## [6.11.0] - 2021-04-16
9+
## [6.12.1] - 2021-04-28
10+
11+
- fixed request timeout in async driver (#ES-837)
12+
13+
## [6.12.0] - 2021-04-28
14+
15+
- added support for modifying collection schema
16+
17+
## [6.11.1] - 2021-04-23
18+
19+
- velocypack v2.5.3
20+
21+
## [6.11.0] - 2021-04-21
1022

1123
- added support for getting db log entries via `GET /_admin/log/entries` (ArangoDB v3.8)
1224
- added support for index estimates (ArangoDB v3.8)

‎pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
<groupId>com.arangodb</groupId>
77
<artifactId>arangodb-java-driver</artifactId>
8-
<version>6.11.0</version>
8+
<version>6.12.1</version>
99
<inceptionYear>2016</inceptionYear>
1010
<packaging>jar</packaging>
1111

@@ -251,7 +251,7 @@
251251
<dependency>
252252
<groupId>com.arangodb</groupId>
253253
<artifactId>velocypack</artifactId>
254-
<version>2.5.2</version>
254+
<version>2.5.3</version>
255255
</dependency>
256256
<dependency>
257257
<groupId>org.slf4j</groupId>

‎src/main/java/com/arangodb/async/internal/utils/CompletableFutureUtils.java

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package com.arangodb.async.internal.utils;
2+
3+
import java.util.concurrent.CompletableFuture;
4+
import java.util.concurrent.Executors;
5+
import java.util.concurrent.ScheduledExecutorService;
6+
import java.util.concurrent.ScheduledFuture;
7+
import java.util.concurrent.TimeUnit;
8+
import java.util.concurrent.TimeoutException;
9+
10+
public class CompletableFutureUtils {
11+
12+
private CompletableFutureUtils() {
13+
}
14+
15+
private static final ScheduledExecutorService timeoutScheduler = Executors.newSingleThreadScheduledExecutor(r -> {
16+
Thread t = Executors.defaultThreadFactory().newThread(r);
17+
t.setDaemon(true);
18+
return t;
19+
}
20+
);
21+
22+
public static <T> CompletableFuture<T> orTimeout(CompletableFuture<T> completableFuture, long timeout, TimeUnit unit) {
23+
ScheduledFuture<?> timeoutTask = timeoutScheduler.schedule(() ->
24+
completableFuture.completeExceptionally(new TimeoutException()), timeout, unit);
25+
completableFuture.whenComplete((v, e) -> timeoutTask.cancel(false));
26+
return completableFuture;
27+
}
28+
29+
}

‎src/main/java/com/arangodb/async/internal/velocystream/VstConnectionAsync.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020

2121
package com.arangodb.async.internal.velocystream;
2222

23+
import com.arangodb.async.internal.utils.CompletableFutureUtils;
2324
import com.arangodb.internal.net.HostDescription;
2425
import com.arangodb.internal.velocystream.internal.Chunk;
2526
import com.arangodb.internal.velocystream.internal.Message;
@@ -30,6 +31,7 @@
3031
import java.util.Collection;
3132
import java.util.concurrent.CompletableFuture;
3233
import java.util.concurrent.FutureTask;
34+
import java.util.concurrent.TimeUnit;
3335

3436
/**
3537
* @author Mark Vollmary
@@ -54,7 +56,11 @@ public synchronized CompletableFuture<Message> write(final Message message, fina
5456
});
5557
messageStore.storeMessage(message.getId(), task);
5658
super.writeIntern(message, chunks);
57-
return future;
59+
if (timeout == null || timeout == 0L) {
60+
return future;
61+
} else {
62+
return CompletableFutureUtils.orTimeout(future, timeout, TimeUnit.MILLISECONDS);
63+
}
5864
}
5965

6066
@Override

‎src/main/java/com/arangodb/internal/velocypack/VPackSerializers.java

Lines changed: 24 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,33 @@
2020

2121
package com.arangodb.internal.velocypack;
2222

23-
import com.arangodb.entity.*;
24-
import com.arangodb.entity.arangosearch.*;
23+
import com.arangodb.entity.BaseDocument;
24+
import com.arangodb.entity.BaseEdgeDocument;
25+
import com.arangodb.entity.CollectionType;
26+
import com.arangodb.entity.DocumentField;
27+
import com.arangodb.entity.LogLevel;
28+
import com.arangodb.entity.MinReplicationFactor;
29+
import com.arangodb.entity.Permissions;
30+
import com.arangodb.entity.ReplicationFactor;
31+
import com.arangodb.entity.ViewType;
32+
import com.arangodb.entity.arangosearch.ArangoSearchCompression;
33+
import com.arangodb.entity.arangosearch.ArangoSearchProperties;
34+
import com.arangodb.entity.arangosearch.CollectionLink;
35+
import com.arangodb.entity.arangosearch.ConsolidationType;
36+
import com.arangodb.entity.arangosearch.FieldLink;
37+
import com.arangodb.entity.arangosearch.PrimarySort;
38+
import com.arangodb.entity.arangosearch.StoreValuesType;
39+
import com.arangodb.entity.arangosearch.StoredValue;
2540
import com.arangodb.internal.velocystream.internal.AuthenticationRequest;
2641
import com.arangodb.model.CollectionSchema;
2742
import com.arangodb.model.TraversalOptions;
2843
import com.arangodb.model.TraversalOptions.Order;
2944
import com.arangodb.model.arangosearch.ArangoSearchPropertiesOptions;
30-
import com.arangodb.velocypack.*;
45+
import com.arangodb.velocypack.VPackBuilder;
46+
import com.arangodb.velocypack.VPackParser;
47+
import com.arangodb.velocypack.VPackSerializer;
48+
import com.arangodb.velocypack.VPackSlice;
49+
import com.arangodb.velocypack.ValueType;
3150
import com.arangodb.velocystream.Request;
3251

3352
import java.util.Collection;
@@ -247,10 +266,10 @@ private static void serializeFieldLinks(final VPackBuilder builder, final Collec
247266

248267
public static final VPackSerializer<CollectionSchema> COLLECTION_VALIDATION = (builder, attribute, value, context) -> {
249268
VPackParser parser = new VPackParser.Builder().build();
250-
VPackSlice rule = parser.fromJson(value.getRule(), true);
269+
VPackSlice rule = value.getRule() != null ? parser.fromJson(value.getRule(), true) : null;
251270
final Map<String, Object> doc = new HashMap<>();
252271
doc.put("message", value.getMessage());
253-
doc.put("level", value.getLevel().getValue());
272+
doc.put("level", value.getLevel() != null ? value.getLevel().getValue() : null);
254273
doc.put("rule", rule);
255274
context.serialize(builder, attribute, doc);
256275
};

‎src/main/java/com/arangodb/internal/velocystream/VstCommunication.java

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,12 @@ protected synchronized C connect(final HostHandle hostHandle, final AccessType a
9292
tryAuthenticate(connection);
9393
}
9494
hostHandler.confirm();
95+
if (!connection.isOpen()) {
96+
// see https://github.com/arangodb/arangodb-java-driver/issues/384
97+
hostHandler.fail();
98+
host = hostHandler.get(hostHandle, accessType);
99+
continue;
100+
}
95101
return connection;
96102
} catch (final IOException e) {
97103
hostHandler.fail();

‎src/main/java/com/arangodb/model/CollectionCreateOptions.java

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@
2020

2121
package com.arangodb.model;
2222

23-
import com.arangodb.entity.*;
23+
import com.arangodb.entity.CollectionType;
24+
import com.arangodb.entity.KeyOptions;
25+
import com.arangodb.entity.KeyType;
26+
import com.arangodb.entity.MinReplicationFactor;
27+
import com.arangodb.entity.ReplicationFactor;
2428

2529
/**
2630
* @author Mark Vollmary
@@ -330,10 +334,21 @@ public CollectionSchema getSchema() {
330334
}
331335

332336
/**
333-
* @param schema object that specifies the collection level schema for documents
334-
* @since ArangoDB 3.7
337+
* @param schema
338+
* object that specifies the collection level schema for documents
335339
* @return options
340+
* @since ArangoDB 3.7
341+
*/
342+
public CollectionCreateOptions schema(final CollectionSchema schema) {
343+
this.schema = schema;
344+
return this;
345+
}
346+
347+
/**
348+
* @since ArangoDB 3.7
349+
* @deprecated Use {@link #schema(CollectionSchema)} instead.
336350
*/
351+
@Deprecated
337352
public CollectionCreateOptions setSchema(final CollectionSchema schema) {
338353
this.schema = schema;
339354
return this;

‎src/main/java/com/arangodb/model/CollectionPropertiesOptions.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ public class CollectionPropertiesOptions {
2929

3030
private Boolean waitForSync;
3131
private Long journalSize;
32+
private CollectionSchema schema;
3233

3334
public CollectionPropertiesOptions() {
3435
super();
@@ -62,4 +63,18 @@ public CollectionPropertiesOptions journalSize(final Long journalSize) {
6263
return this;
6364
}
6465

66+
public CollectionSchema getSchema() {
67+
return schema;
68+
}
69+
70+
/**
71+
* @param schema object that specifies the collection level schema for documents
72+
* @since ArangoDB 3.7
73+
* @return options
74+
*/
75+
public CollectionPropertiesOptions schema(final CollectionSchema schema) {
76+
this.schema = schema;
77+
return this;
78+
}
79+
6580
}

‎src/main/java/com/arangodb/model/CollectionSchema.java

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,15 @@
2828
* @since ArangoDB 3.7
2929
*/
3030
public class CollectionSchema {
31+
32+
/**
33+
* Value to unset the collection schema on properties update {@link com.arangodb.ArangoCollection#changeProperties(CollectionPropertiesOptions)}.
34+
*/
35+
public static final CollectionSchema NULL_SCHEMA = new CollectionSchema()
36+
.setLevel(null)
37+
.setMessage(null)
38+
.setRule(null);
39+
3140
private String rule;
3241
private Level level;
3342
private String message;

‎src/test/java/com/arangodb/ArangoCollectionTest.java

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import com.arangodb.entity.ShardEntity;
3838
import com.arangodb.model.CollectionCreateOptions;
3939
import com.arangodb.model.CollectionPropertiesOptions;
40+
import com.arangodb.model.CollectionSchema;
4041
import com.arangodb.model.DocumentCreateOptions;
4142
import com.arangodb.model.DocumentDeleteOptions;
4243
import com.arangodb.model.DocumentExistsOptions;
@@ -2612,14 +2613,47 @@ public void getPropeties() {
26122613
public void changeProperties() {
26132614
final CollectionPropertiesEntity properties = collection.getProperties();
26142615
assertThat(properties.getWaitForSync(), is(notNullValue()));
2616+
if (isAtLeastVersion(3, 7)) {
2617+
assertThat(properties.getSchema(), is(nullValue()));
2618+
}
26152619

2616-
final CollectionPropertiesEntity changedProperties = collection.changeProperties(new CollectionPropertiesOptions()
2617-
.waitForSync(!properties.getWaitForSync()));
2620+
String schemaRule = ("{ " +
2621+
" \"properties\": {" +
2622+
" \"number\": {" +
2623+
" \"type\": \"number\"" +
2624+
" }" +
2625+
" }" +
2626+
" }")
2627+
.replaceAll("\\s", "");
2628+
String schemaMessage = "The document has problems!";
2629+
2630+
CollectionPropertiesOptions updatedOptions = new CollectionPropertiesOptions()
2631+
.waitForSync(!properties.getWaitForSync())
2632+
.schema(new CollectionSchema()
2633+
.setLevel(CollectionSchema.Level.NEW)
2634+
.setMessage(schemaMessage)
2635+
.setRule(schemaRule)
2636+
);
2637+
2638+
final CollectionPropertiesEntity changedProperties = collection.changeProperties(updatedOptions);
26182639
assertThat(changedProperties.getWaitForSync(), is(notNullValue()));
26192640
assertThat(changedProperties.getWaitForSync(), is(!properties.getWaitForSync()));
2641+
if (isAtLeastVersion(3, 7)) {
2642+
assertThat(changedProperties.getSchema(), is(notNullValue()));
2643+
assertThat(changedProperties.getSchema().getLevel(), is(CollectionSchema.Level.NEW));
2644+
assertThat(changedProperties.getSchema().getMessage(), is(schemaMessage));
2645+
assertThat(changedProperties.getSchema().getRule(), is(schemaRule));
2646+
}
26202647

26212648
// revert changes
2622-
collection.changeProperties(new CollectionPropertiesOptions().waitForSync(properties.getWaitForSync()));
2649+
CollectionPropertiesEntity revertedProperties = collection.changeProperties(new CollectionPropertiesOptions()
2650+
.waitForSync(properties.getWaitForSync())
2651+
.schema(CollectionSchema.NULL_SCHEMA)
2652+
);
2653+
if (isAtLeastVersion(3, 7)) {
2654+
assertThat(revertedProperties.getSchema(), is(nullValue()));
2655+
}
2656+
26232657
}
26242658

26252659
@Test

0 commit comments

Comments
 (0)