-
Notifications
You must be signed in to change notification settings - Fork 41
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
feat: Check flags field of ArrowSchema on ArrowSchemaViewInit #368
Merged
+51
−12
Merged
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -574,6 +574,24 @@ TEST(SchemaViewTest, SchemaViewInitErrors) { | |
EXPECT_STREQ(ArrowErrorMessage(&error), | ||
"Error parsing schema->format 'n*': parsed 1/2 characters"); | ||
|
||
ASSERT_EQ(ArrowSchemaSetFormat(&schema, "n"), NANOARROW_OK); | ||
schema.flags = 0; | ||
schema.flags |= ARROW_FLAG_DICTIONARY_ORDERED; | ||
EXPECT_EQ(ArrowSchemaViewInit(&schema_view, &schema, &error), EINVAL); | ||
EXPECT_STREQ(ArrowErrorMessage(&error), | ||
"ARROW_FLAG_DICTIONARY_ORDERED is only relevant for dictionaries"); | ||
|
||
schema.flags = 0; | ||
schema.flags |= ARROW_FLAG_MAP_KEYS_SORTED; | ||
EXPECT_EQ(ArrowSchemaViewInit(&schema_view, &schema, &error), EINVAL); | ||
EXPECT_STREQ(ArrowErrorMessage(&error), | ||
"ARROW_FLAG_MAP_KEYS_SORTED is only relevant for a map type"); | ||
|
||
schema.flags = 0; | ||
schema.flags |= (ARROW_FLAG_MAP_KEYS_SORTED << 1); | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We could use the new macro/define here to guarantee we always get an undefined value. |
||
EXPECT_EQ(ArrowSchemaViewInit(&schema_view, &schema, &error), EINVAL); | ||
EXPECT_STREQ(ArrowErrorMessage(&error), "Unknown ArrowSchema flag"); | ||
|
||
ArrowSchemaRelease(&schema); | ||
} | ||
|
||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Would this be better as a macro or #define that is defined next to these other #defines? From a maintenance perspective, I'm mainly considering what happens if someone adds a new flag and forgets to update this part of the code.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great idea!