Add Status::ToString impls. Unit test stub

apache · Mar 7, 2016 · 3a774fb · 3a774fb
1 parent 4e206fc
commit 3a774fb
Show file tree

Hide file tree

Showing 4 changed files with 100 additions and 0 deletions.
diff --git a/cpp/src/arrow/util/status.cc b/cpp/src/arrow/util/status.cc
@@ -35,4 +35,44 @@ const char* Status::CopyState(const char* state) {
   return result;
 }
 
+std::string Status::CodeAsString() const {
+  if (state_ == NULL) {
+    return "OK";
+  }
+
+  const char* type;
+  switch (code()) {
+    case StatusCode::OK:
+      type = "OK";
+      break;
+    case StatusCode::OutOfMemory:
+      type = "Out of memory";
+      break;
+    case StatusCode::KeyError:
+      type = "Key error";
+      break;
+    case StatusCode::Invalid:
+      type = "Invalid";
+      break;
+    case StatusCode::NotImplemented:
+      type = "NotImplemented";
+      break;
+  }
+  return std::string(type);
+}
+
+std::string Status::ToString() const {
+  std::string result(CodeAsString());
+  if (state_ == NULL) {
+    return result;
+  }
+
+  result.append(": ");
+
+  uint32_t length;
+  memcpy(&length, state_, sizeof(length));
+  result.append(reinterpret_cast<const char*>(state_ + 7), length);
+  return result;
+}
+
 } // namespace arrow
diff --git a/python/arrow/__init__.py b/python/arrow/__init__.py
@@ -17,6 +17,7 @@
 
 # flake8: noqa
 
+from arrow.array import Array, from_list
 from arrow.schema import (bool_, int8, int16, int32, int64,
                           uint8, uint16, uint32, uint64,
                           float_, double, string,

diff --git a/python/arrow/array.pyx b/python/arrow/array.pyx
@@ -30,6 +30,11 @@ cdef class Array:
     cdef init(self, const shared_ptr[CArray]& sp_array):
         self.sp_array = sp_array
 
+    property null_count:
+
+        def __get__(self):
+            return self.sp_array.get().null_count()
+
     def __len__(self):
         return self.array.length()
 

diff --git a/python/src/pyarrow/status.cc b/python/src/pyarrow/status.cc
@@ -13,6 +13,8 @@
 #include "pyarrow/status.h"
 
 #include <assert.h>
+#include <cstdint>
+#include <cstring>
 
 namespace pyarrow {
 
@@ -35,4 +37,56 @@ const char* Status::CopyState(const char* state) {
   return result;
 }
 
+std::string Status::CodeAsString() const {
+  if (state_ == NULL) {
+    return "OK";
+  }
+
+  const char* type;
+  switch (code()) {
+    case StatusCode::OK:
+      type = "OK";
+      break;
+    case StatusCode::OutOfMemory:
+      type = "Out of memory";
+      break;
+    case StatusCode::KeyError:
+      type = "Key error";
+      break;
+    case StatusCode::TypeError:
+      type = "Value error";
+      break;
+    case StatusCode::ValueError:
+      type = "Value error";
+      break;
+    case StatusCode::IOError:
+      type = "IO error";
+      break;
+    case StatusCode::NotImplemented:
+      type = "Not implemented";
+      break;
+    case StatusCode::ArrowError:
+      type = "Arrow C++ error";
+      break;
+    case StatusCode::UnknownError:
+      type = "Unknown error";
+      break;
+  }
+  return std::string(type);
+}
+
+std::string Status::ToString() const {
+  std::string result(CodeAsString());
+  if (state_ == NULL) {
+    return result;
+  }
+
+  result.append(": ");
+
+  uint32_t length;
+  memcpy(&length, state_, sizeof(length));
+  result.append(reinterpret_cast<const char*>(state_ + 7), length);
+  return result;
+}
+
 } // namespace pyarrow