ptupitsyn commented on code in PR #2810:
URL: https://github.com/apache/ignite-3/pull/2810#discussion_r1386458979
##########
modules/api/src/main/java/org/apache/ignite/table/KeyValueView.java:
##########
@@ -491,4 +494,23 @@ public interface KeyValueView<K, V> extends
DataStreamerTarget<Entry<K, V>> {
* @see #getAndReplace(Transaction, Object, Object)
*/
CompletableFuture<NullableValue<V>> getNullableAndReplaceAsync(@Nullable
Transaction tx, K key, V val);
+
+ /**
+ * Criteria query over cache entries.
+ *
+ * @param tx Transaction or {@code null} to auto-commit.
+ * @param criteria If {@code null} then all entries will be returned.
+ */
+ default CriteriaQueryCursor<Entry<K, V>> criteriaQuery(@Nullable
Transaction tx, @Nullable Criteria criteria) {
Review Comment:
```suggestion
default CriteriaQueryCursor<Entry<K, V>> queryCriteria(@Nullable
Transaction tx, @Nullable Criteria criteria) {
```
To be consistent with `queryContinuously` and `streamData`. Also makes it
easier to discover with IDE autocomplete.
##########
modules/api/src/main/java/org/apache/ignite/table/KeyValueView.java:
##########
@@ -491,4 +494,23 @@ public interface KeyValueView<K, V> extends
DataStreamerTarget<Entry<K, V>> {
* @see #getAndReplace(Transaction, Object, Object)
*/
CompletableFuture<NullableValue<V>> getNullableAndReplaceAsync(@Nullable
Transaction tx, K key, V val);
+
+ /**
+ * Criteria query over cache entries.
+ *
+ * @param tx Transaction or {@code null} to auto-commit.
+ * @param criteria If {@code null} then all entries will be returned.
+ */
+ default CriteriaQueryCursor<Entry<K, V>> criteriaQuery(@Nullable
Transaction tx, @Nullable Criteria criteria) {
+ return criteriaQuery(tx, criteria, CriteriaQueryOptions.DEFAULT);
+ }
+
+ /**
+ * Criteria query over cache entries.
+ *
+ * @param tx Transaction or {@code null} to auto-commit.
+ * @param criteria If {@code null} then all entries will be returned.
+ * @param opts Criteria query options.
+ */
+ CriteriaQueryCursor<Entry<K, V>> criteriaQuery(@Nullable Transaction tx,
@Nullable Criteria criteria, CriteriaQueryOptions opts);
Review Comment:
Async variants are missing.
##########
modules/api/src/main/java/org/apache/ignite/table/KeyValueView.java:
##########
@@ -491,4 +494,23 @@ public interface KeyValueView<K, V> extends
DataStreamerTarget<Entry<K, V>> {
* @see #getAndReplace(Transaction, Object, Object)
*/
CompletableFuture<NullableValue<V>> getNullableAndReplaceAsync(@Nullable
Transaction tx, K key, V val);
+
+ /**
+ * Criteria query over cache entries.
+ *
+ * @param tx Transaction or {@code null} to auto-commit.
+ * @param criteria If {@code null} then all entries will be returned.
+ */
+ default CriteriaQueryCursor<Entry<K, V>> criteriaQuery(@Nullable
Transaction tx, @Nullable Criteria criteria) {
+ return criteriaQuery(tx, criteria, CriteriaQueryOptions.DEFAULT);
+ }
+
+ /**
+ * Criteria query over cache entries.
+ *
+ * @param tx Transaction or {@code null} to auto-commit.
+ * @param criteria If {@code null} then all entries will be returned.
+ * @param opts Criteria query options.
+ */
+ CriteriaQueryCursor<Entry<K, V>> criteriaQuery(@Nullable Transaction tx,
@Nullable Criteria criteria, CriteriaQueryOptions opts);
Review Comment:
To avoid duplicating those declarations across multiple interfaces, let's
move them to `CriteriaQuerySource` interface - similar to `DataStreamerTarget`.
##########
modules/api/src/main/java/org/apache/ignite/sql/CriteriaQueryCursor.java:
##########
@@ -0,0 +1,67 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+package org.apache.ignite.sql;
+
+import static java.util.stream.Collectors.toList;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.stream.Stream;
+import java.util.stream.StreamSupport;
+
+/**
+ * Criteria query result cursor. Implements {@link Iterable} only for
convenience, e.g. {@link #iterator()}
+ * can be obtained only once. Also if iteration is started then {@link
#getAll()} method calls are prohibited.
+ */
+public interface CriteriaQueryCursor<T> extends Iterator<T>, Iterable<T>,
AutoCloseable {
Review Comment:
We should probably reuse `AsyncResultSet` and `ResultSet`.
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
