[Python] Add type mapping for NPY_LONGLONG

wesm · wesm · commit d41078ce20ea · 2016-04-07T12:11:41.000-07:00
Closes #79 Author: Wes McKinney <wesm@apache.org> Closes #107 from wesm/bug/numpy-long-long and squashes the following commits: 109ab60 [Wes McKinney] Add type mapping for NPY_LONGLONG
diff --git a/python/feather/interop.h b/python/feather/interop.h
@@ -47,25 +47,28 @@ struct npy_traits<NPY_BOOL> {
   }
 };
 
-#define NPY_INT_DECL(TYPE, T)                                           \
+#define NPY_INT_DECL(TYPE, FTYPE, T)                                    \
   template <>                                                           \
   struct npy_traits<NPY_##TYPE> {                                       \
     typedef T value_type;                                               \
-    static constexpr PrimitiveType::type feather_type = PrimitiveType::TYPE; \
+    static constexpr PrimitiveType::type feather_type = PrimitiveType::FTYPE; \
     static constexpr bool supports_nulls = false;                       \
     static inline bool isnull(T v) {                                    \
       return false;                                                     \
     }                                                                   \
   };
 
-NPY_INT_DECL(INT8, int8_t);
-NPY_INT_DECL(INT16, int16_t);
-NPY_INT_DECL(INT32, int32_t);
-NPY_INT_DECL(INT64, int64_t);
-NPY_INT_DECL(UINT8, uint8_t);
-NPY_INT_DECL(UINT16, uint16_t);
-NPY_INT_DECL(UINT32, uint32_t);
-NPY_INT_DECL(UINT64, uint64_t);
+NPY_INT_DECL(INT8, INT8, int8_t);
+NPY_INT_DECL(INT16, INT16, int16_t);
+NPY_INT_DECL(INT32, INT32, int32_t);
+NPY_INT_DECL(INT64, INT64, int64_t);
+NPY_INT_DECL(LONGLONG, INT64, int64_t);
+
+NPY_INT_DECL(UINT8, UINT8, uint8_t);
+NPY_INT_DECL(UINT16, UINT16, uint16_t);
+NPY_INT_DECL(UINT32, UINT32, uint32_t);
+NPY_INT_DECL(UINT64, UINT64, uint64_t);
+NPY_INT_DECL(ULONGLONG, UINT64, uint64_t);
 
 template <>
 struct npy_traits<NPY_FLOAT32> {
@@ -414,10 +417,12 @@ Status pandas_masked_to_primitive(PyObject* ao, PyObject* mo,
     TO_FEATHER_CASE(INT16);
     TO_FEATHER_CASE(INT32);
     TO_FEATHER_CASE(INT64);
+    TO_FEATHER_CASE(LONGLONG);
     TO_FEATHER_CASE(UINT8);
     TO_FEATHER_CASE(UINT16);
     TO_FEATHER_CASE(UINT32);
     TO_FEATHER_CASE(UINT64);
+    TO_FEATHER_CASE(ULONGLONG);
     TO_FEATHER_CASE(FLOAT32);
     TO_FEATHER_CASE(FLOAT64);
     TO_FEATHER_CASE(OBJECT);
diff --git a/python/feather/tests/test_reader.py b/python/feather/tests/test_reader.py
@@ -116,7 +116,8 @@ def test_float_nulls(self):
     def test_integer_no_nulls(self):
         data = {}
 
-        numpy_dtypes = ['i1', 'i2', 'i4', 'i8', 'u1', 'u2', 'u4', 'u8']
+        numpy_dtypes = ['i1', 'i2', 'i4', 'i8',
+                        'u1', 'u2', 'u4', 'u8']
         num_values = 100
 
         for dtype in numpy_dtypes:
@@ -129,6 +130,19 @@ def test_integer_no_nulls(self):
         df = pd.DataFrame(data)
         self._check_pandas_roundtrip(df)
 
+    def test_platform_numpy_integers(self):
+        data = {}
+
+        numpy_dtypes = ['longlong']
+        num_values = 100
+
+        for dtype in numpy_dtypes:
+            values = np.random.randint(0, 100, size=num_values)
+            data[dtype] = values.astype(dtype)
+
+        df = pd.DataFrame(data)
+        self._check_pandas_roundtrip(df)
+
     def test_integer_with_nulls(self):
         # pandas requires upcast to float dtype
         path = random_path()
