Repository: parquet-cpp Updated Branches: refs/heads/master 305aaccaf -> e22a5cd34
PARQUET-930: Add timestamp[us] to schema test Author: Korn, Uwe <[email protected]> Closes #321 from xhochy/PARQUET-930 and squashes the following commits: 4e25f37 [Korn, Uwe] PARQUET-930: Add timestamp[us] to schema test Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/e22a5cd3 Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/e22a5cd3 Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/e22a5cd3 Branch: refs/heads/master Commit: e22a5cd34d072a6acd2e3ef41b7913172f96d712 Parents: 305aacc Author: Korn, Uwe <[email protected]> Authored: Fri May 12 14:56:43 2017 +0200 Committer: Uwe L. Korn <[email protected]> Committed: Fri May 12 14:56:43 2017 +0200 ---------------------------------------------------------------------- src/parquet/arrow/arrow-schema-test.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/e22a5cd3/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 @@ TEST_F(TestConvertArrowSchema, ParquetFlatPrimitives) { 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));
