Skip to content

Commit 12651f8

Browse files
sotodelajaygeorge
authored andcommitted
Use Header transport by default in DriftNettyClientConfig
1 parent 7f52bf0 commit 12651f8

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

drift-transport-netty/src/main/java/com/facebook/drift/transport/netty/client/DriftNettyClientConfig.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
import java.util.List;
3434

3535
import static com.facebook.drift.transport.netty.codec.Protocol.BINARY;
36-
import static com.facebook.drift.transport.netty.codec.Transport.FRAMED;
36+
import static com.facebook.drift.transport.netty.codec.Transport.HEADER;
3737
import static io.airlift.units.DataSize.Unit.MEGABYTE;
3838
import static java.util.Objects.requireNonNull;
3939
import static java.util.concurrent.TimeUnit.DAYS;
@@ -42,7 +42,7 @@
4242

4343
public class DriftNettyClientConfig
4444
{
45-
private Transport transport = FRAMED;
45+
private Transport transport = HEADER;
4646
private Protocol protocol = BINARY;
4747
private DataSize maxFrameSize = new DataSize(16, MEGABYTE);
4848

drift-transport-netty/src/test/java/com/facebook/drift/transport/netty/client/TestDriftNettyClientConfig.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ public class TestDriftNettyClientConfig
4444
public void testDefaults()
4545
{
4646
assertRecordedDefaults(recordDefaults(DriftNettyClientConfig.class)
47-
.setTransport(FRAMED)
47+
.setTransport(HEADER)
4848
.setProtocol(BINARY)
4949
.setConnectTimeout(new Duration(500, MILLISECONDS))
5050
.setRequestTimeout(new Duration(10, SECONDS))
@@ -69,7 +69,7 @@ public void testDefaults()
6969
public void testExplicitPropertyMappings()
7070
{
7171
Map<String, String> properties = new ImmutableMap.Builder<String, String>()
72-
.put("thrift.client.transport", "HEADER")
72+
.put("thrift.client.transport", "FRAMED")
7373
.put("thrift.client.protocol", "COMPACT")
7474
.put("thrift.client.connect-timeout", "99ms")
7575
.put("thrift.client.request-timeout", "33m")
@@ -91,7 +91,8 @@ public void testExplicitPropertyMappings()
9191
.build();
9292

9393
DriftNettyClientConfig expected = new DriftNettyClientConfig()
94-
.setTransport(HEADER)
94+
// testing a Transport that is not the default (HEADER)
95+
.setTransport(FRAMED)
9596
.setProtocol(COMPACT)
9697
.setConnectTimeout(new Duration(99, MILLISECONDS))
9798
.setRequestTimeout(new Duration(33, MINUTES))

drift-transport-netty/src/test/java/com/facebook/drift/transport/netty/client/TestDriftNettyMethodInvoker.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -372,6 +372,8 @@ public void testTimeout()
372372
private static int logNiftyInvocationHandlerOptional(HostAndPort address, List<DriftLogEntry> entries)
373373
{
374374
DriftNettyClientConfig config = new DriftNettyClientConfig();
375+
config.setTransport(FRAMED);
376+
375377
try (TestingPooledByteBufAllocator testingAllocator = new TestingPooledByteBufAllocator();
376378
DriftNettyMethodInvokerFactory<Void> methodInvokerFactory = new DriftNettyMethodInvokerFactory<>(
377379
new DriftNettyConnectionFactoryConfig(),

0 commit comments

Comments
 (0)