Topic transactions

bom/pom.xml

@@ -55,6 +55,11 @@
                 <version>${ydb-auth-api.version}</version>
             </dependency>
 
+            <dependency>
+                <groupId>tech.ydb</groupId>
+                <artifactId>ydb-sdk-common</artifactId>
+                <version>${project.version}</version>
+            </dependency>
             <dependency>
                 <groupId>tech.ydb</groupId>
                 <artifactId>ydb-sdk-core</artifactId>

common/pom.xml

@@ -0,0 +1,37 @@
+<project
+    xmlns="http://maven.apache.org/POM/4.0.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>tech.ydb</groupId>
+        <artifactId>ydb-sdk-parent</artifactId>
+        <version>2.2.0-SNAPSHOT</version>
+    </parent>
+
+    <artifactId>ydb-sdk-common</artifactId>
+    <name>Common module of Java SDK for YDB</name>
+    <description>Common module of Java SDK for YDB</description>
+
+    <properties>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>tech.ydb</groupId>
+            <artifactId>ydb-sdk-core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.slf4j</groupId>
+            <artifactId>slf4j-api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.logging.log4j</groupId>
+            <artifactId>log4j-slf4j-impl</artifactId>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+</project>

query/src/main/java/tech/ydb/query/QueryTx.java → common/src/main/java/tech/ydb/common/transaction/TxMode.java

@@ -1,10 +1,10 @@
-package tech.ydb.query;
+package tech.ydb.common.transaction;
 
 /**
  *
  * @author Aleksandr Gorshenin
  */
-public enum QueryTx {
+public enum TxMode {
     NONE,
 
     SERIALIZABLE_RW,

common/src/main/java/tech/ydb/common/transaction/YdbTransaction.java

@@ -0,0 +1,37 @@
+package tech.ydb.common.transaction;
+
+import java.util.concurrent.CompletableFuture;
+
+import tech.ydb.core.Status;
+
+/**
+ * A base interface for all YDB transactions from different services
+ * @author Nikolay Perfilov
+ */
+public interface YdbTransaction {
+
+    /**
+     * Returns identifier of the transaction or null if the transaction is not active = (not
+     * started/committed/rolled back). When {@link YdbTransaction} is not active - any query on this object
+     * starts a new transaction on server. When transaction is active any call of {@code commit},
+     * {@code rollback} or execution of any query with {@code commitAtEnd}=true finishes this transaction
+     *
+     * @return identifier of the transaction or null if the transaction is not active
+     */
+    String getId();
+
+    /**
+     * Returns {@link TxMode} with mode of the transaction
+     *
+     * @return the transaction mode
+     */
+    TxMode getTxMode();
+
+    default boolean isActive() {
+        return getId() != null;
+    }
+
+    String getSessionId();
+
+    CompletableFuture<Status> getStatusFuture();
+}

common/src/main/java/tech/ydb/common/transaction/impl/YdbTransactionImpl.java

@@ -0,0 +1,38 @@
+package tech.ydb.common.transaction.impl;
+
+import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.atomic.AtomicReference;
+
+import tech.ydb.common.transaction.TxMode;
+import tech.ydb.common.transaction.YdbTransaction;
+import tech.ydb.core.Status;
+
+/**
+ * @author Nikolay Perfilov
+ */
+public abstract class YdbTransactionImpl implements YdbTransaction {
+    protected final TxMode txMode;
+    protected final AtomicReference<String> txId;
+    protected final AtomicReference<CompletableFuture<Status>> statusFuture = new AtomicReference<>(
+            new CompletableFuture<>());
+
+    protected YdbTransactionImpl(TxMode txMode, String txId) {
+        this.txMode = txMode;
+        this.txId = new AtomicReference<>(txId);
+    }
+
+    @Override
+    public String getId() {
+        return txId.get();
+    }
+
+    @Override
+    public TxMode getTxMode() {
+        return txMode;
+    }
+
+    @Override
+    public CompletableFuture<Status> getStatusFuture() {
+        return statusFuture.get();
+    }
+}

pom.xml

@@ -16,6 +16,7 @@
 
     <modules>
         <module>bom</module>
+        <module>common</module>
         <module>core</module>
         <module>table</module>
         <module>scheme</module>

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

@@ -2,6 +2,7 @@
 
 import java.util.concurrent.CompletableFuture;
 
+import tech.ydb.common.transaction.TxMode;
 import tech.ydb.core.Result;
 import tech.ydb.query.settings.BeginTransactionSettings;
 import tech.ydb.query.settings.ExecuteQuerySettings;
@@ -40,7 +41,7 @@ public interface QuerySession extends AutoCloseable {
      * @param txMode transaction mode
      * @return new implicit transaction
      */
-    QueryTransaction createNewTransaction(QueryTx txMode);
+    QueryTransaction createNewTransaction(TxMode txMode);
 
     /**
      * Create and start a new <i>active</i> {@link QueryTransaction}. This method creates a transaction on the server
@@ -50,10 +51,10 @@ public interface QuerySession extends AutoCloseable {
      * @param settings additional settings for request
      * @return future with result of the transaction starting
      */
-    CompletableFuture<Result<QueryTransaction>> beginTransaction(QueryTx txMode, BeginTransactionSettings settings);
+    CompletableFuture<Result<QueryTransaction>> beginTransaction(TxMode txMode, BeginTransactionSettings settings);
 
     /**
-     * Create {@link QueryStream} for executing query with specified {@link QueryTx}. The query can contain DML, DDL and
+     * Create {@link QueryStream} for executing query with specified {@link TxMode}. The query can contain DML, DDL and
      * DCL statements. Supported mix of different statement types depends on the chosen transaction type.
      *
      * @param query text of query
@@ -62,33 +63,33 @@ public interface QuerySession extends AutoCloseable {
      * @param settings additional settings of query execution
      * @return a ready to execute instance of {@link QueryStream}
      */
-    QueryStream createQuery(String query, QueryTx tx, Params params, ExecuteQuerySettings settings);
+    QueryStream createQuery(String query, TxMode tx, Params params, ExecuteQuerySettings settings);
 
     @Override
     void close();
 
     /**
-     * Create {@link QueryStream} for executing query with specified {@link QueryTx}. The query can contain DML, DDL and
+     * Create {@link QueryStream} for executing query with specified {@link TxMode}. The query can contain DML, DDL and
      * DCL statements. Supported mix of different statement types depends on the chosen transaction type.
      *
      * @param query text of query
      * @param tx transaction mode
      * @param params query parameters
      * @return a ready to execute instance of {@link QueryStream}
      */
-    default QueryStream createQuery(String query, QueryTx tx, Params params) {
+    default QueryStream createQuery(String query, TxMode tx, Params params) {
         return createQuery(query, tx, params, ExecuteQuerySettings.newBuilder().build());
     }
 
     /**
-     * Create {@link QueryStream} for executing query with specified {@link QueryTx}. The query can contain DML, DDL and
+     * Create {@link QueryStream} for executing query with specified {@link TxMode}. The query can contain DML, DDL and
      * DCL statements. Supported mix of different statement types depends on the chosen transaction type.
      *
      * @param query text of query
      * @param tx transaction mode
      * @return a ready to execute instance of {@link QueryStream}
      */
-    default QueryStream createQuery(String query, QueryTx tx) {
+    default QueryStream createQuery(String query, TxMode tx) {
         return createQuery(query, tx, Params.empty(), ExecuteQuerySettings.newBuilder().build());
     }
 
@@ -99,7 +100,7 @@ default QueryStream createQuery(String query, QueryTx tx) {
      * @param txMode transaction mode
      * @return future with result of the transaction starting
      */
-    default CompletableFuture<Result<QueryTransaction>> beginTransaction(QueryTx txMode) {
+    default CompletableFuture<Result<QueryTransaction>> beginTransaction(TxMode txMode) {
         return beginTransaction(txMode, BeginTransactionSettings.newBuilder().build());
     }
 }

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

@@ -2,6 +2,7 @@
 
 import java.util.concurrent.CompletableFuture;
 
+import tech.ydb.common.transaction.YdbTransaction;
 import tech.ydb.core.Result;
 import tech.ydb.core.Status;
 import tech.ydb.query.result.QueryInfo;
@@ -11,36 +12,15 @@
 import tech.ydb.table.query.Params;
 
 /**
+ * Interface of transaction from query service
  * Short-living object allows transactional execution of several queries in one interactive transaction.
  * QueryTransaction can be used in implicit mode - without calling commit()/rollback(). When QueryTransaction is not
  * active - any execution of query with commitAtEnd=false starts a new transaction. And execution of query with
  * commitAtEnd=true commits this transaction.
  *
  * @author Aleksandr Gorshenin
  */
-public interface QueryTransaction {
-
-    /**
-     * Returns identifier of the transaction or null if the transaction is not active = (not
-     * started/committed/rolled back). When {@link QueryTransaction} is not active - any execution of the query created
-     * by {@code createQuery} starts a new transaction. When QueryTransaction is active - any call of {@code commit},
-     * {@code rollback} or execution of the query created by {@code createQuery} with {@code commitAtEnd}=true finishes
-     * the transaction
-     *
-     * @return identifier of the transaction or null if the transaction is not active
-     */
-    String getId();
-
-    /**
-     * Returns {@link QueryTx} with mode of the transaction
-     *
-     * @return the transaction mode
-     */
-    QueryTx getQueryTx();
-
-    default boolean isActive() {
-        return getId() != null;
-    }
+public interface QueryTransaction extends YdbTransaction {
 
     /**
      * Returns {@link QuerySession} that was used for creating the transaction