mirrors/arrow
0
0 Fork 0
mirror of https://github.com/apache/arrow.git synced 2026-10-29 09:05:47 +08:00
Code Activity

Move to type_singleton

Browse Source
This commit is contained in:
Korn, Uwe authored and Uwe L. Korn committed 2019-02-14 18:31:41 +01:00
1 parent 30e66f9eae
commit 1ab23f875a
1 file changed
+4 -4
Download Patch File Download Diff File Expand all files Collapse all files
cpp/src/arrow/stl.h
+4 -4
View File
@@ -77,7 +77,7 @@ struct ConversionTraits<std::string> : public CTypeTraits<std::string> {
};
template <typename value_c_type>
struct ConversionTraits<std::vector<value_c_type>> : public CTypeTraits<std::vector<CType>> {
struct ConversionTraits<std::vector<value_c_type>> : public CTypeTraits<std::vector<value_c_type>> {
static Status AppendRow(ListBuilder& builder, std::vector<value_c_type> cell) {
using ElementBuilderType = typename TypeTraits<
typename ConversionTraits<value_c_type>::ArrowType>::BuilderType;
@@ -157,7 +157,7 @@ struct SchemaFromTuple {
std::vector<std::shared_ptr<Field>> ret =
SchemaFromTuple<Tuple, N - 1>::MakeSchemaRecursionT(names);
std::shared_ptr<DataType> type = ConversionTraits<Element>::arrow_type();
std::shared_ptr<DataType> type = ConversionTraits<Element>::type_singleton();
ret.push_back(field(get<N - 1>(names), type, ConversionTraits<Element>::nullable));
return ret;
}
@@ -202,7 +202,7 @@ struct CreateBuildersRecursive {
static Status Make(MemoryPool* pool,
std::vector<std::unique_ptr<ArrayBuilder>>* builders) {
using Element = typename std::tuple_element<N - 1, Tuple>::type;
std::shared_ptr<DataType> type = ConversionTraits<Element>::arrow_type();
std::shared_ptr<DataType> type = ConversionTraits<Element>::type_singleton();
ARROW_RETURN_NOT_OK(MakeBuilder(pool, type, &builders->at(N - 1)));
return CreateBuildersRecursive<Tuple, N - 1>::Make(pool, builders);
@@ -247,7 +247,7 @@ struct EnsureColumnTypes {
compute::FunctionContext* ctx,
std::reference_wrapper<const ::arrow::Table>* result) {
using Element = typename std::tuple_element<N - 1, Tuple>::type;
std::shared_ptr<DataType> expected_type = ConversionTraits<Element>::arrow_type();
std::shared_ptr<DataType> expected_type = ConversionTraits<Element>::type_singleton();
if (!table.schema()->field(N - 1)->type()->Equals(*expected_type)) {
compute::Datum casted;