added float thrift codec

Author: divyatalesra-2001

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

@@ -23,6 +23,8 @@
 import com.facebook.drift.codec.internal.builtin.ByteThriftCodec;
 import com.facebook.drift.codec.internal.builtin.DoubleArrayThriftCodec;
 import com.facebook.drift.codec.internal.builtin.DoubleThriftCodec;
+import com.facebook.drift.codec.internal.builtin.FloatArrayThriftCodec;
+import com.facebook.drift.codec.internal.builtin.FloatThriftCodec;
 import com.facebook.drift.codec.internal.builtin.IntArrayThriftCodec;
 import com.facebook.drift.codec.internal.builtin.IntegerThriftCodec;
 import com.facebook.drift.codec.internal.builtin.ListThriftCodec;
@@ -172,6 +174,7 @@ public ThriftCodec<?> load(ThriftType type)
         addBuiltinCodec(new IntegerThriftCodec());
         addBuiltinCodec(new LongThriftCodec());
         addBuiltinCodec(new DoubleThriftCodec());
+        addBuiltinCodec(new FloatThriftCodec());
         addBuiltinCodec(new ByteBufferThriftCodec());
         addBuiltinCodec(new StringThriftCodec());
         addBuiltinCodec(new VoidThriftCodec());
@@ -181,6 +184,7 @@ public ThriftCodec<?> load(ThriftType type)
         addBuiltinCodec(new IntArrayThriftCodec());
         addBuiltinCodec(new LongArrayThriftCodec());
         addBuiltinCodec(new DoubleArrayThriftCodec());
+        addBuiltinCodec(new FloatArrayThriftCodec());
         addBuiltinCodec(new OptionalDoubleThriftCodec());
         addBuiltinCodec(new OptionalIntThriftCodec());
         addBuiltinCodec(new OptionalLongThriftCodec());

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

@@ -23,6 +23,7 @@ public enum ThriftProtocolType
     BOOL(TType.BOOL),
     BYTE(TType.BYTE),
     DOUBLE(TType.DOUBLE),
+    FLOAT(TType.FLOAT),
     I16(TType.I16),
     I32(TType.I32),
     I64(TType.I64),

drift-codec/src/main/java/com/facebook/drift/codec/internal/ProtocolReader.java

@@ -175,6 +175,18 @@ public double readDoubleField()
         return fieldValue;
     }
 
+    public float readFloatField()
+            throws TException
+    {
+        if (!checkReadState(TType.FLOAT)) {
+            return 0;
+        }
+        currentField = null;
+        float fieldValue = protocol.readFloat();
+        protocol.readFieldEnd();
+        return fieldValue;
+    }
+
     public short readI16Field()
             throws TException
     {
@@ -295,6 +307,18 @@ public double[] readDoubleArrayField()
         return fieldValue;
     }
 
+    public float[] readFloatArrayField()
+            throws TException
+    {
+        if (!checkReadState(TType.LIST)) {
+            return null;
+        }
+        currentField = null;
+        float[] fieldValue = readFloatArray();
+        protocol.readFieldEnd();
+        return fieldValue;
+    }
+
     public <E> Set<E> readSetField(ThriftCodec<Set<E>> setCodec)
             throws Exception
     {
@@ -391,6 +415,12 @@ public double readDouble()
         return protocol.readDouble();
     }
 
+    public float readFloat()
+            throws TException
+    {
+        return protocol.readFloat();
+    }
+
     public String readString()
             throws TException
     {
@@ -457,6 +487,18 @@ public double[] readDoubleArray()
         return array;
     }
 
+    public float[] readFloatArray()
+            throws TException
+    {
+        TList list = protocol.readListBegin();
+        float[] array = new float[list.getSize()];
+        for (int i = 0; i < list.getSize(); i++) {
+            array[i] = readFloat();
+        }
+        protocol.readListEnd();
+        return array;
+    }
+
     public <E> Set<E> readSet(ThriftCodec<E> elementCodec)
             throws Exception
     {

drift-codec/src/main/java/com/facebook/drift/codec/internal/ProtocolWriter.java

@@ -102,6 +102,14 @@ public void writeDoubleField(String name, short id, double dub)
         protocol.writeFieldEnd();
     }
 
+    public void writeFloatField(String name, short id, float f)
+            throws TException
+    {
+        protocol.writeFieldBegin(new TField(name, TType.FLOAT, id));
+        protocol.writeFloat(f);
+        protocol.writeFieldEnd();
+    }
+
     public void writeI16Field(String name, short id, short i16)
             throws TException
     {
@@ -210,6 +218,18 @@ public void writeDoubleArrayField(String name, short id, double[] array)
         protocol.writeFieldEnd();
     }
 
+    public void writeFloatArrayField(String name, short id, float[] array)
+            throws Exception
+    {
+        if (array == null) {
+            return;
+        }
+
+        protocol.writeFieldBegin(new TField(name, TType.LIST, id));
+        writeFloatArray(array);
+        protocol.writeFieldEnd();
+    }
+
     public <E> void writeSetField(String name, short id, ThriftCodec<Set<E>> codec, Set<E> set)
             throws Exception
     {
@@ -303,6 +323,12 @@ public void writeDouble(double dub)
         protocol.writeDouble(dub);
     }
 
+    public void writeFloat(float f)
+            throws TException
+    {
+        protocol.writeFloat(f);
+    }
+
     public void writeString(String string)
             throws TException
     {
@@ -362,6 +388,16 @@ public void writeDoubleArray(double[] array)
         protocol.writeListEnd();
     }
 
+    public void writeFloatArray(float[] array)
+            throws TException
+    {
+        protocol.writeListBegin(new TList(TType.FLOAT, array.length));
+        for (float floatValue : array) {
+            writeFloat(floatValue);
+        }
+        protocol.writeListEnd();
+    }
+
     public <T> void writeSet(ThriftCodec<T> elementCodec, Set<T> set)
             throws Exception
     {

drift-codec/src/main/java/com/facebook/drift/codec/internal/builtin/FloatArrayThriftCodec.java

@@ -0,0 +1,55 @@
+/*
+ * Copyright (C) 2014 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.facebook.drift.codec.internal.builtin;
+
+import com.facebook.drift.codec.ThriftCodec;
+import com.facebook.drift.codec.internal.ProtocolReader;
+import com.facebook.drift.codec.internal.ProtocolWriter;
+import com.facebook.drift.codec.metadata.ThriftType;
+import com.facebook.drift.protocol.TProtocolReader;
+import com.facebook.drift.protocol.TProtocolWriter;
+
+import javax.annotation.concurrent.Immutable;
+
+import static java.util.Objects.requireNonNull;
+
+@Immutable
+public class FloatArrayThriftCodec
+        implements ThriftCodec<float[]>
+{
+    @Override
+    public ThriftType getType()
+    {
+        return ThriftType.array(ThriftType.FLOAT);
+    }
+
+    @Override
+    public float[] read(TProtocolReader protocol)
+            throws Exception
+    {
+        requireNonNull(protocol, "protocol is null");
+        return new ProtocolReader(protocol).readFloatArray();
+    }
+
+    @Override
+    public void write(float[] value, TProtocolWriter protocol)
+            throws Exception
+    {
+        requireNonNull(value, "value is null");
+        requireNonNull(protocol, "protocol is null");
+        new ProtocolWriter(protocol).writeFloatArray(value);
+    }
+}

drift-codec/src/main/java/com/facebook/drift/codec/internal/builtin/FloatThriftCodec.java

@@ -0,0 +1,53 @@
+/*
+ * Copyright (C) 2012 Facebook, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.facebook.drift.codec.internal.builtin;
+
+import com.facebook.drift.codec.ThriftCodec;
+import com.facebook.drift.codec.metadata.ThriftType;
+import com.facebook.drift.protocol.TProtocolReader;
+import com.facebook.drift.protocol.TProtocolWriter;
+
+import javax.annotation.concurrent.Immutable;
+
+import static java.util.Objects.requireNonNull;
+
+@Immutable
+public class FloatThriftCodec
+        implements ThriftCodec<Float>
+{
+    @Override
+    public ThriftType getType()
+    {
+        return ThriftType.FLOAT;
+    }
+
+    @Override
+    public Float read(TProtocolReader protocol)
+            throws Exception
+    {
+        requireNonNull(protocol, "protocol is null");
+        return protocol.readFloat();
+    }
+
+    @Override
+    public void write(Float value, TProtocolWriter protocol)
+            throws Exception
+    {
+        requireNonNull(value, "value is null");
+        requireNonNull(protocol, "protocol is null");
+        protocol.writeFloat(value);
+    }
+}

drift-codec/src/main/java/com/facebook/drift/codec/internal/compiler/ThriftCodecByteCodeGenerator.java

@@ -101,6 +101,7 @@
 import static com.facebook.drift.codec.ThriftProtocolType.BYTE;
 import static com.facebook.drift.codec.ThriftProtocolType.DOUBLE;
 import static com.facebook.drift.codec.ThriftProtocolType.ENUM;
+import static com.facebook.drift.codec.ThriftProtocolType.FLOAT;
 import static com.facebook.drift.codec.ThriftProtocolType.I16;
 import static com.facebook.drift.codec.ThriftProtocolType.I32;
 import static com.facebook.drift.codec.ThriftProtocolType.I64;
@@ -1108,6 +1109,7 @@ public static ParameterizedType toParameterizedType(ThriftTypeReference typeRef)
             case BOOL:
             case BYTE:
             case DOUBLE:
+            case FLOAT:
             case I16:
             case I32:
             case I64:
@@ -1157,6 +1159,7 @@ private Method getReadMethod(ThriftType thriftType)
             writeBuilder.put(BOOL, ProtocolWriter.class.getMethod("writeBoolField", String.class, short.class, boolean.class));
             writeBuilder.put(BYTE, ProtocolWriter.class.getMethod("writeByteField", String.class, short.class, byte.class));
             writeBuilder.put(DOUBLE, ProtocolWriter.class.getMethod("writeDoubleField", String.class, short.class, double.class));
+            writeBuilder.put(FLOAT, ProtocolWriter.class.getMethod("writeFloatField", String.class, short.class, float.class));
             writeBuilder.put(I16, ProtocolWriter.class.getMethod("writeI16Field", String.class, short.class, short.class));
             writeBuilder.put(I32, ProtocolWriter.class.getMethod("writeI32Field", String.class, short.class, int.class));
             writeBuilder.put(I64, ProtocolWriter.class.getMethod("writeI64Field", String.class, short.class, long.class));
@@ -1171,6 +1174,7 @@ private Method getReadMethod(ThriftType thriftType)
             readBuilder.put(BOOL, ProtocolReader.class.getMethod("readBoolField"));
             readBuilder.put(BYTE, ProtocolReader.class.getMethod("readByteField"));
             readBuilder.put(DOUBLE, ProtocolReader.class.getMethod("readDoubleField"));
+            readBuilder.put(FLOAT, ProtocolReader.class.getMethod("readFloatField"));
             readBuilder.put(I16, ProtocolReader.class.getMethod("readI16Field"));
             readBuilder.put(I32, ProtocolReader.class.getMethod("readI32Field"));
             readBuilder.put(I64, ProtocolReader.class.getMethod("readI64Field"));
@@ -1197,12 +1201,14 @@ private Method getReadMethod(ThriftType thriftType)
             arrayWriteBuilder.put(int[].class, ProtocolWriter.class.getMethod("writeI32ArrayField", String.class, short.class, int[].class));
             arrayWriteBuilder.put(long[].class, ProtocolWriter.class.getMethod("writeI64ArrayField", String.class, short.class, long[].class));
             arrayWriteBuilder.put(double[].class, ProtocolWriter.class.getMethod("writeDoubleArrayField", String.class, short.class, double[].class));
+            arrayWriteBuilder.put(float[].class, ProtocolWriter.class.getMethod("writeFloatArrayField", String.class, short.class, float[].class));
 
             arrayReadBuilder.put(boolean[].class, ProtocolReader.class.getMethod("readBoolArrayField"));
             arrayReadBuilder.put(short[].class, ProtocolReader.class.getMethod("readI16ArrayField"));
             arrayReadBuilder.put(int[].class, ProtocolReader.class.getMethod("readI32ArrayField"));
             arrayReadBuilder.put(long[].class, ProtocolReader.class.getMethod("readI64ArrayField"));
             arrayReadBuilder.put(double[].class, ProtocolReader.class.getMethod("readDoubleArrayField"));
+            arrayReadBuilder.put(float[].class, ProtocolReader.class.getMethod("readFloatArrayField"));
 
             // byte[] is encoded as BINARY which should use the normal rules above, but it
             // simpler to add explicit handling here

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

@@ -59,6 +59,7 @@
 import static com.facebook.drift.codec.metadata.ThriftType.BOOL;
 import static com.facebook.drift.codec.metadata.ThriftType.BYTE;
 import static com.facebook.drift.codec.metadata.ThriftType.DOUBLE;
+import static com.facebook.drift.codec.metadata.ThriftType.FLOAT;
 import static com.facebook.drift.codec.metadata.ThriftType.I16;
 import static com.facebook.drift.codec.metadata.ThriftType.I32;
 import static com.facebook.drift.codec.metadata.ThriftType.I64;
@@ -282,6 +283,9 @@ private ThriftType buildThriftTypeInternal(Type javaType)
         if (double.class == rawType) {
             return DOUBLE;
         }
+        if (float.class == rawType) {
+            return FLOAT;
+        }
         if (String.class == rawType) {
             return STRING;
         }
@@ -462,6 +466,9 @@ public ThriftProtocolType getThriftProtocolType(Type javaType)
         if (double.class == rawType) {
             return ThriftProtocolType.DOUBLE;
         }
+        if (float.class == rawType) {
+            return ThriftProtocolType.FLOAT;
+        }
         if (String.class == rawType) {
             return ThriftProtocolType.STRING;
         }
@@ -529,7 +536,8 @@ public boolean isSupportedArrayComponentType(Class<?> componentType)
                 short.class == componentType ||
                 int.class == componentType ||
                 long.class == componentType ||
-                double.class == componentType;
+                double.class == componentType ||
+                float.class == componentType;
     }
 
     /**

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

@@ -42,6 +42,7 @@ public class ThriftType
     public static final ThriftType BOOL = new ThriftType(ThriftProtocolType.BOOL, boolean.class);
     public static final ThriftType BYTE = new ThriftType(ThriftProtocolType.BYTE, byte.class);
     public static final ThriftType DOUBLE = new ThriftType(ThriftProtocolType.DOUBLE, double.class);
+    public static final ThriftType FLOAT = new ThriftType(ThriftProtocolType.FLOAT, float.class);
     public static final ThriftType I16 = new ThriftType(ThriftProtocolType.I16, short.class);
     public static final ThriftType I32 = new ThriftType(ThriftProtocolType.I32, int.class);
     public static final ThriftType I64 = new ThriftType(ThriftProtocolType.I64, long.class);
@@ -52,6 +53,7 @@ public class ThriftType
     public static final ThriftTypeReference BOOL_REF = new DefaultThriftTypeReference(BOOL);
     public static final ThriftTypeReference BYTE_REF = new DefaultThriftTypeReference(BYTE);
     public static final ThriftTypeReference DOUBLE_REF = new DefaultThriftTypeReference(DOUBLE);
+    public static final ThriftTypeReference FLOAT_REF = new DefaultThriftTypeReference(FLOAT);
     public static final ThriftTypeReference I16_REF = new DefaultThriftTypeReference(I16);
     public static final ThriftTypeReference I32_REF = new DefaultThriftTypeReference(I32);
     public static final ThriftTypeReference I64_REF = new DefaultThriftTypeReference(I64);