Sync with latest proto files (#17)

This commit updates the project to use the latest version of the proto
files.

Author: KaviarasuSakthivadivel

pom.xml

@@ -18,7 +18,7 @@
         <grpcmock-junit5.version>0.13.0</grpcmock-junit5.version>
         <guava.version>33.2.1-jre</guava.version>
         <!-- https://tableau.github.io/hyper-db/docs/releases#download -->
-        <hyperapi.version>0.0.20746.reac9bd2d</hyperapi.version>
+        <hyperapi.version>0.0.21200.re11c8cb9</hyperapi.version>
         <hyperd.directory>${project.build.directory}/hyper</hyperd.directory>
         <jackson.version>2.18.0</jackson.version>
         <jacoco.maven.plugin.version>0.8.12</jacoco.maven.plugin.version>

src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudPreparedStatement.java

@@ -27,8 +27,6 @@
 import com.salesforce.datacloud.jdbc.util.ArrowUtils;
 import com.salesforce.datacloud.jdbc.util.Constants;
 import com.salesforce.datacloud.jdbc.util.SqlErrorCodes;
-import com.salesforce.hyperdb.grpc.QueryParam;
-import com.salesforce.hyperdb.grpc.QueryParameterArrow;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.Reader;
@@ -58,6 +56,8 @@
 import lombok.experimental.UtilityClass;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
+import salesforce.cdp.hyperdb.v1.QueryParam;
+import salesforce.cdp.hyperdb.v1.QueryParameterArrow;
 
 @Slf4j
 public class DataCloudPreparedStatement extends DataCloudStatement implements PreparedStatement {

src/main/java/com/salesforce/datacloud/jdbc/core/DataCloudStatement.java

@@ -25,7 +25,6 @@
 import com.salesforce.datacloud.jdbc.exception.DataCloudJDBCException;
 import com.salesforce.datacloud.jdbc.util.Constants;
 import com.salesforce.datacloud.jdbc.util.SqlErrorCodes;
-import com.salesforce.hyperdb.grpc.QueryParam;
 import java.sql.Connection;
 import java.sql.ResultSet;
 import java.sql.SQLException;
@@ -35,6 +34,7 @@
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
+import salesforce.cdp.hyperdb.v1.QueryParam;
 
 @Slf4j
 public class DataCloudStatement implements Statement {

src/main/java/com/salesforce/datacloud/jdbc/core/ExecuteQueryResponseChannel.java

@@ -17,8 +17,6 @@
 
 import com.google.protobuf.ByteString;
 import com.salesforce.datacloud.jdbc.util.ConsumingPeekingIterator;
-import com.salesforce.hyperdb.grpc.QueryResult;
-import com.salesforce.hyperdb.grpc.QueryResultPartBinary;
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.nio.channels.ReadableByteChannel;
@@ -27,6 +25,8 @@
 import java.util.stream.Stream;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
+import salesforce.cdp.hyperdb.v1.QueryResult;
+import salesforce.cdp.hyperdb.v1.QueryResultPartBinary;
 
 @Slf4j
 public class ExecuteQueryResponseChannel implements ReadableByteChannel {

src/main/java/com/salesforce/datacloud/jdbc/core/HyperGrpcClientExecutor.java

@@ -20,14 +20,6 @@
 import com.salesforce.datacloud.jdbc.config.DriverVersion;
 import com.salesforce.datacloud.jdbc.interceptor.QueryIdHeaderInterceptor;
 import com.salesforce.datacloud.jdbc.util.PropertiesExtensions;
-import com.salesforce.hyperdb.grpc.ExecuteQueryResponse;
-import com.salesforce.hyperdb.grpc.HyperServiceGrpc;
-import com.salesforce.hyperdb.grpc.OutputFormat;
-import com.salesforce.hyperdb.grpc.QueryInfo;
-import com.salesforce.hyperdb.grpc.QueryInfoParam;
-import com.salesforce.hyperdb.grpc.QueryParam;
-import com.salesforce.hyperdb.grpc.QueryResult;
-import com.salesforce.hyperdb.grpc.QueryResultParam;
 import io.grpc.ClientInterceptor;
 import io.grpc.ManagedChannel;
 import io.grpc.ManagedChannelBuilder;
@@ -45,6 +37,14 @@
 import lombok.NonNull;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
+import salesforce.cdp.hyperdb.v1.ExecuteQueryResponse;
+import salesforce.cdp.hyperdb.v1.HyperServiceGrpc;
+import salesforce.cdp.hyperdb.v1.OutputFormat;
+import salesforce.cdp.hyperdb.v1.QueryInfo;
+import salesforce.cdp.hyperdb.v1.QueryInfoParam;
+import salesforce.cdp.hyperdb.v1.QueryParam;
+import salesforce.cdp.hyperdb.v1.QueryResult;
+import salesforce.cdp.hyperdb.v1.QueryResultParam;
 
 @Slf4j
 @Builder(toBuilder = true)
@@ -144,7 +144,7 @@ private QueryParam getQueryParams(String sql, QueryParam.TransferMode transferMo
         val builder = QueryParam.newBuilder()
                 .setQuery(sql)
                 .setTransferMode(transferMode)
-                .setOutputFormat(OutputFormat.ARROW_V3);
+                .setOutputFormat(OutputFormat.ARROW_IPC);
 
         if (additionalQueryParams != null) {
             builder.mergeFrom(additionalQueryParams);
@@ -161,7 +161,7 @@ private QueryResultParam getQueryResultParam(String queryId, long chunkId, boole
         val builder = QueryResultParam.newBuilder()
                 .setQueryId(queryId)
                 .setChunkId(chunkId)
-                .setOutputFormat(OutputFormat.ARROW_V3);
+                .setOutputFormat(OutputFormat.ARROW_IPC);
 
         if (omitSchema) {
             builder.setOmitSchema(true);

src/main/java/com/salesforce/datacloud/jdbc/core/listener/AdaptiveQueryStatusListener.java

@@ -24,9 +24,6 @@
 import com.salesforce.datacloud.jdbc.exception.DataCloudJDBCException;
 import com.salesforce.datacloud.jdbc.exception.QueryExceptionHandler;
 import com.salesforce.datacloud.jdbc.util.StreamUtilities;
-import com.salesforce.hyperdb.grpc.ExecuteQueryResponse;
-import com.salesforce.hyperdb.grpc.QueryResult;
-import com.salesforce.hyperdb.grpc.QueryStatus;
 import io.grpc.StatusRuntimeException;
 import java.sql.SQLException;
 import java.time.Duration;
@@ -43,6 +40,9 @@
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
+import salesforce.cdp.hyperdb.v1.ExecuteQueryResponse;
+import salesforce.cdp.hyperdb.v1.QueryResult;
+import salesforce.cdp.hyperdb.v1.QueryStatus;
 
 @Slf4j
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
@@ -94,7 +94,7 @@ public String getStatus() {
                 .map(QueryStatusPoller::pollQueryStatus)
                 .map(QueryStatus::getCompletionStatus)
                 .map(Enum::name)
-                .orElse(QueryStatus.CompletionStatus.RUNNING.name());
+                .orElse(QueryStatus.CompletionStatus.RUNNING_OR_UNSPECIFIED.name());
     }
 
     @Override

src/main/java/com/salesforce/datacloud/jdbc/core/listener/AdaptiveQueryStatusPoller.java

@@ -18,10 +18,6 @@
 import com.salesforce.datacloud.jdbc.core.HyperGrpcClientExecutor;
 import com.salesforce.datacloud.jdbc.exception.QueryExceptionHandler;
 import com.salesforce.datacloud.jdbc.util.StreamUtilities;
-import com.salesforce.hyperdb.grpc.ExecuteQueryResponse;
-import com.salesforce.hyperdb.grpc.QueryInfo;
-import com.salesforce.hyperdb.grpc.QueryResult;
-import com.salesforce.hyperdb.grpc.QueryStatus;
 import io.grpc.StatusRuntimeException;
 import java.util.Iterator;
 import java.util.Optional;
@@ -32,6 +28,10 @@
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
+import salesforce.cdp.hyperdb.v1.ExecuteQueryResponse;
+import salesforce.cdp.hyperdb.v1.QueryInfo;
+import salesforce.cdp.hyperdb.v1.QueryResult;
+import salesforce.cdp.hyperdb.v1.QueryStatus;
 
 @Slf4j
 @AllArgsConstructor(access = AccessLevel.PACKAGE)

src/main/java/com/salesforce/datacloud/jdbc/core/listener/AsyncQueryStatusListener.java

@@ -21,8 +21,6 @@
 import com.salesforce.datacloud.jdbc.exception.DataCloudJDBCException;
 import com.salesforce.datacloud.jdbc.exception.QueryExceptionHandler;
 import com.salesforce.datacloud.jdbc.util.StreamUtilities;
-import com.salesforce.hyperdb.grpc.QueryResult;
-import com.salesforce.hyperdb.grpc.QueryStatus;
 import io.grpc.StatusRuntimeException;
 import java.sql.SQLException;
 import java.util.Optional;
@@ -35,6 +33,8 @@
 import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 import lombok.val;
+import salesforce.cdp.hyperdb.v1.QueryResult;
+import salesforce.cdp.hyperdb.v1.QueryStatus;
 
 @Slf4j
 @Builder(access = AccessLevel.PRIVATE)

src/main/java/com/salesforce/datacloud/jdbc/core/listener/AsyncQueryStatusPoller.java

@@ -20,8 +20,6 @@
 import com.salesforce.datacloud.jdbc.core.HyperGrpcClientExecutor;
 import com.salesforce.datacloud.jdbc.exception.DataCloudJDBCException;
 import com.salesforce.datacloud.jdbc.exception.QueryExceptionHandler;
-import com.salesforce.hyperdb.grpc.QueryInfo;
-import com.salesforce.hyperdb.grpc.QueryStatus;
 import io.grpc.StatusRuntimeException;
 import java.sql.SQLException;
 import java.util.Iterator;
@@ -31,6 +29,8 @@
 import lombok.AllArgsConstructor;
 import lombok.SneakyThrows;
 import lombok.val;
+import salesforce.cdp.hyperdb.v1.QueryInfo;
+import salesforce.cdp.hyperdb.v1.QueryStatus;
 
 @AllArgsConstructor(access = AccessLevel.PACKAGE)
 class AsyncQueryStatusPoller implements QueryStatusPoller {

src/main/java/com/salesforce/datacloud/jdbc/core/listener/QueryStatusListener.java

@@ -16,9 +16,9 @@
 package com.salesforce.datacloud.jdbc.core.listener;
 
 import com.salesforce.datacloud.jdbc.core.DataCloudResultSet;
-import com.salesforce.hyperdb.grpc.QueryResult;
 import java.sql.SQLException;
 import java.util.stream.Stream;
+import salesforce.cdp.hyperdb.v1.QueryResult;
 
 public interface QueryStatusListener {
     String BEFORE_READY = "Results were requested before ready";