This is an automated email from the ASF dual-hosted git repository.
ptupitsyn pushed a commit to branch ignite-14972
in repository https://gitbox.apache.org/repos/asf/ignite-3.git
The following commit(s) were added to refs/heads/ignite-14972 by this push:
new 6d5dfbccf Add ClientSessionBuilder
6d5dfbccf is described below
commit 6d5dfbccf9eb75f17ffc4b40795fe49fd7f923f7
Author: Pavel Tupitsyn <[email protected]>
AuthorDate: Mon May 30 18:37:38 2022 +0300
Add ClientSessionBuilder
---
.../internal/client/sql/ClientSessionBuilder.java | 113 +++++++++++++++++++++
.../ignite/internal/client/sql/ClientSql.java | 6 +-
.../client/sql/ClientStatementBuilder.java | 2 +-
.../org/apache/ignite/client/fakes/FakeIgnite.java | 2 +-
.../apache/ignite/client/fakes/FakeIgniteSql.java} | 28 ++---
.../ignite/internal/sql/api/SessionImpl.java | 3 +-
6 files changed, 126 insertions(+), 28 deletions(-)
diff --git
a/modules/client/src/main/java/org/apache/ignite/internal/client/sql/ClientSessionBuilder.java
b/modules/client/src/main/java/org/apache/ignite/internal/client/sql/ClientSessionBuilder.java
new file mode 100644
index 000000000..cf0920f2f
--- /dev/null
+++
b/modules/client/src/main/java/org/apache/ignite/internal/client/sql/ClientSessionBuilder.java
@@ -0,0 +1,113 @@
+/*
+ * 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.internal.client.sql;
+
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Objects;
+import java.util.concurrent.TimeUnit;
+import org.apache.ignite.internal.client.ReliableChannel;
+import org.apache.ignite.sql.Session;
+import org.apache.ignite.sql.Session.SessionBuilder;
+import org.jetbrains.annotations.Nullable;
+
+/**
+ * Client SQL session builder.
+ */
+public class ClientSessionBuilder implements SessionBuilder {
+ /** Channel. */
+ private final ReliableChannel ch;
+
+ /** */
+ private final Map<String, Object> properties = new HashMap<>();
+
+ /** */
+ private String defaultSchema;
+
+ /** */
+ private Long defaultTimeoutMs;
+
+ /** */
+ private Integer pageSize;
+
+ /**
+ * Constructor.
+ *
+ * @param ch Channel.
+ */
+ public ClientSessionBuilder(ReliableChannel ch) {
+ this.ch = ch;
+ }
+
+ @Override
+ public long defaultTimeout(TimeUnit timeUnit) {
+ Objects.requireNonNull(timeUnit);
+
+ return timeUnit.convert(defaultTimeoutMs == null ? 0 :
defaultTimeoutMs, TimeUnit.MILLISECONDS);
+ }
+
+ @Override
+ public SessionBuilder defaultTimeout(long timeout, TimeUnit timeUnit) {
+ Objects.requireNonNull(timeUnit);
+
+ defaultTimeoutMs = TimeUnit.MILLISECONDS.convert(timeout, timeUnit);
+
+ return this;
+ }
+
+ @Override
+ public String defaultSchema() {
+ return defaultSchema;
+ }
+
+ @Override
+ public SessionBuilder defaultSchema(String schema) {
+ defaultSchema = schema;
+
+ return this;
+ }
+
+ @Override
+ public int defaultPageSize() {
+ return pageSize == null ? 0 : pageSize;
+ }
+
+ @Override
+ public SessionBuilder defaultPageSize(int pageSize) {
+ this.pageSize = pageSize;
+
+ return this;
+ }
+
+ @Override
+ public @Nullable Object property(String name) {
+ return properties.get(name);
+ }
+
+ @Override
+ public SessionBuilder property(String name, @Nullable Object value) {
+ properties.put(name, value);
+
+ return this;
+ }
+
+ @Override
+ public Session build() {
+ return new ClientSession(ch, pageSize, defaultSchema,
defaultTimeoutMs, new HashMap<>(properties));
+ }
+}
diff --git
a/modules/client/src/main/java/org/apache/ignite/internal/client/sql/ClientSql.java
b/modules/client/src/main/java/org/apache/ignite/internal/client/sql/ClientSql.java
index e369a2a7c..8d2abbdfd 100644
---
a/modules/client/src/main/java/org/apache/ignite/internal/client/sql/ClientSql.java
+++
b/modules/client/src/main/java/org/apache/ignite/internal/client/sql/ClientSql.java
@@ -49,18 +49,18 @@ public class ClientSql implements IgniteSql {
/** {@inheritDoc} */
@Override
public SessionBuilder sessionBuilder() {
- return null;
+ return new ClientSessionBuilder(ch);
}
/** {@inheritDoc} */
@Override
public Statement createStatement(String query) {
- return null;
+ return new ClientStatement(query, null, false, null, null, null);
}
/** {@inheritDoc} */
@Override
public StatementBuilder statementBuilder() {
- return null;
+ return new ClientStatementBuilder();
}
}
diff --git
a/modules/client/src/main/java/org/apache/ignite/internal/client/sql/ClientStatementBuilder.java
b/modules/client/src/main/java/org/apache/ignite/internal/client/sql/ClientStatementBuilder.java
index bacf9d75a..790bd163d 100644
---
a/modules/client/src/main/java/org/apache/ignite/internal/client/sql/ClientStatementBuilder.java
+++
b/modules/client/src/main/java/org/apache/ignite/internal/client/sql/ClientStatementBuilder.java
@@ -26,7 +26,7 @@ import org.apache.ignite.sql.Statement.StatementBuilder;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
-class ClientStatementBuilder implements Statement.StatementBuilder {
+public class ClientStatementBuilder implements Statement.StatementBuilder {
/** */
private final Map<String, Object> properties = new HashMap<>();
diff --git
a/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgnite.java
b/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgnite.java
index d5aa5ed44..aa617b84d 100644
---
a/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgnite.java
+++
b/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgnite.java
@@ -97,7 +97,7 @@ public class FakeIgnite implements Ignite {
/** {@inheritDoc} */
@Override
public IgniteSql sql() {
- throw new UnsupportedOperationException("Not implemented yet.");
+ return new FakeIgniteSql();
}
/** {@inheritDoc} */
diff --git
a/modules/client/src/main/java/org/apache/ignite/internal/client/sql/ClientSql.java
b/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgniteSql.java
similarity index 72%
copy from
modules/client/src/main/java/org/apache/ignite/internal/client/sql/ClientSql.java
copy to
modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgniteSql.java
index e369a2a7c..2ef4654f9 100644
---
a/modules/client/src/main/java/org/apache/ignite/internal/client/sql/ClientSql.java
+++
b/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeIgniteSql.java
@@ -15,9 +15,9 @@
* limitations under the License.
*/
-package org.apache.ignite.internal.client.sql;
+package org.apache.ignite.client.fakes;
-import org.apache.ignite.internal.client.ReliableChannel;
+import org.apache.ignite.internal.client.sql.ClientStatementBuilder;
import org.apache.ignite.sql.IgniteSql;
import org.apache.ignite.sql.Session;
import org.apache.ignite.sql.Session.SessionBuilder;
@@ -25,42 +25,26 @@ import org.apache.ignite.sql.Statement;
import org.apache.ignite.sql.Statement.StatementBuilder;
/**
- * Client SQL.
+ * Fake SQL implementation.
*/
-public class ClientSql implements IgniteSql {
- /** Channel. */
- private final ReliableChannel ch;
-
- /**
- * Constructor.
- *
- * @param ch Channel.
- */
- public ClientSql(ReliableChannel ch) {
- this.ch = ch;
- }
-
- /** {@inheritDoc} */
+public class FakeIgniteSql implements IgniteSql {
@Override
public Session createSession() {
- return new ClientSession(ch, null, null, null, null);
+ return null;
}
- /** {@inheritDoc} */
@Override
public SessionBuilder sessionBuilder() {
return null;
}
- /** {@inheritDoc} */
@Override
public Statement createStatement(String query) {
return null;
}
- /** {@inheritDoc} */
@Override
public StatementBuilder statementBuilder() {
- return null;
+ return new ClientStatementBuilder();
}
}
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/api/SessionImpl.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/api/SessionImpl.java
index bca4888a9..9e325992d 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/api/SessionImpl.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/api/SessionImpl.java
@@ -220,7 +220,8 @@ public class SessionImpl implements Session {
Statement statement,
@Nullable Object... arguments
) {
- throw new UnsupportedOperationException("Not implemented yet.");
+ // TODO: IGNITE-16962 use all statement prperties.
+ return executeAsync(transaction, statement.query(), arguments);
}
/** {@inheritDoc} */
