Skip to content

Commit 7ef52fb

Browse files
alex268alex268
committed
Merge branch 'master' into release_v2.4.0
2 parents d871494 + c91ad03 commit 7ef52fb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+903
-89
lines changed

‎CHANGELOG.md

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,17 @@
1+
## 2.3.14 ##
2+
3+
* Core: Removed mockito-inline from compile dependencies
4+
* Core: Improved catching of RuntimeException in BaseGrpcTransport
5+
* Table: Fixed support of extended date types in ProtoValue
6+
* Query: Added support of concurrent_result_sets option
7+
* Topic: Add equals() and hashCode() methods to topic description classes
8+
* Topic: Fixed ErrorHandler behaviour
9+
* Topic: Added support of readSessionId
10+
* Topic: SyncWriter.flush() now throw Exception when previous task was failed
11+
* Topic: Add functional interface support to ReadEventHandler
12+
* Topic: Added support of auto-partitioning options to CreateTopic/AlterTopic
13+
* Topic: Fix logger prefix for partition session log events and print correct consumer name
14+
115
## 2.3.13 ##
216

317
* Topic: fixed reconnect after shutdown

‎README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ Firstly you can import YDB Java BOM to specify correct versions of SDK modules.
3030
<dependency>
3131
<groupId>tech.ydb</groupId>
3232
<artifactId>ydb-sdk-bom</artifactId>
33-
<version>2.3.13</version>
33+
<version>2.3.14</version>
3434
<type>pom</type>
3535
<scope>import</scope>
3636
</dependency>

‎auth-providers/oauth2-provider/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<parent>
66
<groupId>tech.ydb</groupId>
77
<artifactId>ydb-sdk-parent</artifactId>
8-
<version>2.3.14-SNAPSHOT</version>
8+
<version>2.3.15-SNAPSHOT</version>
99
<relativePath>../../pom.xml</relativePath>
1010
</parent>
1111

@@ -100,6 +100,7 @@
100100
<groupId>org.mockito</groupId>
101101
<artifactId>mockito-inline</artifactId>
102102
<version>${mockito.version}</version>
103+
<scope>test</scope>
103104
</dependency>
104105
</dependencies>
105106
</profile>

‎bom/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<modelVersion>4.0.0</modelVersion>
77

88
<groupId>tech.ydb</groupId>
9-
<version>2.3.14-SNAPSHOT</version>
9+
<version>2.3.15-SNAPSHOT</version>
1010
<artifactId>ydb-sdk-bom</artifactId>
1111
<name>Java SDK Bill of Materials</name>
1212
<description>Java SDK Bill of Materials (BOM)</description>
@@ -15,7 +15,7 @@
1515

1616
<properties>
1717
<ydb-auth-api.version>1.0.0</ydb-auth-api.version>
18-
<ydb-proto-api.version>1.7.0</ydb-proto-api.version>
18+
<ydb-proto-api.version>1.7.1</ydb-proto-api.version>
1919
<yc-auth.version>2.2.0</yc-auth.version>
2020
</properties>
2121

‎common/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>tech.ydb</groupId>
1010
<artifactId>ydb-sdk-parent</artifactId>
11-
<version>2.3.14-SNAPSHOT</version>
11+
<version>2.3.15-SNAPSHOT</version>
1212
</parent>
1313

1414
<artifactId>ydb-sdk-common</artifactId>

‎coordination/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>tech.ydb</groupId>
1010
<artifactId>ydb-sdk-parent</artifactId>
11-
<version>2.3.14-SNAPSHOT</version>
11+
<version>2.3.15-SNAPSHOT</version>
1212
</parent>
1313

1414
<artifactId>ydb-sdk-coordination</artifactId>
@@ -59,6 +59,7 @@
5959
<groupId>org.mockito</groupId>
6060
<artifactId>mockito-inline</artifactId>
6161
<version>${mockito.version}</version>
62+
<scope>test</scope>
6263
</dependency>
6364
</dependencies>
6465
</profile>

‎core/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>tech.ydb</groupId>
1010
<artifactId>ydb-sdk-parent</artifactId>
11-
<version>2.3.14-SNAPSHOT</version>
11+
<version>2.3.15-SNAPSHOT</version>
1212
</parent>
1313

1414
<artifactId>ydb-sdk-core</artifactId>
@@ -118,6 +118,7 @@
118118
<groupId>org.mockito</groupId>
119119
<artifactId>mockito-inline</artifactId>
120120
<version>${mockito.version}</version>
121+
<scope>test</scope>
121122
</dependency>
122123
</dependencies>
123124
</profile>

‎core/src/main/java/tech/ydb/core/impl/BaseGrpcTransport.java

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -95,8 +95,9 @@ public <ReqT, RespT> CompletableFuture<Result<RespT>> unaryCall(
9595
logger.warn("UnaryCall[{}] got unexprected status {}", traceId, ex.getStatus());
9696
return CompletableFuture.completedFuture(Result.fail(ex));
9797
} catch (RuntimeException ex) {
98-
logger.warn("UnaryCall[{}] got problem {}", traceId, ex.getMessage());
99-
return CompletableFuture.completedFuture(Result.error(ex.getMessage(), ex));
98+
String message = ex.getMessage() != null ? ex.getMessage() : ex.toString();
99+
logger.warn("UnaryCall[{}] got problem {}", traceId, message);
100+
return CompletableFuture.completedFuture(Result.error(message, ex));
100101
}
101102
}
102103

@@ -136,9 +137,10 @@ public <ReqT, RespT> GrpcReadStream<RespT> readStreamCall(
136137
logger.warn("ReadStreamCall[{}] got unexpected status {}", traceId, ex.getStatus());
137138
return new EmptyStream<>(ex.getStatus());
138139
} catch (RuntimeException ex) {
139-
logger.warn("ReadStreamCall[{}] got problem {}", traceId, ex.getMessage());
140-
Issue issue = Issue.of(ex.getMessage(), Issue.Severity.ERROR);
141-
return new EmptyStream<>(Status.of(StatusCode.CLIENT_INTERNAL_ERROR, issue));
140+
String message = ex.getMessage() != null ? ex.getMessage() : ex.toString();
141+
logger.warn("ReadStreamCall[{}] got problem {}", traceId, message);
142+
Issue issue = Issue.of(message, Issue.Severity.ERROR);
143+
return new EmptyStream<>(Status.of(StatusCode.CLIENT_INTERNAL_ERROR, ex, issue));
142144
}
143145
}
144146

@@ -180,9 +182,10 @@ traceId, call, makeMetadataFromSettings(settings), getAuthCallOptions(), handler
180182
logger.warn("ReadWriteStreamCall[{}] got unexpected status {}", traceId, ex.getStatus());
181183
return new EmptyStream<>(ex.getStatus());
182184
} catch (RuntimeException ex) {
183-
logger.warn("ReadWriteStreamCall[{}] got problem {}", traceId, ex.getMessage());
184-
Issue issue = Issue.of(ex.getMessage(), Issue.Severity.ERROR);
185-
return new EmptyStream<>(Status.of(StatusCode.CLIENT_INTERNAL_ERROR, issue));
185+
String message = ex.getMessage() != null ? ex.getMessage() : ex.toString();
186+
logger.warn("ReadWriteStreamCall[{}] got problem {}", traceId, message);
187+
Issue issue = Issue.of(message, Issue.Severity.ERROR);
188+
return new EmptyStream<>(Status.of(StatusCode.CLIENT_INTERNAL_ERROR, ex, issue));
186189
}
187190
}
188191

‎export/pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<parent>
99
<groupId>tech.ydb</groupId>
1010
<artifactId>ydb-sdk-parent</artifactId>
11-
<version>2.3.14-SNAPSHOT</version>
11+
<version>2.3.15-SNAPSHOT</version>
1212
</parent>
1313

1414
<artifactId>ydb-sdk-export</artifactId>

‎pom.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
<groupId>tech.ydb</groupId>
1010
<artifactId>ydb-sdk-parent</artifactId>
11-
<version>2.3.14-SNAPSHOT</version>
11+
<version>2.3.15-SNAPSHOT</version>
1212

1313
<name>Java SDK for YDB</name>
1414
<description>Java SDK for YDB</description>

0 commit comments

Comments
 (0)