Merge pull request #251 from alex268/develop

Updated common and query module

CHANGELOG.md

@@ -1,8 +1,13 @@
 ## 2.2.0 ##
 
-* Added export module
-* Core: Operation manager
+* Updated implementation of CoordinationService
+* Added module for QueryService
+* Added module for ExportService
+* Added common module with basic interfaces for transactions and retries
+* Core: Added basic support of long operations
+* Core: Added support for tracing requests with id
 * Table: Added readRows operation in table service
+* Topics: Added support of transaction between tables and topics
 
 ## 2.1.12 ##
 

bom/pom.xml

@@ -16,7 +16,7 @@
     <properties>
         <ydb-auth-api.version>1.0.0</ydb-auth-api.version>
         <ydb-proto-api.version>1.6.2</ydb-proto-api.version>
-        <yc-auth.version>2.1.1</yc-auth.version>
+        <yc-auth.version>2.2.0</yc-auth.version>
     </properties>
 
     <licenses>

common/pom.xml

@@ -28,6 +28,12 @@
             <groupId>org.slf4j</groupId>
             <artifactId>slf4j-api</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.apache.logging.log4j</groupId>
             <artifactId>log4j-slf4j-impl</artifactId>

core/src/main/java/tech/ydb/core/ErrorPolicy.java → common/src/main/java/tech/ydb/common/retry/ErrorPolicy.java

@@ -1,4 +1,4 @@
-package tech.ydb.core;
+package tech.ydb.common.retry;
 
 /**
  * Recipes should use the configured error policy to decide how to retry

core/src/main/java/tech/ydb/core/retry/ExponentialBackoffRetry.java → common/src/main/java/tech/ydb/common/retry/ExponentialBackoffRetry.java

@@ -1,8 +1,7 @@
-package tech.ydb.core.retry;
+package tech.ydb.common.retry;
 
 import java.util.concurrent.ThreadLocalRandom;
 
-import tech.ydb.core.RetryPolicy;
 
 /**
  *

core/src/main/java/tech/ydb/core/retry/RetryForever.java → common/src/main/java/tech/ydb/common/retry/RetryForever.java

@@ -1,6 +1,4 @@
-package tech.ydb.core.retry;
-
-import tech.ydb.core.RetryPolicy;
+package tech.ydb.common.retry;
 
 /**
  *

core/src/main/java/tech/ydb/core/retry/RetryNTimes.java → common/src/main/java/tech/ydb/common/retry/RetryNTimes.java

@@ -1,4 +1,4 @@
-package tech.ydb.core.retry;
+package tech.ydb.common.retry;
 
 /**
  *

core/src/main/java/tech/ydb/core/RetryPolicy.java → common/src/main/java/tech/ydb/common/retry/RetryPolicy.java

@@ -1,4 +1,4 @@
-package tech.ydb.core;
+package tech.ydb.common.retry;
 
 /**
  * Abstracts the policy to use when retrying some actions

core/src/main/java/tech/ydb/core/retry/RetryUntilElapsed.java → common/src/main/java/tech/ydb/common/retry/RetryUntilElapsed.java

@@ -1,4 +1,4 @@
-package tech.ydb.core.retry;
+package tech.ydb.common.retry;
 
 /**
  *

core/src/test/java/tech/ydb/core/retry/RetryPoliciesTest.java → common/src/test/java/tech/ydb/common/retry/RetryPoliciesTest.java

@@ -1,4 +1,8 @@
-package tech.ydb.core.retry;
+package tech.ydb.common.retry;
+
+import tech.ydb.common.retry.RetryNTimes;
+import tech.ydb.common.retry.RetryUntilElapsed;
+import tech.ydb.common.retry.RetryForever;
 
 import org.junit.Assert;
 import org.junit.Test;

common/src/test/resources/log4j2.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Configuration status="WARN">
+    <Appenders>
+        <Console name="Console" target="SYSTEM_OUT">
+            <PatternLayout pattern="%d{HH:mm:ss.SSS} [%t] %-5level %logger{36} - %msg%n"/>
+        </Console>
+    </Appenders>
+
+    <Loggers>
+        <Logger name="io.grpc" level="warn" additivity="false">
+            <AppenderRef ref="Console"/>
+        </Logger>
+        <Logger name="tech.ydb.core" level="debug" additivity="false">
+            <AppenderRef ref="Console"/>
+        </Logger>
+        <Logger name="tech.ydb.core.grpc.GrpcStatuses" level="error" additivity="false">
+            <AppenderRef ref="Console"/>
+        </Logger>
+        <Logger name="tech.ydb.core.impl.pool.GrpcChannel" level="error"  additivity="false">
+        </Logger>
+
+        <Root level="debug" >
+            <AppenderRef ref="Console"/>
+        </Root>
+    </Loggers>
+</Configuration>

coordination/pom.xml

@@ -22,7 +22,7 @@
     <dependencies>
         <dependency>
             <groupId>tech.ydb</groupId>
-            <artifactId>ydb-sdk-core</artifactId>
+            <artifactId>ydb-sdk-common</artifactId>
         </dependency>
 
         <dependency>

coordination/src/main/java/tech/ydb/coordination/impl/SessionImpl.java

@@ -21,6 +21,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import tech.ydb.common.retry.RetryPolicy;
 import tech.ydb.coordination.CoordinationSession;
 import tech.ydb.coordination.SemaphoreLease;
 import tech.ydb.coordination.description.SemaphoreDescription;
@@ -30,7 +31,6 @@
 import tech.ydb.coordination.settings.WatchSemaphoreMode;
 import tech.ydb.core.Issue;
 import tech.ydb.core.Result;
-import tech.ydb.core.RetryPolicy;
 import tech.ydb.core.Status;
 import tech.ydb.core.StatusCode;
 

coordination/src/main/java/tech/ydb/coordination/settings/CoordinationSessionSettings.java

@@ -3,8 +3,8 @@
 import java.time.Duration;
 import java.util.concurrent.Executor;
 
-import tech.ydb.core.RetryPolicy;
-import tech.ydb.core.retry.RetryUntilElapsed;
+import tech.ydb.common.retry.RetryPolicy;
+import tech.ydb.common.retry.RetryUntilElapsed;
 
 /**
  *

query/src/main/java/tech/ydb/query/QueryClient.java

@@ -6,6 +6,8 @@
 
 import javax.annotation.WillNotClose;
 
+import io.grpc.ExperimentalApi;
+
 import tech.ydb.core.Result;
 import tech.ydb.core.grpc.GrpcTransport;
 import tech.ydb.query.impl.QueryClientImpl;
@@ -14,6 +16,7 @@
  *
  * @author Aleksandr Gorshenin
  */
+@ExperimentalApi("QueryService is experimental and API may change without notice")
 public interface QueryClient extends AutoCloseable {
     static Builder newClient(@WillNotClose GrpcTransport transport) {
         return QueryClientImpl.newClient(transport);

query/src/main/java/tech/ydb/query/QuerySession.java

@@ -2,6 +2,8 @@
 
 import java.util.concurrent.CompletableFuture;
 
+import io.grpc.ExperimentalApi;
+
 import tech.ydb.common.transaction.TxMode;
 import tech.ydb.core.Result;
 import tech.ydb.query.settings.BeginTransactionSettings;
@@ -20,6 +22,7 @@
  *
  * @author Aleksandr Gorshenin
  */
+@ExperimentalApi("QueryService is experimental and API may change without notice")
 public interface QuerySession extends AutoCloseable {
 
     /**

query/src/main/java/tech/ydb/query/QueryStream.java

@@ -2,6 +2,8 @@
 
 import java.util.concurrent.CompletableFuture;
 
+import io.grpc.ExperimentalApi;
+
 import tech.ydb.core.Result;
 import tech.ydb.query.result.QueryInfo;
 import tech.ydb.query.result.QueryResultPart;
@@ -10,6 +12,7 @@
  *
  * @author Aleksandr Gorshenin
  */
+@ExperimentalApi("QueryService is experimental and API may change without notice")
 public interface QueryStream {
     interface PartsHandler {
         void onNextPart(QueryResultPart part);

query/src/main/java/tech/ydb/query/QueryTransaction.java

@@ -2,6 +2,8 @@
 
 import java.util.concurrent.CompletableFuture;
 
+import io.grpc.ExperimentalApi;
+
 import tech.ydb.common.transaction.YdbTransaction;
 import tech.ydb.core.Result;
 import tech.ydb.core.Status;
@@ -20,6 +22,7 @@
  *
  * @author Aleksandr Gorshenin
  */
+@ExperimentalApi("QueryService is experimental and API may change without notice")
 public interface QueryTransaction extends YdbTransaction {
 
     /**