pitrou commented on code in PR #321:
URL: https://github.com/apache/arrow-nanoarrow/pull/321#discussion_r1403597770
##########
src/nanoarrow/nanoarrow_testing_test.cc:
##########
@@ -288,3 +306,300 @@ TEST(NanoarrowTestingTest, NanoarrowTestingTestBatch) {
[](ArrowArray* array) { return NANOARROW_OK; }, &WriteBatchJSON,
R"({"count": 0, "columns": []})");
}
+
+TEST(NanoarrowTestingTest, NanoarrowTestingTestSchema) {
+ // Zero fields
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ ArrowSchemaInit(schema);
+ NANOARROW_RETURN_NOT_OK(ArrowSchemaSetTypeStruct(schema, 0));
+ return NANOARROW_OK;
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteSchemaJSON,
+ R"({"fields": [], "metadata": null})");
+
+ // More than zero fields
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ ArrowSchemaInit(schema);
+ NANOARROW_RETURN_NOT_OK(ArrowSchemaSetTypeStruct(schema, 2));
+ NANOARROW_RETURN_NOT_OK(
+ ArrowSchemaSetType(schema->children[0], NANOARROW_TYPE_NA));
+ NANOARROW_RETURN_NOT_OK(
+ ArrowSchemaSetType(schema->children[1], NANOARROW_TYPE_STRING));
+ return NANOARROW_OK;
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteSchemaJSON,
+ R"({"fields": [)"
+ R"({"name": null, "nullable": true, "type": {"name": "null"},
"children": [], "metadata": null}, )"
+ R"({"name": null, "nullable": true, "type": {"name": "utf8"},
"children": [], "metadata": null}], )"
+ R"("metadata": null})");
+}
+
+TEST(NanoarrowTestingTest, NanoarrowTestingTestFieldBasic) {
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ NANOARROW_RETURN_NOT_OK(ArrowSchemaInitFromType(schema,
NANOARROW_TYPE_NA));
+ return NANOARROW_OK;
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteFieldJSON,
+ R"({"name": null, "nullable": true, "type": {"name": "null"},
"children": [], "metadata": null})");
+
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ NANOARROW_RETURN_NOT_OK(ArrowSchemaInitFromType(schema,
NANOARROW_TYPE_NA));
+ schema->flags = 0;
+ return NANOARROW_OK;
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteFieldJSON,
+ R"({"name": null, "nullable": false, "type": {"name": "null"},
"children": [], "metadata": null})");
+
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ NANOARROW_RETURN_NOT_OK(ArrowSchemaInitFromType(schema,
NANOARROW_TYPE_NA));
+ NANOARROW_RETURN_NOT_OK(ArrowSchemaSetName(schema, "colname"));
+ return NANOARROW_OK;
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteFieldJSON,
+ R"({"name": "colname", "nullable": true, "type": {"name": "null"},
"children": [], "metadata": null})");
+}
+
+TEST(NanoarrowTestingTest, NanoarrowTestingTestFieldMetadata) {
+ // Non-null but zero-size metadata
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ NANOARROW_RETURN_NOT_OK(ArrowSchemaInitFromType(schema,
NANOARROW_TYPE_NA));
+ NANOARROW_RETURN_NOT_OK(ArrowSchemaSetMetadata(schema, "\0\0\0\0"));
+ return NANOARROW_OK;
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteFieldJSON,
+ R"({"name": null, "nullable": true, "type": {"name": "null"},
"children": [], "metadata": []})");
+
+ // Non-zero size metadata
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ nanoarrow::UniqueBuffer buffer;
+ NANOARROW_RETURN_NOT_OK(ArrowMetadataBuilderInit(buffer.get(),
nullptr));
+ NANOARROW_RETURN_NOT_OK(ArrowMetadataBuilderAppend(
+ buffer.get(), ArrowCharView("k1"), ArrowCharView("v1")));
+ NANOARROW_RETURN_NOT_OK(ArrowMetadataBuilderAppend(
+ buffer.get(), ArrowCharView("k2"), ArrowCharView("v2")));
+
+ NANOARROW_RETURN_NOT_OK(ArrowSchemaInitFromType(schema,
NANOARROW_TYPE_NA));
+ NANOARROW_RETURN_NOT_OK(
+ ArrowSchemaSetMetadata(schema, reinterpret_cast<const
char*>(buffer->data)));
+ return NANOARROW_OK;
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteFieldJSON,
+ R"({"name": null, "nullable": true, "type": {"name": "null"},
"children": [], )"
+ R"("metadata": [{"key": "k1", "value": "v1"}, {"key": "k2", "value":
"v2"}]})");
+}
+
+TEST(NanoarrowTestingTest, NanoarrowTestingTestFieldNested) {
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ ArrowSchemaInit(schema);
+ NANOARROW_RETURN_NOT_OK(ArrowSchemaSetTypeStruct(schema, 2));
+ NANOARROW_RETURN_NOT_OK(
+ ArrowSchemaSetType(schema->children[0], NANOARROW_TYPE_NA));
+ NANOARROW_RETURN_NOT_OK(
+ ArrowSchemaSetType(schema->children[1], NANOARROW_TYPE_STRING));
+ return NANOARROW_OK;
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteFieldJSON,
+ R"({"name": null, "nullable": true, "type": {"name": "struct"},
"children": [)"
+ R"({"name": null, "nullable": true, "type": {"name": "null"},
"children": [], "metadata": null}, )"
+ R"({"name": null, "nullable": true, "type": {"name": "utf8"},
"children": [], "metadata": null}], )"
+ R"("metadata": null})");
+}
+
+TEST(NanoarrowTestingTest, NanoarrowTestingTestTypePrimitive) {
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ return ArrowSchemaInitFromType(schema, NANOARROW_TYPE_NA);
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteTypeJSON,
+ R"({"name": "null"})");
+
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ return ArrowSchemaInitFromType(schema, NANOARROW_TYPE_BOOL);
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteTypeJSON,
+ R"({"name": "bool"})");
+
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ return ArrowSchemaInitFromType(schema, NANOARROW_TYPE_INT8);
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteTypeJSON,
+ R"({"name": "int", "bitWidth": 8, "isSigned": true})");
+
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ return ArrowSchemaInitFromType(schema, NANOARROW_TYPE_UINT8);
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteTypeJSON,
+ R"({"name": "int", "bitWidth": 8, "isSigned": false})");
+
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ return ArrowSchemaInitFromType(schema, NANOARROW_TYPE_HALF_FLOAT);
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteTypeJSON,
+ R"({"name": "floatingpoint", "precision": "HALF"})");
+
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ return ArrowSchemaInitFromType(schema, NANOARROW_TYPE_FLOAT);
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteTypeJSON,
+ R"({"name": "floatingpoint", "precision": "SINGLE"})");
+
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ return ArrowSchemaInitFromType(schema, NANOARROW_TYPE_DOUBLE);
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteTypeJSON,
+ R"({"name": "floatingpoint", "precision": "DOUBLE"})");
+
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ return ArrowSchemaInitFromType(schema, NANOARROW_TYPE_STRING);
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteTypeJSON,
+ R"({"name": "utf8"})");
+
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ return ArrowSchemaInitFromType(schema, NANOARROW_TYPE_LARGE_STRING);
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteTypeJSON,
+ R"({"name": "largeutf8"})");
+
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ return ArrowSchemaInitFromType(schema, NANOARROW_TYPE_BINARY);
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteTypeJSON,
+ R"({"name": "binary"})");
+
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ return ArrowSchemaInitFromType(schema, NANOARROW_TYPE_LARGE_BINARY);
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteTypeJSON,
+ R"({"name": "largebinary"})");
+}
+
+TEST(NanoarrowTestingTest, NanoarrowTestingTestTypeParameterized) {
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ ArrowSchemaInit(schema);
+ NANOARROW_RETURN_NOT_OK(
+ ArrowSchemaSetTypeFixedSize(schema,
NANOARROW_TYPE_FIXED_SIZE_BINARY, 123));
+ return NANOARROW_OK;
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteTypeJSON,
+ R"({"name": "fixedsizebinary", "byteWidth": 123})");
+
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ ArrowSchemaInit(schema);
+ NANOARROW_RETURN_NOT_OK(
+ ArrowSchemaSetTypeDecimal(schema, NANOARROW_TYPE_DECIMAL128, 10,
3));
+ return NANOARROW_OK;
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteTypeJSON,
+ R"({"name": "decimal", "bitWidth": 128, "precision": 10, "scale": 3})");
+
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ ArrowSchemaInit(schema);
+ NANOARROW_RETURN_NOT_OK(ArrowSchemaSetTypeStruct(schema, 0));
+ return NANOARROW_OK;
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteTypeJSON,
+ R"({"name": "struct"})");
+
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ ArrowSchemaInit(schema);
+ NANOARROW_RETURN_NOT_OK(ArrowSchemaSetType(schema,
NANOARROW_TYPE_LIST));
+ NANOARROW_RETURN_NOT_OK(
+ ArrowSchemaSetType(schema->children[0], NANOARROW_TYPE_INT32));
+ return NANOARROW_OK;
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteTypeJSON,
+ R"({"name": "list"})");
+
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ ArrowSchemaInit(schema);
+ NANOARROW_RETURN_NOT_OK(ArrowSchemaSetType(schema,
NANOARROW_TYPE_MAP));
+ NANOARROW_RETURN_NOT_OK(
+ ArrowSchemaSetType(schema->children[0]->children[0],
NANOARROW_TYPE_STRING));
+ NANOARROW_RETURN_NOT_OK(
+ ArrowSchemaSetType(schema->children[0]->children[1],
NANOARROW_TYPE_INT32));
+ return NANOARROW_OK;
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteTypeJSON,
+ R"({"name": "map", "keysSorted": false})");
+
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ ArrowSchemaInit(schema);
+ NANOARROW_RETURN_NOT_OK(ArrowSchemaSetType(schema,
NANOARROW_TYPE_MAP));
+ NANOARROW_RETURN_NOT_OK(
+ ArrowSchemaSetType(schema->children[0]->children[0],
NANOARROW_TYPE_STRING));
+ NANOARROW_RETURN_NOT_OK(
+ ArrowSchemaSetType(schema->children[0]->children[1],
NANOARROW_TYPE_INT32));
+ schema->flags = ARROW_FLAG_MAP_KEYS_SORTED;
+ return NANOARROW_OK;
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteTypeJSON,
+ R"({"name": "map", "keysSorted": true})");
+
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ ArrowSchemaInit(schema);
+ NANOARROW_RETURN_NOT_OK(ArrowSchemaSetType(schema,
NANOARROW_TYPE_LARGE_LIST));
+ NANOARROW_RETURN_NOT_OK(
+ ArrowSchemaSetType(schema->children[0], NANOARROW_TYPE_INT32));
+ return NANOARROW_OK;
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteTypeJSON,
+ R"({"name": "largelist"})");
+
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ ArrowSchemaInit(schema);
+ NANOARROW_RETURN_NOT_OK(
+ ArrowSchemaSetTypeFixedSize(schema,
NANOARROW_TYPE_FIXED_SIZE_LIST, 12));
+ NANOARROW_RETURN_NOT_OK(
+ ArrowSchemaSetType(schema->children[0], NANOARROW_TYPE_INT32));
+ return NANOARROW_OK;
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteTypeJSON,
+ R"({"name": "fixedsizelist", "listSize": 12})");
+
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ ArrowSchemaInit(schema);
+ NANOARROW_RETURN_NOT_OK(
+ ArrowSchemaSetTypeUnion(schema, NANOARROW_TYPE_SPARSE_UNION, 0));
+ return NANOARROW_OK;
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteTypeJSON,
+ R"({"name": "union", "mode": "SPARSE", "typeIds": []})");
+
+ TestWriteJSON(
+ [](ArrowSchema* schema) {
+ ArrowSchemaInit(schema);
+ NANOARROW_RETURN_NOT_OK(
+ ArrowSchemaSetTypeUnion(schema, NANOARROW_TYPE_DENSE_UNION, 0));
+ return NANOARROW_OK;
+ },
+ [](ArrowArray* array) { return NANOARROW_OK; }, &WriteTypeJSON,
+ R"({"name": "union", "mode": "DENSE", "typeIds": []})");
Review Comment:
Should perhaps test with some child fields and type ids?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
