commit e22a5cd34d072a6acd2e3ef41b7913172f96d712
author Korn, Uwe <Uwe.Korn@blue-yonder.com> Fri May 12 14:56:43 2017 +0200
committer Uwe L. Korn <uwe@apache.org> Fri May 12 14:56:43 2017 +0200
tree 3ad6cbe869eaf9d1f41207a934a7aea690b5654a
parent 305aaccaffd0571ddfee194ae958820bbbd2f140

PARQUET-930: Add timestamp[us] to schema test

Author: Korn, Uwe <Uwe.Korn@blue-yonder.com>

Closes #321 from xhochy/PARQUET-930 and squashes the following commits:

4e25f37 [Korn, Uwe] PARQUET-930: Add timestamp[us] to schema test

src/parquet/arrow/arrow-schema-test.cc

diff --git a/src/parquet/arrow/arrow-schema-test.cc b/src/parquet/arrow/arrow-schema-test.cc
index b56646e..a3d98bf 100644
--- a/src/parquet/arrow/arrow-schema-test.cc
+++ b/src/parquet/arrow/arrow-schema-test.cc
@@ -623,9 +623,9 @@
       ParquetType::INT64, LogicalType::TIMESTAMP_MILLIS));
   arrow_fields.push_back(std::make_shared<Field>("timestamp", TIMESTAMP_MS, false));
 
-  // parquet_fields.push_back(PrimitiveNode::Make("timestamp", Repetition::REQUIRED,
-  //     ParquetType::INT64, LogicalType::TIMESTAMP_MICROS));
-  // arrow_fields.push_back(std::make_shared<Field>("timestamp", TIMESTAMP_US, false));
+  parquet_fields.push_back(PrimitiveNode::Make("timestamp[us]", Repetition::REQUIRED,
+      ParquetType::INT64, LogicalType::TIMESTAMP_MICROS));
+  arrow_fields.push_back(std::make_shared<Field>("timestamp[us]", TIMESTAMP_US, false));
 
   parquet_fields.push_back(
       PrimitiveNode::Make("float", Repetition::OPTIONAL, ParquetType::FLOAT));