Skip to content

Commit 9f16a6a

Browse files
committed
Add support for "fullscan" option
Closes #460
1 parent 14e051a commit 9f16a6a

File tree

4 files changed

+48
-2
lines changed

4 files changed

+48
-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.OperationWithFullScanOptions;
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>, OperationWithFullScanOptions<T> {
2021
}
Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
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 OperationWithFullScanOptions<T extends OperationWithModeOptions<T>> extends Options, Self<T> {
10+
11+
/**
12+
* Sets "fullscan" option value. If true then a critical log entry will be skipped on potentially long select.
13+
*
14+
* @param fullScan if true then a critical log entry will be skipped on potentially long select.
15+
* @return this options instance.
16+
*/
17+
default T withFullScan(boolean fullScan) {
18+
addOption(ProxyOption.FULL_SCAN, fullScan);
19+
return self();
20+
}
21+
22+
/**
23+
* @return "fullscan" option value.
24+
*/
25+
default Optional<Boolean> getFullScan() {
26+
return getOption(ProxyOption.FULL_SCAN, Boolean.class);
27+
}
28+
}

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+
FULL_SCAN("fullscan");
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 withFullScanTest() {
181+
TarantoolSpaceOperations<TarantoolTuple, TarantoolResult<TarantoolTuple>> operations =
182+
client.space(TEST_SPACE_NAME);
183+
184+
operations.select(Conditions.any()).join();
185+
List<?> crudSelectOpts = client.eval("return crud_select_opts").join();
186+
assertNull(((HashMap<?, ?>) crudSelectOpts.get(0)).get(ProxyOption.FULL_SCAN));
187+
188+
operations.select(Conditions.any(), ProxySelectOptions.create().withFullScan(true)).join();
189+
crudSelectOpts = client.eval("return crud_select_opts").join();
190+
assertEquals(true, ((HashMap<?, ?>) crudSelectOpts.get(0)).get(ProxyOption.FULL_SCAN.toString()));
191+
}
177192
}

0 commit comments

Comments
 (0)