arrow-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From u..@apache.org
Subject arrow git commit: ARROW-1070: [C++] Use physical types for Feather date/time types
Date Sat, 03 Jun 2017 15:14:43 GMT
Repository: arrow
Updated Branches:
  refs/heads/master 0576ff55c -> 931a87757


ARROW-1070: [C++] Use physical types for Feather date/time types

This fixes a regression from Feather 0.3.1. Closes https://github.com/wesm/feather/issues/304

Author: Wes McKinney <wes.mckinney@twosigma.com>

Closes #725 from wesm/ARROW-1070 and squashes the following commits:

fe1a5ba [Wes McKinney] Use physical types for date/time types


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

Branch: refs/heads/master
Commit: 931a877570928486f5471f9850c38d68c1e18617
Parents: 0576ff5
Author: Wes McKinney <wes.mckinney@twosigma.com>
Authored: Sat Jun 3 17:14:36 2017 +0200
Committer: Uwe L. Korn <uwelk@xhochy.com>
Committed: Sat Jun 3 17:14:36 2017 +0200

----------------------------------------------------------------------
 cpp/src/arrow/ipc/feather.cc | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/arrow/blob/931a8775/cpp/src/arrow/ipc/feather.cc
----------------------------------------------------------------------
diff --git a/cpp/src/arrow/ipc/feather.cc b/cpp/src/arrow/ipc/feather.cc
index 7d0abdd..023e7ec 100644
--- a/cpp/src/arrow/ipc/feather.cc
+++ b/cpp/src/arrow/ipc/feather.cc
@@ -37,6 +37,7 @@
 #include "arrow/status.h"
 #include "arrow/table.h"
 #include "arrow/util/bit-util.h"
+#include "arrow/util/logging.h"
 
 namespace arrow {
 namespace ipc {
@@ -467,16 +468,15 @@ fbs::Type ToFlatbufferType(Type::type type) {
     case Type::BINARY:
       return fbs::Type_BINARY;
     case Type::DATE32:
-      return fbs::Type_DATE;
+      return fbs::Type_INT32;
     case Type::TIMESTAMP:
-      return fbs::Type_TIMESTAMP;
+      return fbs::Type_INT64;
     case Type::TIME32:
-      return fbs::Type_TIME;
+      return fbs::Type_INT32;
     case Type::TIME64:
-      return fbs::Type_TIME;
-    case Type::DICTIONARY:
-      return fbs::Type_CATEGORY;
+      return fbs::Type_INT64;
     default:
+      DCHECK(false) << "Cannot reach this code";
       break;
   }
   // prevent compiler warning


Mime
View raw message