kou commented on code in PR #34133: URL: https://github.com/apache/arrow/pull/34133#discussion_r1117982638
########## ci/scripts/csharp_test.sh: ########## @@ -21,6 +21,17 @@ set -ex source_dir=${1}/csharp +# Python and PyArrow are required for C Data Interface tests. +if [ -z "${PYTHON}" ]; then + if [ ! which python3 > /dev/null 2>&1 ]; then + export PYTHON=python + else + export PYTHON=python3 + fi Review Comment: How about simplifying this? ```suggestion if which python3 > /dev/null 2>&1; then export PYTHON=python3 else export PYTHON=python fi ``` BTW, `type` is more portable than `which`. ########## csharp/src/Apache.Arrow/C/CArrowSchema.cs: ########## @@ -0,0 +1,519 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + + +using System; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices; +using Apache.Arrow.Types; + +[UnmanagedFunctionPointer(CallingConvention.StdCall)] +public delegate void ReleaseCArrowSchema(IntPtr schema); + +namespace Apache.Arrow.C +{ + /// <summary> + /// An Arrow C Data Interface Schema, which represents a type, field, or schema. + /// </summary> + /// + /// <remarks> + /// This is used to export <see cref="ArrowType"/>, <see cref="Field"/>, or + /// <see cref="Schema"/> to other languages. It matches the layout of the + /// ArrowSchema struct described in https://github.com/apache/arrow/blob/main/cpp/src/arrow/c/abi.h. + /// </remarks> + [StructLayout(LayoutKind.Sequential)] + unsafe public struct CArrowSchema + { + [MarshalAs(UnmanagedType.LPStr)] + public string format; + [MarshalAs(UnmanagedType.LPStr)] + public string name; + [MarshalAs(UnmanagedType.LPStr)] + public string metadata; + public long flags; + public long n_children; + public IntPtr* children; + public IntPtr dictionary; + [MarshalAs(UnmanagedType.FunctionPtr)] + + public ReleaseCArrowSchema release; + // Check this out: https://github.com/G-Research/ParquetSharp/blob/386d91bd5e6fe6cb81583803447023c1359957c8/csharp/ParquetHandle.cs#L8 + public IntPtr private_data; + + private static string GetFormat(IArrowType datatype) + { + TypeFormatter formatter = new TypeFormatter(); + datatype.Accept(formatter); + return formatter.format_string; + } + + private static long GetFlags(IArrowType datatype, bool nullable = true) + { + long flags = 0; + + if (nullable) + { + flags |= ARROW_FLAG_NULLABLE; + } + + if (datatype is DictionaryType) + { + if (((DictionaryType)datatype).Ordered) + { + flags |= ARROW_FLAG_DICTIONARY_ORDERED; + } + } + + // TODO: when we implement MapType, make sure to set the KEYS_SORTED flag. + return flags; + } + + private static IntPtr* ConstructChildren(IArrowType datatype) + { + if (datatype is NestedType) + { + var fields = ((NestedType)datatype).Fields; + int n_fields = fields.Count; + + IntPtr* pointer_list = (IntPtr*)Marshal.AllocHGlobal(n_fields * sizeof(IntPtr)); + + for (var i = 0; i < n_fields; i++) + { + var c_schema = new CArrowSchema(); + CArrowSchema.ExportField(fields[i], out c_schema); + IntPtr exported_schema = c_schema.AllocateAsPtr(); + pointer_list[i] = exported_schema; + } + + return pointer_list; + } + else + { + return (IntPtr*)IntPtr.Zero; + } + } + + private static IntPtr ConstructDictionary(IArrowType datatype) + { + if (datatype is DictionaryType) + { + var c_schema = new CArrowSchema(); + var value_type = ((DictionaryType)datatype).ValueType; + CArrowSchema.ExportDataType(value_type, out c_schema); + return c_schema.AllocateAsPtr(); + } + else + { + return IntPtr.Zero; + } + } + + /// <summary> + /// Initialize the exported C schema as an Arrow type. + /// </summary> + /// <param name="datatype">The Arrow type to export.</param> + /// <param name="schema">An uninitialized CArrowSchema.</param> + public static void ExportDataType(IArrowType datatype, out CArrowSchema schema) + { + schema.format = GetFormat(datatype); + schema.name = null; + schema.metadata = null; + schema.flags = GetFlags(datatype); + + schema.children = ConstructChildren(datatype); + schema.n_children = datatype is NestedType ? ((NestedType)datatype).Fields.Count : 0; Review Comment: How about setting them at once in `ConstructChildren()` because they are related? ########## csharp/src/Apache.Arrow/C/CArrowSchema.cs: ########## @@ -0,0 +1,519 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + + +using System; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices; +using Apache.Arrow.Types; + +[UnmanagedFunctionPointer(CallingConvention.StdCall)] +public delegate void ReleaseCArrowSchema(IntPtr schema); + +namespace Apache.Arrow.C +{ + /// <summary> + /// An Arrow C Data Interface Schema, which represents a type, field, or schema. + /// </summary> + /// + /// <remarks> + /// This is used to export <see cref="ArrowType"/>, <see cref="Field"/>, or + /// <see cref="Schema"/> to other languages. It matches the layout of the + /// ArrowSchema struct described in https://github.com/apache/arrow/blob/main/cpp/src/arrow/c/abi.h. + /// </remarks> + [StructLayout(LayoutKind.Sequential)] + unsafe public struct CArrowSchema + { + [MarshalAs(UnmanagedType.LPStr)] + public string format; + [MarshalAs(UnmanagedType.LPStr)] + public string name; + [MarshalAs(UnmanagedType.LPStr)] + public string metadata; + public long flags; + public long n_children; + public IntPtr* children; + public IntPtr dictionary; + [MarshalAs(UnmanagedType.FunctionPtr)] + + public ReleaseCArrowSchema release; + // Check this out: https://github.com/G-Research/ParquetSharp/blob/386d91bd5e6fe6cb81583803447023c1359957c8/csharp/ParquetHandle.cs#L8 + public IntPtr private_data; + + private static string GetFormat(IArrowType datatype) + { + TypeFormatter formatter = new TypeFormatter(); + datatype.Accept(formatter); + return formatter.format_string; + } + + private static long GetFlags(IArrowType datatype, bool nullable = true) + { + long flags = 0; + + if (nullable) + { + flags |= ARROW_FLAG_NULLABLE; + } + + if (datatype is DictionaryType) + { + if (((DictionaryType)datatype).Ordered) + { + flags |= ARROW_FLAG_DICTIONARY_ORDERED; + } + } + + // TODO: when we implement MapType, make sure to set the KEYS_SORTED flag. + return flags; + } + + private static IntPtr* ConstructChildren(IArrowType datatype) + { + if (datatype is NestedType) + { + var fields = ((NestedType)datatype).Fields; + int n_fields = fields.Count; + + IntPtr* pointer_list = (IntPtr*)Marshal.AllocHGlobal(n_fields * sizeof(IntPtr)); + + for (var i = 0; i < n_fields; i++) + { + var c_schema = new CArrowSchema(); + CArrowSchema.ExportField(fields[i], out c_schema); + IntPtr exported_schema = c_schema.AllocateAsPtr(); + pointer_list[i] = exported_schema; + } + + return pointer_list; + } + else + { + return (IntPtr*)IntPtr.Zero; Review Comment: I'm not familiar with C# but is it safe? Is there `nullptr` in C#? ########## csharp/src/Apache.Arrow/C/CArrowSchema.cs: ########## @@ -0,0 +1,519 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + + +using System; +using System.IO; +using System.Linq; +using System.Runtime.InteropServices; +using Apache.Arrow.Types; + +[UnmanagedFunctionPointer(CallingConvention.StdCall)] +public delegate void ReleaseCArrowSchema(IntPtr schema); + +namespace Apache.Arrow.C +{ + /// <summary> + /// An Arrow C Data Interface Schema, which represents a type, field, or schema. + /// </summary> + /// + /// <remarks> + /// This is used to export <see cref="ArrowType"/>, <see cref="Field"/>, or + /// <see cref="Schema"/> to other languages. It matches the layout of the + /// ArrowSchema struct described in https://github.com/apache/arrow/blob/main/cpp/src/arrow/c/abi.h. + /// </remarks> + [StructLayout(LayoutKind.Sequential)] + unsafe public struct CArrowSchema + { + [MarshalAs(UnmanagedType.LPStr)] + public string format; + [MarshalAs(UnmanagedType.LPStr)] + public string name; + [MarshalAs(UnmanagedType.LPStr)] + public string metadata; + public long flags; + public long n_children; + public IntPtr* children; + public IntPtr dictionary; + [MarshalAs(UnmanagedType.FunctionPtr)] + + public ReleaseCArrowSchema release; + // Check this out: https://github.com/G-Research/ParquetSharp/blob/386d91bd5e6fe6cb81583803447023c1359957c8/csharp/ParquetHandle.cs#L8 + public IntPtr private_data; + + private static string GetFormat(IArrowType datatype) + { + TypeFormatter formatter = new TypeFormatter(); + datatype.Accept(formatter); + return formatter.format_string; + } + + private static long GetFlags(IArrowType datatype, bool nullable = true) + { + long flags = 0; + + if (nullable) + { + flags |= ARROW_FLAG_NULLABLE; + } + + if (datatype is DictionaryType) + { + if (((DictionaryType)datatype).Ordered) + { + flags |= ARROW_FLAG_DICTIONARY_ORDERED; + } + } + + // TODO: when we implement MapType, make sure to set the KEYS_SORTED flag. + return flags; + } + + private static IntPtr* ConstructChildren(IArrowType datatype) + { + if (datatype is NestedType) + { + var fields = ((NestedType)datatype).Fields; + int n_fields = fields.Count; + + IntPtr* pointer_list = (IntPtr*)Marshal.AllocHGlobal(n_fields * sizeof(IntPtr)); + + for (var i = 0; i < n_fields; i++) + { + var c_schema = new CArrowSchema(); + CArrowSchema.ExportField(fields[i], out c_schema); + IntPtr exported_schema = c_schema.AllocateAsPtr(); + pointer_list[i] = exported_schema; + } + + return pointer_list; + } + else + { + return (IntPtr*)IntPtr.Zero; + } + } + + private static IntPtr ConstructDictionary(IArrowType datatype) + { + if (datatype is DictionaryType) + { + var c_schema = new CArrowSchema(); + var value_type = ((DictionaryType)datatype).ValueType; + CArrowSchema.ExportDataType(value_type, out c_schema); + return c_schema.AllocateAsPtr(); + } + else + { + return IntPtr.Zero; + } + } + + /// <summary> + /// Initialize the exported C schema as an Arrow type. + /// </summary> + /// <param name="datatype">The Arrow type to export.</param> + /// <param name="schema">An uninitialized CArrowSchema.</param> + public static void ExportDataType(IArrowType datatype, out CArrowSchema schema) + { + schema.format = GetFormat(datatype); + schema.name = null; + schema.metadata = null; + schema.flags = GetFlags(datatype); + + schema.children = ConstructChildren(datatype); + schema.n_children = datatype is NestedType ? ((NestedType)datatype).Fields.Count : 0; + + schema.dictionary = ConstructDictionary(datatype); + + schema.release = (IntPtr self) => + { + var schema = Marshal.PtrToStructure<CArrowSchema>(self); + if (schema.n_children > 0) + { + for (int i = 0; i < schema.n_children; i++) + { + FreePtr(schema.children[i]); + } + Marshal.FreeHGlobal((IntPtr)schema.children); + } + + if (schema.dictionary != IntPtr.Zero) + { + FreePtr(schema.dictionary); + } + Marshal.DestroyStructure<CArrowSchema>(self); + }; + + schema.private_data = IntPtr.Zero; + } + + /// <summary> + /// Initialize the exported C schema as a field. + /// </summary> + /// <param name="field">Field to export.</param> + /// <param name="schema">An uninitialized CArrowSchema.</param> + public static void ExportField(Field field, out CArrowSchema schema) + { + ExportDataType(field.DataType, out schema); + schema.name = field.Name; + // TODO: field metadata + schema.metadata = null; + schema.flags = GetFlags(field.DataType, field.IsNullable); + } + + /// <summary> + /// Initialize the exported C schema as a schema. + /// </summary> + /// <param name="schema">Schema to export.</param> + /// <param name="out_schema">An uninitialized CArrowSchema</param> + public static void ExportSchema(Schema schema, out CArrowSchema out_schema) + { + // TODO: top-level metadata + var struct_type = new StructType(schema.Fields.Values.ToList()); + ExportDataType(struct_type, out out_schema); + } + + /// <summary> + /// Allocate an unmanaged pointer and copy this instances data to it. + /// </summary> + /// <remarks> + /// To avoid a memory leak, you must call <see cref="FreePtr"/> on this + /// pointer when done using it. + /// </remarks> + public IntPtr AllocateAsPtr() + { + IntPtr ptr = Marshal.AllocHGlobal(Marshal.SizeOf(this)); + Marshal.StructureToPtr<CArrowSchema>(this, ptr, false); + return ptr; + } + + /// <summary> + /// Free a pointer that was allocated in <see cref="AllocateAsPtr"/>. + /// </summary> + /// <remarks> + /// Do not call this on a pointer that was allocated elsewhere. + /// </remarks> + public static void FreePtr(IntPtr ptr) + { + var schema = Marshal.PtrToStructure<CArrowSchema>(ptr); + if (schema.release != null) + { + // Call release if not already called. + schema.release(ptr); + } + Marshal.FreeHGlobal(ptr); + } + + /// <summary> + /// Export to an existing pointer + /// </summary> + /// <param name="ptr"></param> + /// <returns></returns> Review Comment: Should we fill them? ########## csharp/test/Apache.Arrow.Tests/CDataInterfaceSchemaTests.cs: ########## @@ -0,0 +1,302 @@ +// Licensed to the Apache Software Foundation (ASF) under one or more +// contributor license agreements. See the NOTICE file distributed with +// this work for additional information regarding copyright ownership. +// The ASF licenses this file to You under the Apache License, Version 2.0 +// (the "License"); you may not use this file except in compliance with +// the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +using System; +using System.Collections; +using System.Collections.Generic; +using System.Linq; +using System.Runtime.InteropServices; +using Apache.Arrow.C; +using Apache.Arrow.Types; +using Python.Runtime; +using Xunit; + +namespace Apache.Arrow.Tests +{ + public class CDataSchemaTest + { + public CDataSchemaTest() + { + PythonEngine.Initialize(); + } + + public static Schema GetTestSchema() + { + // TODO: Add more types + using (Py.GIL()) + { + var schema = new Schema.Builder() + .Field(f => f.Name("null").DataType(NullType.Default).Nullable(true)) + .Field(f => f.Name("bool").DataType(BooleanType.Default).Nullable(true)) + .Field(f => f.Name("i8").DataType(Int8Type.Default).Nullable(true)) + .Field(f => f.Name("u8").DataType(UInt8Type.Default).Nullable(true)) + .Field(f => f.Name("i16").DataType(Int16Type.Default).Nullable(true)) + .Field(f => f.Name("u16").DataType(UInt16Type.Default).Nullable(true)) + .Field(f => f.Name("i32").DataType(Int32Type.Default).Nullable(true)) + .Field(f => f.Name("u32").DataType(UInt32Type.Default).Nullable(true)) + .Field(f => f.Name("i64").DataType(Int64Type.Default).Nullable(true)) + .Field(f => f.Name("u64").DataType(UInt64Type.Default).Nullable(true)) + + .Field(f => f.Name("f16").DataType(HalfFloatType.Default).Nullable(true)) + .Field(f => f.Name("f32").DataType(FloatType.Default).Nullable(true)) + .Field(f => f.Name("f64").DataType(DoubleType.Default).Nullable(true)) + + .Field(f => f.Name("binary").DataType(BinaryType.Default).Nullable(false)) + .Field(f => f.Name("string").DataType(StringType.Default).Nullable(false)) + + .Field(f => f.Name("date32").DataType(Date32Type.Default).Nullable(false)) + .Field(f => f.Name("date64").DataType(Date64Type.Default).Nullable(false)) + .Field(f => f.Name("time32_s").DataType(new Time32Type(TimeUnit.Second)).Nullable(false)) + .Field(f => f.Name("time32_ms").DataType(new Time32Type(TimeUnit.Millisecond)).Nullable(false)) + .Field(f => f.Name("time64_us").DataType(new Time64Type(TimeUnit.Microsecond)).Nullable(false)) + .Field(f => f.Name("time64_ns").DataType(new Time64Type(TimeUnit.Nanosecond)).Nullable(false)) + + .Field(f => f.Name("list_string").DataType(new ListType(StringType.Default)).Nullable(false)) + .Field(f => f.Name("list_list_i32").DataType(new ListType(new ListType(Int32Type.Default))).Nullable(false)) + + .Field(f => f.Name("dict_string").DataType(new DictionaryType(Int32Type.Default, StringType.Default, false)).Nullable(false)) + .Field(f => f.Name("dict_string_ordered").DataType(new DictionaryType(Int32Type.Default, StringType.Default, true)).Nullable(false)) + .Field(f => f.Name("list_dict_string").DataType(new ListType(new DictionaryType(Int32Type.Default, StringType.Default, false))).Nullable(false)) + + .Build(); + return schema; + } + } + + public static IEnumerable<dynamic> GetPythonFields() + { + using (Py.GIL()) + { + dynamic pa = Py.Import("pyarrow"); + yield return pa.field("null", pa.GetAttr("null").Invoke(), true); + yield return pa.field("bool", pa.bool_(), true); + yield return pa.field("i8", pa.int8(), true); + yield return pa.field("u8", pa.uint8(), true); + yield return pa.field("i16", pa.int16(), true); + yield return pa.field("u16", pa.uint16(), true); + yield return pa.field("i32", pa.int32(), true); + yield return pa.field("u32", pa.uint32(), true); + yield return pa.field("i64", pa.int64(), true); + yield return pa.field("u64", pa.uint64(), true); + + yield return pa.field("f16", pa.float16(), true); + yield return pa.field("f32", pa.float32(), true); + yield return pa.field("f64", pa.float64(), true); + + yield return pa.field("binary", pa.binary(), false); + yield return pa.field("string", pa.utf8(), false); + + yield return pa.field("date32", pa.date32(), false); + yield return pa.field("date64", pa.date64(), false); + yield return pa.field("time32_s", pa.time32("s"), false); + yield return pa.field("time32_ms", pa.time32("ms"), false); + yield return pa.field("time64_us", pa.time64("us"), false); + yield return pa.field("time64_ns", pa.time64("ns"), false); + + yield return pa.field("list_string", pa.list_(pa.utf8()), false); + yield return pa.field("list_list_i32", pa.list_(pa.list_(pa.int32())), false); + + yield return pa.field("dict_string", pa.dictionary(pa.int32(), pa.utf8(), false), false); + yield return pa.field("dict_string_ordered", pa.dictionary(pa.int32(), pa.utf8(), true), false); + yield return pa.field("list_dict_string", pa.list_(pa.dictionary(pa.int32(), pa.utf8(), false)), false); + } + } + + public static dynamic GetPythonSchema() + { + using (Py.GIL()) + { + dynamic pa = Py.Import("pyarrow"); + return pa.schema(GetPythonFields().ToList()); + } + } + + // Schemas created in Python, used in CSharp + [Fact] + public void ImportType() + { + PythonEngine.Initialize(); + Schema schema = GetTestSchema(); + IEnumerable<dynamic> py_fields = GetPythonFields(); + + foreach ((Field field, dynamic py_field) in schema.Fields.Values.AsEnumerable() + .Zip(py_fields)) + { + var c_schema = new CArrowSchema(); + IntPtr imported_ptr = c_schema.AllocateAsPtr(); + + using (Py.GIL()) + { + dynamic py_datatype = py_field.type; + py_datatype._export_to_c(imported_ptr.ToInt64()); + } + + var dataTypeComparer = new ArrayTypeComparer(field.DataType); + var imported_type = new ImportedArrowSchema(imported_ptr); Review Comment: How about using the same naming convention? (`camelCase` v.s. `snake_case`) -- 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: github-unsubscr...@arrow.apache.org For queries about this service, please contact Infrastructure at: us...@infra.apache.org