Skip to content

Commit dafbbf8

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

File tree

4 files changed

+50
-2
lines changed

4 files changed

+50
-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: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
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+
public interface OperationWithForceMapCallOptions<T extends OperationWithForceMapCallOptions<T>>
10+
extends Options, Self<T> {
11+
12+
/**
13+
* Sets "force_map_call" option. if true then the map call is performed without any optimizations even, default
14+
* value is false.
15+
* @param forceMapCall if true then the map call is performed without any optimizations even, default value is
16+
* false.
17+
* @return forceMapCall option value.
18+
*/
19+
default T withForceMapCall(boolean forceMapCall) {
20+
addOption(ProxyOption.FORCE_MAP_CALL, forceMapCall);
21+
return self();
22+
}
23+
24+
/**
25+
* @return "force_map_call" option value.
26+
*/
27+
default Optional<Boolean> getForceMapCall() {
28+
return getOption(ProxyOption.FORCE_MAP_CALL, Boolean.class);
29+
}
30+
}

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: 15 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;
@@ -174,4 +175,18 @@ public void withModeTest() throws ExecutionException, InterruptedException {
174175
crudSelectOpts = client.eval("return crud_select_opts").get();
175176
assertEquals(Mode.WRITE.value(), ((HashMap<?, ?>) crudSelectOpts.get(0)).get("mode"));
176177
}
178+
179+
@Test
180+
public void withForceMapCallTest() {
181+
TarantoolSpaceOperations<TarantoolTuple, TarantoolResult<TarantoolTuple>> profileSpace =
182+
client.space(TEST_SPACE_NAME);
183+
184+
profileSpace.select(Conditions.any()).join();
185+
List<?> crudSelectOpts = client.eval("return crud_select_opts").join();
186+
assertNull(((HashMap<?, ?>) crudSelectOpts.get(0)).get(ProxyOption.FORCE_MAP_CALL.toString()));
187+
188+
profileSpace.select(Conditions.any(), ProxySelectOptions.create().withForceMapCall(true)).join();
189+
crudSelectOpts = client.eval("return crud_select_opts").join();
190+
assertEquals(true, ((HashMap<?, ?>) crudSelectOpts.get(0)).get(ProxyOption.FORCE_MAP_CALL.toString()));
191+
}
177192
}

0 commit comments

Comments
 (0)