diff --git a/jdbc/spring-flyway-app/pom.xml b/jdbc/spring-flyway-app/pom.xml index a5032c15..6190eaf5 100644 --- a/jdbc/spring-flyway-app/pom.xml +++ b/jdbc/spring-flyway-app/pom.xml @@ -13,10 +13,10 @@ 17 1.9.22 - 0.9.2 + 1.5.2 3.2.1 - 1.0.0-RC0 - 10.7.1 + 1.0.0 + 11.20.3 @@ -56,7 +56,7 @@ org.flywaydb flyway-core - 10.7.1 + ${flyway.core.version} diff --git a/pom.xml b/pom.xml index 1cbb3f1c..5d3561e3 100644 --- a/pom.xml +++ b/pom.xml @@ -18,7 +18,7 @@ 2.22.1 1.82 - 2.3.18 + 2.4.6 diff --git a/ydb-cookbook/src/main/java/tech/ydb/examples/simple/Scheme.java b/ydb-cookbook/src/main/java/tech/ydb/examples/simple/Scheme.java index 572c5caf..25acebe4 100644 --- a/ydb-cookbook/src/main/java/tech/ydb/examples/simple/Scheme.java +++ b/ydb-cookbook/src/main/java/tech/ydb/examples/simple/Scheme.java @@ -35,7 +35,7 @@ protected void run(GrpcTransport transport, String pathPrefix) { .getValue(); System.out.println("--[self]---------------------------"); - System.out.println(result1.getSelf()); + System.out.println(result1.getEntry()); System.out.println("-----------------------------------"); ListDirectoryResult result2 = schemeClient.listDirectory(directoryPath) @@ -43,9 +43,9 @@ protected void run(GrpcTransport transport, String pathPrefix) { .getValue(); System.out.println("--[self]---------------------------"); - System.out.println(result2.getSelf()); + System.out.println(result2.getEntry()); System.out.println("--[children]-----------------------"); - System.out.println(result2.getChildren()); + System.out.println(result2.getEntryChildren()); System.out.println("-----------------------------------"); for (int i = 0; i < 3; i++) { diff --git a/ydb-cookbook/src/main/java/tech/ydb/examples/topic/ControlPlane.java b/ydb-cookbook/src/main/java/tech/ydb/examples/topic/ControlPlane.java index 642bda1c..cd82aefc 100644 --- a/ydb-cookbook/src/main/java/tech/ydb/examples/topic/ControlPlane.java +++ b/ydb-cookbook/src/main/java/tech/ydb/examples/topic/ControlPlane.java @@ -52,7 +52,7 @@ protected void run(GrpcTransport transport) { .build()) .setPartitioningSettings(PartitioningSettings.newBuilder() .setMinActivePartitions(4) - .setPartitionCountLimit(10) + .setMaxActivePartitions(10) .build()) .setPartitionWriteSpeedBytesPerSecond(2 * 1024 * 1024) // 2 MB .setPartitionWriteBurstBytes(4 * 1024 * 1024) // 4 MB @@ -76,8 +76,7 @@ protected void run(GrpcTransport transport) { TopicDescription description = describeTopic(TOPIC_NAME, topicClient); assert description.getPartitioningSettings().getMinActivePartitions() == 4; - // getPartitionCountLimit is temporally ignored by server - assert description.getPartitioningSettings().getPartitionCountLimit() == 0; + assert description.getPartitioningSettings().getMaxActivePartitions() == 10; assert description.getPartitionWriteSpeedBytesPerSecond() == 2 * 1024 * 1024; assert description.getPartitionWriteBurstBytes() == 4 * 1024 * 1024; assert description.getConsumers().size() == 2; @@ -94,6 +93,7 @@ protected void run(GrpcTransport transport) { .build()) .setAlterPartitioningSettings(AlterPartitioningSettings.newBuilder() .setMinActivePartitions(6) + .setMaxActivePartitions(6) .build()) .setPartitionWriteSpeedBytesPerSecond(4 * 1024 * 1024) .build()) @@ -106,8 +106,7 @@ protected void run(GrpcTransport transport) { TopicDescription description = describeTopic(TOPIC_NAME, topicClient); assert description.getPartitioningSettings().getMinActivePartitions() == 6; - // getPartitionCountLimit is temporally ignored by server - assert description.getPartitioningSettings().getPartitionCountLimit() == 0; + assert description.getPartitioningSettings().getMaxActivePartitions() == 6; assert description.getPartitionWriteSpeedBytesPerSecond() == 4 * 1024 * 1024; assert description.getPartitionWriteBurstBytes() == 4 * 1024 * 1024; assert description.getConsumers().size() == 2; @@ -123,7 +122,7 @@ protected void run(GrpcTransport transport) { topicClient.alterTopic(TOPIC_NAME, AlterTopicSettings.newBuilder() .setAlterPartitioningSettings(AlterPartitioningSettings.newBuilder() - .setPartitionCountLimit(8) + .setMaxActivePartitions(8) .build()) .setRetentionPeriod(Duration.ofHours(13)) .setRetentionStorageMb(512) @@ -159,8 +158,7 @@ protected void run(GrpcTransport transport) { TopicDescription description = describeTopic(TOPIC_NAME, topicClient); assert description.getPartitioningSettings().getMinActivePartitions() == 6; - // getPartitionCountLimit is temporally ignored by server - assert description.getPartitioningSettings().getPartitionCountLimit() == 0; + assert description.getPartitioningSettings().getMaxActivePartitions() == 8; assert Objects.equals(description.getRetentionPeriod(), Duration.ofHours(13)); assert description.getRetentionStorageMb() == 512; assert description.getPartitionWriteSpeedBytesPerSecond() == 4 * 1024 * 1024; @@ -216,7 +214,7 @@ public TopicDescription describeTopic(String topicPath, TopicClient topicClient) .append(" ActivePartitions: ").append(description.getPartitioningSettings().getMinActivePartitions()) .append("\n") .append(" PartitionCountLimit: ").append(description.getPartitioningSettings() - .getPartitionCountLimit()).append("\n") + .getMaxActivePartitions()).append("\n") .append("getPartitionWriteSpeedBytesPerSecond: ") .append(description.getPartitionWriteSpeedBytesPerSecond()).append("\n") .append("getPartitionWriteBurstBytes: ").append(description.getPartitionWriteBurstBytes()) diff --git a/ydb-cookbook/src/main/java/tech/ydb/examples/topic/transactions/TransactionReadAsync.java b/ydb-cookbook/src/main/java/tech/ydb/examples/topic/transactions/TransactionReadAsync.java index 7e87b8ab..4e01741e 100644 --- a/ydb-cookbook/src/main/java/tech/ydb/examples/topic/transactions/TransactionReadAsync.java +++ b/ydb-cookbook/src/main/java/tech/ydb/examples/topic/transactions/TransactionReadAsync.java @@ -6,6 +6,7 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; + import tech.ydb.common.transaction.TxMode; import tech.ydb.core.Result; import tech.ydb.core.Status; @@ -20,8 +21,8 @@ import tech.ydb.topic.read.AsyncReader; import tech.ydb.topic.read.Message; import tech.ydb.topic.read.PartitionSession; -import tech.ydb.topic.read.events.DataReceivedEvent; import tech.ydb.topic.read.events.AbstractReadEventHandler; +import tech.ydb.topic.read.events.DataReceivedEvent; import tech.ydb.topic.read.events.PartitionSessionClosedEvent; import tech.ydb.topic.read.events.ReaderClosedEvent; import tech.ydb.topic.read.events.StartPartitionSessionEvent; @@ -80,6 +81,7 @@ public void onMessages(DataReceivedEvent event) { .join().getValue(); // Update offsets in transaction + @SuppressWarnings("deprecation") Status updateStatus = reader.updateOffsetsInTransaction(transaction, message.getPartitionOffsets(), new UpdateOffsetsInTransactionSettings.Builder().build()) // Do not commit transaction without waiting for updateOffsetsInTransaction result