Update usage of YdbStatusException

ydb-platform · Oct 27, 2023 · fd7f26b · fd7f26b
1 parent edd529f
commit fd7f26b
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 84 deletions.
diff --git a/jdbc/src/main/java/tech/ydb/jdbc/context/YdbExecutor.java b/jdbc/src/main/java/tech/ydb/jdbc/context/YdbExecutor.java
@@ -16,10 +16,8 @@
 import tech.ydb.core.Issue;
 import tech.ydb.core.Result;
 import tech.ydb.core.Status;
-import tech.ydb.jdbc.exception.YdbConditionallyRetryableException;
 import tech.ydb.jdbc.exception.YdbExecutionException;
-import tech.ydb.jdbc.exception.YdbNonRetryableException;
-import tech.ydb.jdbc.exception.YdbRetryableException;
+import tech.ydb.jdbc.exception.YdbStatusException;
 import tech.ydb.table.Session;
 
 /**
@@ -119,67 +117,8 @@ private void simpleExecute(Supplier<CompletableFuture<Status>> supplier) throws
 
     private void validate(String message, Status status) throws SQLException {
         issues.addAll(Arrays.asList(status.getIssues()));
-
-        switch (status.getCode()) {
-            case SUCCESS:
-                return;
-
-            case BAD_REQUEST:
-            case INTERNAL_ERROR:
-            case CLIENT_UNAUTHENTICATED:
-            // gRPC reports, request is not authenticated
-            // Maybe internal error, maybe some issue with token
-            case UNAUTHORIZED:
-            // Unauthorized by database
-            case SCHEME_ERROR:
-            case GENERIC_ERROR:
-            case CLIENT_CALL_UNIMPLEMENTED:
-            case UNSUPPORTED:
-            case UNUSED_STATUS:
-            case ALREADY_EXISTS:
-                throw new YdbNonRetryableException(message, status.getCode());
-
-            case ABORTED:
-            case UNAVAILABLE:
-            // Some of database parts are not available
-            case OVERLOADED:
-            // Database is overloaded, need to retry with exponential backoff
-            case TRANSPORT_UNAVAILABLE:
-            // Some issues with networking
-            case CLIENT_RESOURCE_EXHAUSTED:
-            // No resources to handle client request
-            case NOT_FOUND:
-            // Could be 'prepared query' issue, could be 'transaction not found'
-            // Should be retries with new session
-            case BAD_SESSION:
-            // Retry with new session
-            case SESSION_EXPIRED:
-                // Retry with new session
-                throw new YdbRetryableException(message, status.getCode());
-
-            case CANCELLED:
-            // Query was canceled due to query timeout (CancelAfter)
-            // Query was definitely canceled by database
-            case CLIENT_CANCELLED:
-            case CLIENT_INTERNAL_ERROR:
-                // Some unknown client side error, probably on transport layer
-                throw new YdbConditionallyRetryableException(message, status.getCode());
-
-            case UNDETERMINED:
-            case TIMEOUT:
-            // Database cannot respond in time, need to retry with exponential backoff
-            case PRECONDITION_FAILED:
-            case CLIENT_DEADLINE_EXCEEDED:
-            // Query was canceled on transport layer
-            case SESSION_BUSY:
-            // Another query is executing already, retry with new session
-            case CLIENT_DISCOVERY_FAILED:
-            // Some issue with database endpoints discovery
-            case CLIENT_LIMITS_REACHED:
-                // Client side session limit was reached
-                throw new YdbConditionallyRetryableException(message, status.getCode());
-            default:
-                throw new YdbNonRetryableException(message, status.getCode());
+        if (!status.isSuccess()) {
+            throw YdbStatusException.newException(message, status);
         }
     }
 }
diff --git a/jdbc/src/main/java/tech/ydb/jdbc/impl/YdbDatabaseMetaDataImpl.java b/jdbc/src/main/java/tech/ydb/jdbc/impl/YdbDatabaseMetaDataImpl.java
@@ -30,7 +30,7 @@
 import tech.ydb.jdbc.common.FixedResultSetFactory;
 import tech.ydb.jdbc.common.YdbFunctions;
 import tech.ydb.jdbc.context.YdbExecutor;
-import tech.ydb.jdbc.exception.YdbExecutionStatusException;
+import tech.ydb.jdbc.exception.YdbStatusException;
 import tech.ydb.proto.scheme.SchemeOperationProtos;
 import tech.ydb.scheme.SchemeClient;
 import tech.ydb.scheme.description.ListDirectoryResult;
@@ -1352,8 +1352,8 @@ private TableDescription describeTable(String table) throws SQLException {
                 return executor.call("Describe table " + table,
                         () -> session.describeTable(databaseWithSuffix + table, settings)
                 );
-            } catch (YdbExecutionStatusException ex) {
-                if (ex.getStatusCode() != StatusCode.SCHEME_ERROR) { // ignore scheme errors like path not found
+            } catch (YdbStatusException ex) {
+                if (ex.getStatus().getCode() != StatusCode.SCHEME_ERROR) { // ignore scheme errors like path not found
                     throw ex;
                 }
                 LOGGER.log(Level.WARNING, "Cannot describe table {0} -> {1}",

diff --git a/jdbc/src/main/java/tech/ydb/jdbc/impl/params/BatchedParams.java b/jdbc/src/main/java/tech/ydb/jdbc/impl/params/BatchedParams.java
@@ -8,10 +8,9 @@
 import java.util.List;
 import java.util.Map;
 
-import tech.ydb.core.StatusCode;
 import tech.ydb.jdbc.YdbConst;
 import tech.ydb.jdbc.common.TypeDescription;
-import tech.ydb.jdbc.exception.YdbNonRetryableException;
+import tech.ydb.jdbc.exception.YdbStatusException;
 import tech.ydb.jdbc.impl.YdbJdbcParams;
 import tech.ydb.table.query.Params;
 import tech.ydb.table.values.ListType;
@@ -86,10 +85,7 @@ private StructValue validatedCurrentStruct() throws SQLException {
                 continue;
             }
 
-            throw new YdbNonRetryableException(
-                    YdbConst.MISSING_VALUE_FOR_PARAMETER + prm.displayName(),
-                    StatusCode.BAD_REQUEST
-            );
+            throw YdbStatusException.newBadRequest(YdbConst.MISSING_VALUE_FOR_PARAMETER + prm.displayName());
         }
         return StructValue.of(currentValues);
     }

diff --git a/jdbc/src/main/java/tech/ydb/jdbc/query/YdbQuery.java b/jdbc/src/main/java/tech/ydb/jdbc/query/YdbQuery.java
@@ -6,9 +6,8 @@
 import java.util.List;
 import java.util.Map;
 
-import tech.ydb.core.StatusCode;
 import tech.ydb.jdbc.YdbConst;
-import tech.ydb.jdbc.exception.YdbNonRetryableException;
+import tech.ydb.jdbc.exception.YdbStatusException;
 import tech.ydb.table.query.Params;
 import tech.ydb.table.values.Value;
 
@@ -52,10 +51,7 @@ public String getYqlQuery(Params params) throws SQLException {
                 for (int idx = 0; idx < indexesArgsNames.size(); idx += 1) {
                     String prm = indexesArgsNames.get(idx);
                     if (!values.containsKey(prm)) {
-                        throw new YdbNonRetryableException(
-                                YdbConst.MISSING_VALUE_FOR_PARAMETER + prm,
-                                StatusCode.BAD_REQUEST
-                        );
+                        throw YdbStatusException.newBadRequest(YdbConst.MISSING_VALUE_FOR_PARAMETER + prm);
                     }
 
                     if (opts.isDeclareJdbcParameters()) {

diff --git a/jdbc/src/main/java/tech/ydb/jdbc/query/YdbQueryBuilder.java b/jdbc/src/main/java/tech/ydb/jdbc/query/YdbQueryBuilder.java
@@ -3,9 +3,8 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import tech.ydb.core.StatusCode;
 import tech.ydb.jdbc.YdbConst;
-import tech.ydb.jdbc.exception.YdbNonRetryableException;
+import tech.ydb.jdbc.exception.YdbStatusException;
 
 /**
  *
@@ -37,14 +36,13 @@ public String createNextArgName() {
         }
     }
 
-    public void setQueryType(QueryType type) throws YdbNonRetryableException {
+    public void setQueryType(QueryType type) throws YdbStatusException {
         if (forcedType != null) {
             return;
         }
 
         if (currentType != null && currentType != type) {
-            String msg = YdbConst.MULTI_TYPES_IN_ONE_QUERY + currentType + ", " + type;
-            throw new YdbNonRetryableException(msg, StatusCode.BAD_REQUEST);
+            throw YdbStatusException.newBadRequest(YdbConst.MULTI_TYPES_IN_ONE_QUERY + currentType + ", " + type);
         }
         this.currentType = type;
     }