From 678c1d6faae55c1056e90ee1fcc923681b3de86a Mon Sep 17 00:00:00 2001 From: sonal-aggarwal Date: Mon, 27 Feb 2023 22:33:13 +0530 Subject: [PATCH 1/2] @W-12606762: fixing grpc dependency conflict --- pom.xml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pom.xml b/pom.xml index 331f974..a7ec5a2 100644 --- a/pom.xml +++ b/pom.xml @@ -222,6 +222,10 @@ io.netty ${shadeBase}.io.netty + + io.grpc + ${shadeBase}.io.grpc + From c26eaa93248b73131d5fb7e3fb98b1edebfa432f Mon Sep 17 00:00:00 2001 From: sonal-aggarwal Date: Tue, 28 Feb 2023 09:55:20 +0530 Subject: [PATCH 2/2] @W-12611809: grpc timeout removed --- .../com/salesforce/cdp/queryservice/util/QueryGrpcExecutor.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/salesforce/cdp/queryservice/util/QueryGrpcExecutor.java b/src/main/java/com/salesforce/cdp/queryservice/util/QueryGrpcExecutor.java index 92a7528..8e3d781 100644 --- 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 TRACE_ID_KEY = Metadata.Key.of(Constants.TRACE_ID, Metadata.ASCII_STRING_MARSHALLER); @@ -135,7 +134,6 @@ private Iterator 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),