SDKQE-3384: FIT-Columnar - Support error grpc changes

Change-Id: I96b3782e917d62eec710f324894cef8929a5ebf6 Reviewed-on: https://review.couchbase.org/c/couchbase-jvm-clients/+/216125 Reviewed-by: Graham Pople <graham.pople@couchbase.com> Tested-by: Build Bot <build@couchbase.com>

Author: willbroadbelt

columnar-fit-performer-shared/src/main/java/com/couchbase/columnar/fit/core/util/ResultUtil.java

@@ -19,7 +19,7 @@
 import com.couchbase.columnar.client.java.QueryResult;
 import com.couchbase.columnar.client.java.Queryable;
 import com.couchbase.columnar.client.java.Row;
-import com.couchbase.columnar.fit.core.util.ResultUtil;
+import com.couchbase.columnar.util.ResultUtil;
 import fit.columnar.EmptyResultOrFailureResponse;
 import fit.columnar.ExecuteQueryRequest;
 import fit.columnar.QueryResultMetadataResponse;

columnar-java-fit-performer/src/main/java/com/couchbase/columnar/query/QueryResultBufferedStreamer.java

@@ -23,7 +23,7 @@
 import com.couchbase.columnar.client.java.json.JsonArray;
 import com.couchbase.columnar.client.java.json.JsonObject;
 import com.couchbase.columnar.content.ContentAsUtil;
-import com.couchbase.columnar.fit.core.util.ErrorUtil;
+import com.couchbase.columnar.util.ErrorUtil;
 import fit.columnar.EmptyResultOrFailureResponse;
 import fit.columnar.ExecuteQueryRequest;
 import fit.columnar.QueryResultMetadataResponse;

columnar-java-fit-performer/src/main/java/com/couchbase/columnar/query/QueryResultPushBasedStreamer.java

@@ -20,7 +20,7 @@
 import com.couchbase.columnar.client.java.json.JsonArray;
 import com.couchbase.columnar.client.java.json.JsonObject;
 import com.couchbase.columnar.content.ContentAsUtil;
-import com.couchbase.columnar.fit.core.util.ErrorUtil;
+import com.couchbase.columnar.util.ErrorUtil;
 import fit.columnar.QueryRowResponse;
 
 import javax.annotation.Nullable;

columnar-java-fit-performer/src/main/java/com/couchbase/columnar/query/QueryRowUtil.java

@@ -21,8 +21,8 @@
 import com.couchbase.columnar.query.ExecuteQueryStreamer;
 import com.couchbase.columnar.query.QueryResultBufferedStreamer;
 import com.couchbase.columnar.query.QueryResultPushBasedStreamer;
-import com.couchbase.columnar.fit.core.util.ErrorUtil;
-import com.couchbase.columnar.fit.core.util.ResultUtil;
+import com.couchbase.columnar.util.ErrorUtil;
+import com.couchbase.columnar.util.ResultUtil;
 import fit.columnar.CloseAllQueryResultsRequest;
 import fit.columnar.CloseQueryResultRequest;
 import fit.columnar.ColumnarCrossServiceGrpc;

columnar-java-fit-performer/src/main/java/com/couchbase/columnar/rpc/JavaColumnarCrossService.java

@@ -21,8 +21,8 @@
 import com.couchbase.columnar.cluster.ColumnarClusterConnection;
 import com.couchbase.columnar.modes.Mode;
 import com.couchbase.columnar.fit.core.exceptions.ExceptionGrpcMappingUtil;
-import com.couchbase.columnar.fit.core.util.ResultUtil;
 import com.couchbase.columnar.fit.core.util.VersionUtil;
+import com.couchbase.columnar.util.ResultUtil;
 import fit.columnar.CloseAllColumnarClustersRequest;
 import fit.columnar.ClusterCloseRequest;
 import fit.columnar.ClusterNewInstanceRequest;

columnar-java-fit-performer/src/main/java/com/couchbase/columnar/rpc/JavaColumnarService.java

@@ -13,26 +13,24 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.couchbase.columnar.fit.core.util;
+package com.couchbase.columnar.util;
 
-import fit.columnar.ColumnarErrorType;
+import com.couchbase.columnar.client.java.InvalidCredentialException;
+import com.couchbase.columnar.client.java.QueryException;
+import com.couchbase.columnar.client.java.TimeoutException;
 import fit.columnar.PlatformErrorType;
 
-import javax.annotation.Nullable;
-
 
 public class ErrorUtil {
  private ErrorUtil() {
  throw new AssertionError("not instantiable");
  }
 
- private static @Nullable fit.columnar.ColumnarErrorType convertColumnarError(Throwable exception) {
+ private static boolean isColumnarError(Throwable exception) {
  String simpleName = exception.getClass().getSimpleName();
  return switch (simpleName) {
- case "QueryException" -> ColumnarErrorType.COLUMNAR_EXCEPTION_QUERY;
- case "InvalidCredentialException" -> ColumnarErrorType.COLUMNAR_EXCEPTION_INVALID_CREDENTIAL;
- case "TimeoutException" -> ColumnarErrorType.COLUMNAR_EXCEPTION_TIMEOUT;
- default -> null;
+ case "QueryException", "InvalidCredentialException", "TimeoutException", "ColumnarException" -> true;
+ default -> false;
  };
  }
 
@@ -45,21 +43,38 @@ private static fit.columnar.PlatformErrorType convertPlatformError(Throwable exc
  public static fit.columnar.Error convertError(Throwable raw) {
  var ret = fit.columnar.Error.newBuilder();
 
- var type = ErrorUtil.convertColumnarError(raw);
-
- if (type != null) {
+ if (isColumnarError(raw)) {
  var out = fit.columnar.ColumnarError.newBuilder()
- .setType(type)
- .setAsString(raw.toString());
+ .setAsString(raw.toString());
+
+ if (raw instanceof QueryException queryException) {
+ out.setSubException(fit.columnar.SubColumnarError.newBuilder().setQueryException(
+ fit.columnar.QueryException.newBuilder()
+ .setErrorCode(queryException.code())
+ .setServerMessage(queryException.serverMessage())
+ .build())
+ .build());
+ }
+ if (raw instanceof InvalidCredentialException) {
+ out.setSubException(fit.columnar.SubColumnarError.newBuilder().setInvalidCredentialException(
+ fit.columnar.InvalidCredentialException.newBuilder().build())
+ .build());
+ }
+
+ if (raw instanceof TimeoutException) {
+ out.setSubException(fit.columnar.SubColumnarError.newBuilder().setTimeoutException(fit.columnar.TimeoutException.newBuilder().build())
+ .build());
+ }
+
  if (raw.getCause() != null) {
  out.setCause(convertError(raw.getCause()));
  }
 
  ret.setColumnar(out);
  } else {
  ret.setPlatform(fit.columnar.PlatformError.newBuilder()
-  .setType(convertPlatformError(raw))
-  .setAsString(raw.toString()));
+ .setType(convertPlatformError(raw))
+ .setAsString(raw.toString()));
  }
 
  return ret.build();

columnar-fit-performer-shared/src/main/java/com/couchbase/columnar/fit/core/util/ErrorUtil.java renamed to columnar-java-fit-performer/src/main/java/com/couchbase/columnar/util/ErrorUtil.java

@@ -0,0 +1,34 @@
+package com.couchbase.columnar.util;
+
+import com.couchbase.columnar.fit.core.util.StartTimes;
+import fit.columnar.EmptyResultOrFailureResponse;
+import fit.columnar.ResponseMetadata;
+
+public class ResultUtil {
+ public static EmptyResultOrFailureResponse success(StartTimes startTime) {
+ return fit.columnar.EmptyResultOrFailureResponse.newBuilder()
+ .setEmptySuccess(true)
+ .setMetadata(responseMetadata(startTime))
+ .build();
+ }
+
+ public static EmptyResultOrFailureResponse failure(Throwable err, StartTimes startTime) {
+ return fit.columnar.EmptyResultOrFailureResponse.newBuilder()
+ .setMetadata(responseMetadata(startTime))
+ .setError(ErrorUtil.convertError(err))
+ .build();
+ }
+
+ public static ResponseMetadata responseMetadata(StartTimes startTime) {
+ if (startTime != null) {
+ return fit.columnar.ResponseMetadata.newBuilder()
+ .setElapsedNanos(System.nanoTime() - startTime.asSystem())
+ .setInitiated(startTime.asWallclock())
+ .build();
+ }
+ else {
+ // todo remove when fix timings
+ return fit.columnar.ResponseMetadata.newBuilder().build();
+ }
+ }
+}