[
https://issues.apache.org/jira/browse/PARQUET-1168?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel=16277329#comment-16277329
]
ASF GitHub Bot commented on PARQUET-1168:
-
cpcloud closed pull request #422: PARQUET-1168: [C++] Table::Make no longer
exists in Arrow
URL: https://github.com/apache/parquet-cpp/pull/422
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/src/parquet/arrow/arrow-reader-writer-benchmark.cc
b/src/parquet/arrow/arrow-reader-writer-benchmark.cc
index edeef1ed..4efb62ed 100644
--- a/src/parquet/arrow/arrow-reader-writer-benchmark.cc
+++ b/src/parquet/arrow/arrow-reader-writer-benchmark.cc
@@ -114,7 +114,7 @@ std::shared_ptr<::arrow::Table> TableFromVector(
auto field = ::arrow::field("column", type, nullable);
auto schema = ::arrow::schema({field});
auto column = std::make_shared<::arrow::Column>(field, array);
- return ::arrow::Table::Make(schema, {column});
+ return std::make_shared<::arrow::Table>(schema,
std::vector{column});
}
template <>
@@ -137,7 +137,7 @@ std::shared_ptr<::arrow::Table>
TableFromVector(const std::vector(
std::vector>({field}));
auto column = std::make_shared<::arrow::Column>(field, array);
- return ::arrow::Table::Make(schema, {column});
+ return std::make_shared<::arrow::Table>(schema,
std::vector{column});
}
template
diff --git a/src/parquet/arrow/arrow-reader-writer-test.cc
b/src/parquet/arrow/arrow-reader-writer-test.cc
index a8d38241..25e639fd 100644
--- a/src/parquet/arrow/arrow-reader-writer-test.cc
+++ b/src/parquet/arrow/arrow-reader-writer-test.cc
@@ -1145,7 +1145,7 @@ void MakeDateTimeTypesTable(std::shared_ptr* out,
bool nanos_as_micros =
std::make_shared("f0", a0), std::make_shared("f1", a1),
std::make_shared("f2", a2), std::make_shared("f3", a3),
std::make_shared("f4", a4), std::make_shared("f5", a5)};
- *out = Table::Make(schema, columns);
+ *out = std::make_shared<::arrow::Table>(schema, columns);
}
TEST(TestArrowReadWrite, DateTimeTypes) {
@@ -1196,30 +1196,29 @@ TEST(TestArrowReadWrite, CoerceTimestamps) {
ArrayFromVector<::arrow::TimestampType, int64_t>(t_ns, is_valid, ns_values,
_ns);
// Input table, all data as is
- auto s1 = std::shared_ptr<::arrow::Schema>(
- new ::arrow::Schema({field("f_s", t_s), field("f_ms", t_ms),
field("f_us", t_us),
- field("f_ns", t_ns)}));
- auto input = Table::Make(
+ auto s1 = ::arrow::schema(
+ {field("f_s", t_s), field("f_ms", t_ms), field("f_us", t_us),
field("f_ns", t_ns)});
+ auto input = std::make_shared<::arrow::Table>(
s1,
- {std::make_shared("f_s", a_s), std::make_shared("f_ms",
a_ms),
+ ColumnVector{std::make_shared("f_s", a_s),
std::make_shared("f_ms", a_ms),
std::make_shared("f_us", a_us),
std::make_shared("f_ns", a_ns)});
// Result when coercing to milliseconds
- auto s2 = std::shared_ptr<::arrow::Schema>(
- new ::arrow::Schema({field("f_s", t_ms), field("f_ms", t_ms),
field("f_us", t_ms),
- field("f_ns", t_ms)}));
- auto ex_milli_result = Table::Make(
+ auto s2 = ::arrow::schema(
+ {field("f_s", t_ms), field("f_ms", t_ms), field("f_us", t_ms),
+ field("f_ns", t_ms)});
+ auto ex_milli_result = std::make_shared<::arrow::Table>(
s2,
- {std::make_shared("f_s", a_ms), std::make_shared("f_ms",
a_ms),
+ ColumnVector{std::make_shared("f_s", a_ms),
std::make_shared("f_ms", a_ms),
std::make_shared("f_us", a_ms),
std::make_shared("f_ns", a_ms)});
// Result when coercing to microseconds
- auto s3 = std::shared_ptr<::arrow::Schema>(
- new ::arrow::Schema({field("f_s", t_us), field("f_ms", t_us),
field("f_us", t_us),
- field("f_ns", t_us)}));
- auto ex_micro_result = Table::Make(
+ auto s3 = ::arrow::schema(
+ {field("f_s", t_us), field("f_ms", t_us), field("f_us", t_us),
+ field("f_ns", t_us)});
+ auto ex_micro_result = std::make_shared<::arrow::Table>(
s3,
- {std::make_shared("f_s", a_us), std::make_shared("f_ms",
a_us),
+ ColumnVector{std::make_shared("f_s", a_us),
std::make_shared("f_ms", a_us),
std::make_shared("f_us", a_us),
std::make_shared("f_ns", a_us)});
std::shared_ptr milli_result;
@@ -1263,20 +1262,20 @@ TEST(TestArrowReadWrite, CoerceTimestampsLosePrecision)
{
ArrayFromVector<::arrow::TimestampType, int64_t>(t_us, is_valid, us_values,
_us);
ArrayFromVector<::arrow::TimestampType, int64_t>(t_ns, is_valid, ns_values,
_ns);
- auto s1 = std::shared_ptr<::arrow::Schema>(new
