Merge pull request #129 from forcedotcom/sonal/28022023

@W-12606762: fixing grpc dependency conflict and removed 5min timeout on grpc call
forcedotcom · Feb 28, 2023 · 75ec3b7 · 75ec3b7
2 parents aeb6b11 + c26eaa9
commit 75ec3b7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -222,6 +222,10 @@
                             <pattern>io.netty</pattern>
                             <shadedPattern>${shadeBase}.io.netty</shadedPattern>
                         </relocation>
+                        <relocation>
+                            <pattern>io.grpc</pattern>
+                            <shadedPattern>${shadeBase}.io.grpc</shadedPattern>
+                        </relocation>
                     </relocations>
                     <filters>
                         <filter>

diff --git a/src/main/java/com/salesforce/cdp/queryservice/util/QueryGrpcExecutor.java b/src/main/java/com/salesforce/cdp/queryservice/util/QueryGrpcExecutor.java
@@ -45,7 +45,6 @@ public class QueryGrpcExecutor extends QueryTokenExecutor {
 
     private static ManagedChannel DEFAULT_CHANNEL = null;
     private static final int port = 443;
-    private static final int timeoutInMin = 5;
     // No retry on hyper for now. Fallback to v2 call if receive even one failure from hyper.
     private static final int GRPC_MAX_RETRY = 0;
     private static final Metadata.Key<String> TRACE_ID_KEY = Metadata.Key.of(Constants.TRACE_ID, Metadata.ASCII_STRING_MARSHALLER);
@@ -135,7 +134,6 @@ private Iterator<AnsiSqlQueryStreamResponse> executeQuery(String sql, AtomicRefe
         QueryServiceGrpc.QueryServiceBlockingStub stub = QueryServiceGrpc.newBlockingStub(channel);
         Properties properties = connection.getClientInfo();
         return stub
-            .withDeadlineAfter(timeoutInMin, TimeUnit.MINUTES)
             .withMaxInboundMessageSize(MAX_MESSAGE_SIZE)
             .withInterceptors(
                     new GrpcInterceptor(tokenWithTenantUrl, properties),