arrow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject arrow git commit: ARROW-200: [C++/Python] Return error status on string initialization failure
Date Wed, 08 Jun 2016 18:23:14 GMT
Repository: arrow
Updated Branches:
  refs/heads/master 9ce13a067 -> bc6c4c88f


ARROW-200: [C++/Python] Return error status on string initialization failure

Author: Micah Kornfield <emkornfield@gmail.com>

Closes #88 from emkornfield/emk_arrow_200 and squashes the following commits:

37e23be [Micah Kornfield] ARROW-200: Return error status on string initialization failure


Project: http://git-wip-us.apache.org/repos/asf/arrow/repo
Commit: http://git-wip-us.apache.org/repos/asf/arrow/commit/bc6c4c88
Tree: http://git-wip-us.apache.org/repos/asf/arrow/tree/bc6c4c88
Diff: http://git-wip-us.apache.org/repos/asf/arrow/diff/bc6c4c88

Branch: refs/heads/master
Commit: bc6c4c88fb4bfd1d99e71c8043f0ba0ca5544ae2
Parents: 9ce13a0
Author: Micah Kornfield <emkornfield@gmail.com>
Authored: Wed Jun 8 11:23:07 2016 -0700
Committer: Wes McKinney <wesm@apache.org>
Committed: Wed Jun 8 11:23:07 2016 -0700

----------------------------------------------------------------------
 python/src/pyarrow/adapters/pandas.cc | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/bc6c4c88/python/src/pyarrow/adapters/pandas.cc
----------------------------------------------------------------------
diff --git a/python/src/pyarrow/adapters/pandas.cc b/python/src/pyarrow/adapters/pandas.cc
index 5159d86..8dcc2b1 100644
--- a/python/src/pyarrow/adapters/pandas.cc
+++ b/python/src/pyarrow/adapters/pandas.cc
@@ -669,7 +669,7 @@ class ArrowDeserializer {
 
           out_values[i] = make_pystring(data, length);
           if (out_values[i] == nullptr) {
-            return Status::OK();
+            return Status::UnknownError("String initialization failed");
           }
         }
       }
@@ -678,7 +678,7 @@ class ArrowDeserializer {
         data = string_arr->GetValue(i, &length);
         out_values[i] = make_pystring(data, length);
         if (out_values[i] == nullptr) {
-          return Status::OK();
+          return Status::UnknownError("String initialization failed");
         }
       }
     }


Mime
View raw message