Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ARROW-6435: [Python] Use pandas null coding consistently on List and Struct types #5302

Closed
wants to merge 5 commits into from

Conversation

wesm
Copy link
Member

@wesm wesm commented Sep 5, 2019

also fixes ARROW-6434

@@ -626,8 +644,82 @@ class ListConverter : public TypedConverter<TypeClass, ListConverter<TypeClass>>
}

template <int NUMPY_TYPE, typename Type>
Status AppendNdarrayTypedItem(PyArrayObject* arr);
Status AppendNdarrayItem(PyObject* arr);
Status AppendNdarrayTypedItem(PyArrayObject* arr) {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved code. Unchanged

#define LIST_SLOW_CASE(TYPE) \
case Type::TYPE: { \
return value_converter_->AppendMultiple(obj, value_length); \
}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Moved code

template <typename TypeClass, NullCoding null_coding>
class ListConverter
: public TypedConverter<TypeClass, ListConverter<TypeClass, null_coding>,
null_coding> {
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Relevant changes

} else {
*out = std::unique_ptr<SeqConverter>(
new StructConverter<NullCoding::NONE_ONLY>(from_pandas, strict_conversions));
}
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Relevant changes

@wesm
Copy link
Member Author

wesm commented Sep 6, 2019

There's another failure here, that separately came up in #5299. I'll add some tests and close #5299

@wesm
Copy link
Member Author

wesm commented Sep 6, 2019

OK, the Dask integration tests are passing again. Checking HDFS

@wesm
Copy link
Member Author

wesm commented Sep 6, 2019

OK, HDFS docker-compose job passing also now

@kszucs
Copy link
Member

kszucs commented Sep 6, 2019

@ursabot crossbow test docker-hdfs-integration docker-dask-integration

@ursabot
Copy link

ursabot commented Sep 6, 2019

AMD64 Conda Crossbow (#59368) builder has been succeeded.

Revision: 68b8443

Submitted crossbow builds: ursa-labs/crossbow @ ursabot-150

Task Status
docker-dask-integration CircleCI
docker-hdfs-integration CircleCI

@kszucs
Copy link
Member

kszucs commented Sep 6, 2019

@ursabot crossbow test docker-hdfs-integration

@ursabot
Copy link

ursabot commented Sep 6, 2019

AMD64 Conda Crossbow (#59373) builder has been succeeded.

Revision: 68b8443

Submitted crossbow builds: ursa-labs/crossbow @ ursabot-155

Task Status
docker-hdfs-integration CircleCI

@kszucs
Copy link
Member

kszucs commented Sep 6, 2019

The HDFS build was cancelled, don't know why.

@wesm
Copy link
Member Author

wesm commented Sep 6, 2019

Rebased this and fixed the conflict from #5299 (which should not have been merged)

@wesm
Copy link
Member Author

wesm commented Sep 6, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants