Skip to content

Commit fdfadc9

Browse files
implementing OptionalFloatThriftCodec and float coercion
1 parent d6eed85 commit fdfadc9

File tree

4 files changed

+80
-0
lines changed

4 files changed

+80
-0
lines changed

drift-codec/src/main/java/com/facebook/drift/codec/ThriftCodecManager.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import com.facebook.drift.codec.internal.builtin.LongThriftCodec;
3333
import com.facebook.drift.codec.internal.builtin.MapThriftCodec;
3434
import com.facebook.drift.codec.internal.builtin.OptionalDoubleThriftCodec;
35+
import com.facebook.drift.codec.internal.builtin.OptionalFloatThriftCodec;
3536
import com.facebook.drift.codec.internal.builtin.OptionalIntThriftCodec;
3637
import com.facebook.drift.codec.internal.builtin.OptionalLongThriftCodec;
3738
import com.facebook.drift.codec.internal.builtin.OptionalThriftCodec;
@@ -186,6 +187,7 @@ public ThriftCodec<?> load(ThriftType type)
186187
addBuiltinCodec(new DoubleArrayThriftCodec());
187188
addBuiltinCodec(new FloatArrayThriftCodec());
188189
addBuiltinCodec(new OptionalDoubleThriftCodec());
190+
addBuiltinCodec(new OptionalFloatThriftCodec());
189191
addBuiltinCodec(new OptionalIntThriftCodec());
190192
addBuiltinCodec(new OptionalLongThriftCodec());
191193

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
1+
/*
2+
* Copyright (C) 2017 Facebook, Inc.
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package com.facebook.drift.codec.internal.builtin;
17+
18+
import com.facebook.drift.codec.ThriftCodec;
19+
import com.facebook.drift.codec.metadata.ThriftType;
20+
import com.facebook.drift.protocol.TProtocolReader;
21+
import com.facebook.drift.protocol.TProtocolWriter;
22+
23+
import javax.annotation.concurrent.Immutable;
24+
25+
import java.util.Optional;
26+
27+
import static java.util.Objects.requireNonNull;
28+
29+
@Immutable
30+
public class OptionalFloatThriftCodec
31+
implements ThriftCodec<Optional<Float>>
32+
{
33+
@Override
34+
public ThriftType getType()
35+
{
36+
return new ThriftType(ThriftType.FLOAT, Optional.class, Optional.empty());
37+
}
38+
39+
@Override
40+
public Optional<Float> read(TProtocolReader protocol)
41+
throws Exception
42+
{
43+
requireNonNull(protocol, "protocol is null");
44+
return Optional.of(protocol.readFloat());
45+
}
46+
47+
@Override
48+
public void write(Optional<Float> value, TProtocolWriter protocol)
49+
throws Exception
50+
{
51+
requireNonNull(value, "value is null");
52+
requireNonNull(protocol, "protocol is null");
53+
54+
// write can not be called with a missing value, and instead the write should be skipped
55+
// after check the result from isNull
56+
protocol.writeFloat(value.orElseThrow((() -> new IllegalArgumentException("value is not present"))));
57+
}
58+
59+
@Override
60+
public boolean isNull(Optional<Float> value)
61+
{
62+
return value == null || !value.isPresent();
63+
}
64+
}

drift-codec/src/main/java/com/facebook/drift/codec/internal/coercion/DefaultJavaCoercions.java

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,18 @@ public static long boxedLongToLong(Long value)
8686
return value;
8787
}
8888

89+
@FromThrift
90+
public static Float floatToBoxedFloat(float value)
91+
{
92+
return value;
93+
}
94+
95+
@ToThrift
96+
public static float boxedFloatToFloat(Float value)
97+
{
98+
return value;
99+
}
100+
89101
@FromThrift
90102
public static float doubleToPrimitiveFloat(double value)
91103
{

drift-codec/src/main/java/com/facebook/drift/codec/metadata/ThriftCatalog.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
import com.facebook.drift.annotations.ThriftUnion;
2222
import com.facebook.drift.codec.ThriftProtocolType;
2323
import com.facebook.drift.codec.internal.builtin.OptionalDoubleThriftCodec;
24+
import com.facebook.drift.codec.internal.builtin.OptionalFloatThriftCodec;
2425
import com.facebook.drift.codec.internal.builtin.OptionalIntThriftCodec;
2526
import com.facebook.drift.codec.internal.builtin.OptionalLongThriftCodec;
2627
import com.facebook.drift.codec.internal.coercion.DefaultJavaCoercions;
@@ -116,6 +117,7 @@ public ThriftCatalog(Monitor monitor)
116117
this.monitor = monitor;
117118
addDefaultCoercions(DefaultJavaCoercions.class);
118119
addThriftType(new OptionalDoubleThriftCodec().getType());
120+
addThriftType(new OptionalFloatThriftCodec().getType());
119121
addThriftType(new OptionalIntThriftCodec().getType());
120122
addThriftType(new OptionalLongThriftCodec().getType());
121123
}

0 commit comments

Comments
 (0)