Skip to content

Commit 3d6944e

Browse files
committed
Add support for "force_map_call" option
Closes #459
1 parent 14e051a commit 3d6944e

File tree

4 files changed

+56
-2
lines changed

4 files changed

+56
-2
lines changed

src/main/java/io/tarantool/driver/api/space/options/SelectOptions.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import io.tarantool.driver.api.space.options.crud.OperationWithBatchSizeOptions;
44
import io.tarantool.driver.api.space.options.crud.OperationWithBucketIdOptions;
55
import io.tarantool.driver.api.space.options.crud.OperationWithFieldsOptions;
6+
import io.tarantool.driver.api.space.options.crud.OperationWithForceMapCallOptions;
67
import io.tarantool.driver.api.space.options.crud.OperationWithModeOptions;
78
import io.tarantool.driver.api.space.options.crud.OperationWithTimeoutOptions;
89

@@ -16,5 +17,5 @@
1617
*/
1718
public interface SelectOptions<T extends SelectOptions<T>>
1819
extends OperationWithBucketIdOptions<T>, OperationWithTimeoutOptions<T>, OperationWithFieldsOptions<T>,
19-
OperationWithModeOptions<T>, OperationWithBatchSizeOptions<T> {
20+
OperationWithModeOptions<T>, OperationWithBatchSizeOptions<T>, OperationWithForceMapCallOptions<T> {
2021
}
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
package io.tarantool.driver.api.space.options.crud;
2+
3+
import java.util.Optional;
4+
5+
import io.tarantool.driver.api.space.options.Options;
6+
import io.tarantool.driver.api.space.options.Self;
7+
import io.tarantool.driver.api.space.options.crud.enums.ProxyOption;
8+
9+
/**
10+
* Base interface for all operation options that may have a configurable "force_map_call" option.
11+
*
12+
* @author Belonogov Nikolay
13+
*/
14+
public interface OperationWithForceMapCallOptions<T extends OperationWithForceMapCallOptions<T>>
15+
extends Options, Self<T> {
16+
17+
/**
18+
* Sets "force_map_call" option to true. if true then the map call is performed without any optimizations even,
19+
* default value is false.
20+
*
21+
* @return forceMapCall option value.
22+
*/
23+
default T forceMapCall() {
24+
addOption(ProxyOption.FORCE_MAP_CALL, true);
25+
return self();
26+
}
27+
28+
/**
29+
* @return "force_map_call" option value.
30+
*/
31+
default Optional<Boolean> getForceMapCall() {
32+
return getOption(ProxyOption.FORCE_MAP_CALL, Boolean.class);
33+
}
34+
}

src/main/java/io/tarantool/driver/api/space/options/crud/enums/ProxyOption.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,9 @@ public enum ProxyOption {
2323

2424
AFTER("after"),
2525

26-
FIRST("first");
26+
FIRST("first"),
27+
28+
FORCE_MAP_CALL("force_map_call");
2729

2830
private final String name;
2931

src/test/java/io/tarantool/driver/integration/proxy/options/ProxySpaceSelectOptionsIT.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
import io.tarantool.driver.api.space.options.SelectOptions;
99
import io.tarantool.driver.api.space.TarantoolSpaceOperations;
1010
import io.tarantool.driver.api.space.options.ProxySelectOptions;
11+
import io.tarantool.driver.api.space.options.crud.enums.ProxyOption;
1112
import io.tarantool.driver.api.tuple.DefaultTarantoolTupleFactory;
1213
import io.tarantool.driver.api.tuple.TarantoolTuple;
1314
import io.tarantool.driver.api.tuple.TarantoolTupleFactory;
@@ -28,6 +29,7 @@
2829
import static org.junit.jupiter.api.Assertions.assertEquals;
2930
import static org.junit.jupiter.api.Assertions.assertNotNull;
3031
import static org.junit.jupiter.api.Assertions.assertNull;
32+
import static org.junit.jupiter.api.Assertions.assertTrue;
3133

3234
/**
3335
* @author Artyom Dubinin
@@ -174,4 +176,19 @@ public void withModeTest() throws ExecutionException, InterruptedException {
174176
crudSelectOpts = client.eval("return crud_select_opts").get();
175177
assertEquals(Mode.WRITE.value(), ((HashMap<?, ?>) crudSelectOpts.get(0)).get("mode"));
176178
}
179+
180+
@Test
181+
public void withForceMapCallTest() {
182+
TarantoolSpaceOperations<TarantoolTuple, TarantoolResult<TarantoolTuple>> profileSpace =
183+
client.space(TEST_SPACE_NAME);
184+
185+
SelectOptions<ProxySelectOptions> options = ProxySelectOptions.create().forceMapCall();
186+
187+
assertTrue(options.getForceMapCall().isPresent());
188+
assertTrue(options.getForceMapCall().get());
189+
190+
profileSpace.select(Conditions.any(), options).join();
191+
List<?> crudSelectOpts = client.eval("return crud_select_opts").join();
192+
assertEquals(true, ((HashMap<?, ?>) crudSelectOpts.get(0)).get(ProxyOption.FORCE_MAP_CALL.toString()));
193+
}
177194
}

0 commit comments

Comments
 (0)