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 65376c7c8 Fixing code style
65376c7c8 is described below
commit 65376c7c828cd4a111f097f4a0291af82aaa1dd6
Author: Pavel Tupitsyn <[email protected]>
AuthorDate: Mon May 30 22:43:41 2022 +0300
Fixing code style
---
.../handler/requests/sql/ClientSqlExecuteRequest.java | 4 +++-
.../ignite/internal/client/sql/ClientAsyncResultSet.java | 14 +++++++-------
.../ignite/internal/client/sql/ClientSessionBuilder.java | 8 ++++----
.../ignite/internal/client/sql/ClientStatement.java | 12 ++++++------
.../internal/client/sql/ClientStatementBuilder.java | 15 +++++++++------
.../apache/ignite/client/fakes/FakeSessionBuilder.java | 13 +++++++++----
.../ignite/internal/sql/api/ColumnMetadataImpl.java | 2 +-
.../ignite/internal/sql/api/StatementBuilderImpl.java | 4 ++--
.../org/apache/ignite/internal/sql/api/StatementImpl.java | 2 +-
9 files changed, 42 insertions(+), 32 deletions(-)
diff --git
a/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/sql/ClientSqlExecuteRequest.java
b/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/sql/ClientSqlExecuteRequest.java
index 224306b1c..a2a4d54a9 100644
---
a/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/sql/ClientSqlExecuteRequest.java
+++
b/modules/client-handler/src/main/java/org/apache/ignite/client/handler/requests/sql/ClientSqlExecuteRequest.java
@@ -67,7 +67,9 @@ public class ClientSqlExecuteRequest {
} catch (IgniteInternalCheckedException e) {
return asyncResultSet
.closeAsync()
- .thenRun(() -> { throw new
IgniteInternalException(e.getMessage(), e); });
+ .thenRun(() -> {
+ throw new
IgniteInternalException(e.getMessage(), e);
+ });
}
} else {
out.packNil(); // resourceId
diff --git
a/modules/client/src/main/java/org/apache/ignite/internal/client/sql/ClientAsyncResultSet.java
b/modules/client/src/main/java/org/apache/ignite/internal/client/sql/ClientAsyncResultSet.java
index f9c40d752..d32fcbf34 100644
---
a/modules/client/src/main/java/org/apache/ignite/internal/client/sql/ClientAsyncResultSet.java
+++
b/modules/client/src/main/java/org/apache/ignite/internal/client/sql/ClientAsyncResultSet.java
@@ -32,25 +32,25 @@ import org.jetbrains.annotations.Nullable;
* Client async result set.
*/
class ClientAsyncResultSet implements AsyncResultSet {
- /** */
+ /** Resource id. */
private final Long resourceId;
- /** */
+ /** Row set flag. */
private final boolean hasRowSet;
- /** */
+ /** Applied flag. */
private final boolean wasApplied;
- /** */
+ /** Affected rows. */
private final long affectedRows;
- /** */
+ /** Metadata. */
private final ResultSetMetadata metadata;
- /** */
+ /** Rows. */
private List<SqlRow> rows;
- /** */
+ /** More pages flag. */
private final boolean hasMorePages;
/**
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
index cf0920f2f..9120235e6 100644
---
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
@@ -33,16 +33,16 @@ public class ClientSessionBuilder implements SessionBuilder
{
/** Channel. */
private final ReliableChannel ch;
- /** */
+ /** Properties. */
private final Map<String, Object> properties = new HashMap<>();
- /** */
+ /** Default schema. */
private String defaultSchema;
- /** */
+ /** Default timeout. */
private Long defaultTimeoutMs;
- /** */
+ /** Page size. */
private Integer pageSize;
/**
diff --git
a/modules/client/src/main/java/org/apache/ignite/internal/client/sql/ClientStatement.java
b/modules/client/src/main/java/org/apache/ignite/internal/client/sql/ClientStatement.java
index d61b10d44..05c577ec5 100644
---
a/modules/client/src/main/java/org/apache/ignite/internal/client/sql/ClientStatement.java
+++
b/modules/client/src/main/java/org/apache/ignite/internal/client/sql/ClientStatement.java
@@ -28,22 +28,22 @@ import org.jetbrains.annotations.Nullable;
* Client SQL statement.
*/
class ClientStatement implements Statement {
- /** */
+ /** Query. */
private final String query;
- /** */
+ /** Default schema. */
private final String defaultSchema;
- /** */
+ /** Prepared flag. */
private final boolean prepared;
- /** */
+ /** Query timeout. */
private final Long queryTimeoutMs;
- /** */
+ /** Page size. */
private final Integer pageSize;
- /** */
+ /** Properties. */
private final Map<String, Object> properties;
/**
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 790bd163d..c9c63be2d 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,23 +26,26 @@ import org.apache.ignite.sql.Statement.StatementBuilder;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
+/**
+ * Client SQL statement builder.
+ */
public class ClientStatementBuilder implements Statement.StatementBuilder {
- /** */
+ /** Properties. */
private final Map<String, Object> properties = new HashMap<>();
- /** */
+ /** Query. */
private String query;
- /** */
+ /** Default schema. */
private String defaultSchema;
- /** */
+ /** Prepared flag. */
private boolean prepared;
- /** */
+ /** Query timeout. */
private Long queryTimeoutMs;
- /** */
+ /** Page size. */
private Integer pageSize;
/** {@inheritDoc} */
diff --git
a/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeSessionBuilder.java
b/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeSessionBuilder.java
index 574d7d910..178eb354b 100644
---
a/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeSessionBuilder.java
+++
b/modules/client/src/test/java/org/apache/ignite/client/fakes/FakeSessionBuilder.java
@@ -29,18 +29,15 @@ import org.jetbrains.annotations.Nullable;
* Client SQL session builder.
*/
public class FakeSessionBuilder implements SessionBuilder {
- /** */
private final Map<String, Object> properties = new HashMap<>();
- /** */
private String defaultSchema;
- /** */
private Long defaultTimeoutMs;
- /** */
private Integer pageSize;
+ /** {@inheritDoc} */
@Override
public long defaultTimeout(TimeUnit timeUnit) {
Objects.requireNonNull(timeUnit);
@@ -48,6 +45,7 @@ public class FakeSessionBuilder implements SessionBuilder {
return timeUnit.convert(defaultTimeoutMs == null ? 0 :
defaultTimeoutMs, TimeUnit.MILLISECONDS);
}
+ /** {@inheritDoc} */
@Override
public SessionBuilder defaultTimeout(long timeout, TimeUnit timeUnit) {
Objects.requireNonNull(timeUnit);
@@ -57,11 +55,13 @@ public class FakeSessionBuilder implements SessionBuilder {
return this;
}
+ /** {@inheritDoc} */
@Override
public String defaultSchema() {
return defaultSchema;
}
+ /** {@inheritDoc} */
@Override
public SessionBuilder defaultSchema(String schema) {
defaultSchema = schema;
@@ -69,11 +69,13 @@ public class FakeSessionBuilder implements SessionBuilder {
return this;
}
+ /** {@inheritDoc} */
@Override
public int defaultPageSize() {
return pageSize == null ? 0 : pageSize;
}
+ /** {@inheritDoc} */
@Override
public SessionBuilder defaultPageSize(int pageSize) {
this.pageSize = pageSize;
@@ -81,11 +83,13 @@ public class FakeSessionBuilder implements SessionBuilder {
return this;
}
+ /** {@inheritDoc} */
@Override
public @Nullable Object property(String name) {
return properties.get(name);
}
+ /** {@inheritDoc} */
@Override
public SessionBuilder property(String name, @Nullable Object value) {
properties.put(name, value);
@@ -93,6 +97,7 @@ public class FakeSessionBuilder implements SessionBuilder {
return this;
}
+ /** {@inheritDoc} */
@Override
public Session build() {
return new FakeSession(pageSize, defaultSchema, defaultTimeoutMs, new
HashMap<>(properties));
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/api/ColumnMetadataImpl.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/api/ColumnMetadataImpl.java
index 5b87ea7ef..b511f2c23 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/api/ColumnMetadataImpl.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/api/ColumnMetadataImpl.java
@@ -24,7 +24,7 @@ import org.apache.ignite.sql.ColumnMetadata;
* Column metadata.
*/
class ColumnMetadataImpl implements ColumnMetadata {
- /** */
+ /** Field meta. */
private final ResultFieldMetadata fieldMetadata;
/**
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/api/StatementBuilderImpl.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/api/StatementBuilderImpl.java
index 998f30dc9..58a705ed1 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/api/StatementBuilderImpl.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/api/StatementBuilderImpl.java
@@ -27,10 +27,10 @@ import org.jetbrains.annotations.Nullable;
* Statement builder.
*/
class StatementBuilderImpl implements StatementBuilder {
- /** */
+ /** Query. */
private String query;
- /** */
+ /** Prepared flag. */
private boolean prepared;
/** {@inheritDoc} */
diff --git
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/api/StatementImpl.java
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/api/StatementImpl.java
index 06cae9c59..5a3df6a48 100644
---
a/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/api/StatementImpl.java
+++
b/modules/sql-engine/src/main/java/org/apache/ignite/internal/sql/api/StatementImpl.java
@@ -26,7 +26,7 @@ import org.jetbrains.annotations.Nullable;
* Statement.
*/
class StatementImpl implements Statement {
- /** */
+ /** Query. */
private final String query;
/**
