Remove inheritance from ArrowSupport classes

Author: horakivo

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/nodes/arrow/vector/VectorToArrowArrayNode.java

@@ -62,10 +62,9 @@ public abstract class VectorToArrowArrayNode extends PNodeWithContext {
 
     public abstract ArrowArray execute(Node inliningTarget, Object vector);
 
-    @Specialization(guards = "arrowVectorSupport.isFixedWidthVector(vector)")
+    @Specialization(guards = "ctx.arrowVectorSupport.isFixedWidthVector(vector)")
     static ArrowArray doIntVector(Node inliningTarget, Object vector,
                     @Bind("getContext(inliningTarget)") PythonContext ctx,
-                    @Bind("ctx.arrowVectorSupport") ArrowVectorSupport arrowVectorSupport,
                     @CachedLibrary(limit = "3") InteropLibrary interopLib) {
         var snapshot = new ArrowArray.Snapshot();
         var unsafe = ctx.getUnsafe();

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/arrow/ArrowSupport.java

@@ -43,16 +43,26 @@
 import com.oracle.graal.python.nodes.arrow.capsule.ArrowArrayCapsuleDestructor;
 import com.oracle.graal.python.nodes.arrow.capsule.ArrowSchemaCapsuleDestructor;
 import com.oracle.graal.python.nodes.arrow.release_callback.ArrowSchemaReleaseCallback;
+import com.oracle.graal.python.nodes.arrow.vector.VectorArrowArrayReleaseCallback;
 import com.oracle.graal.python.runtime.PythonContext;
 import com.oracle.graal.python.util.PythonUtils;
 import com.oracle.truffle.api.CompilerAsserts;
 import com.oracle.truffle.api.CompilerDirectives;
 import com.oracle.truffle.api.CompilerDirectives.CompilationFinal;
 import com.oracle.truffle.api.CompilerDirectives.TruffleBoundary;
 import com.oracle.truffle.api.interop.InteropLibrary;
+import com.oracle.truffle.api.source.Source;
 import com.oracle.truffle.nfi.api.SignatureLibrary;
 
-public class ArrowSupport extends AbstractArrowSupport {
+import static com.oracle.graal.python.nodes.StringLiterals.J_NFI_LANGUAGE;
+
+public class ArrowSupport {
+
+    protected final PythonContext ctx;
+
+    public ArrowSupport(PythonContext ctx) {
+        this.ctx = ctx;
+    }
 
     // ArrowArray destructor
     private Object arrowArrayDestructorNFIClosure;
@@ -66,10 +76,6 @@ public class ArrowSupport extends AbstractArrowSupport {
     private Object arrowSchemaNFIClosure;
     @CompilationFinal private long arrowSchemaReleaseCallback;
 
-    public ArrowSupport(PythonContext ctx) {
-        super(ctx);
-    }
-
     public long getArrowSchemaDestructor() {
         if (arrowSchemaDestructorCallback == 0) {
             CompilerDirectives.transferToInterpreterAndInvalidate();
@@ -97,7 +103,7 @@ public long getArrowSchemaReleaseCallback() {
     @TruffleBoundary
     private void initArrowArrayDestructor() {
         CompilerAsserts.neverPartOfCompilation();
-        var signature = createNfiSignature("(POINTER):VOID");
+        var signature = ArrowUtil.createNfiSignature("(POINTER):VOID", ctx);
         var executable = new ArrowArrayCapsuleDestructor();
         this.arrowArrayDestructorNFIClosure = SignatureLibrary.getUncached().createClosure(signature, executable);
         this.arrowArrayDestructor = PythonUtils.coerceToLong(arrowArrayDestructorNFIClosure, InteropLibrary.getUncached());
@@ -106,7 +112,7 @@ private void initArrowArrayDestructor() {
     @TruffleBoundary
     private void initArrowSchemaDestructor() {
         CompilerAsserts.neverPartOfCompilation();
-        var signature = createNfiSignature("(POINTER):VOID");
+        var signature = ArrowUtil.createNfiSignature("(POINTER):VOID", ctx);
         var executable = new ArrowSchemaCapsuleDestructor();
         this.arrowSchemaDestructorNFIClosure = SignatureLibrary.getUncached().createClosure(signature, executable);
         this.arrowSchemaDestructorCallback = PythonUtils.coerceToLong(arrowSchemaDestructorNFIClosure, InteropLibrary.getUncached());
@@ -115,7 +121,7 @@ private void initArrowSchemaDestructor() {
     @TruffleBoundary
     private void initArrowSchemaReleaseCallback() {
         CompilerAsserts.neverPartOfCompilation();
-        var signature = createNfiSignature("(UINT64):VOID");
+        var signature = ArrowUtil.createNfiSignature("(UINT64):VOID", ctx);
         var executable = new ArrowSchemaReleaseCallback();
         this.arrowSchemaNFIClosure = SignatureLibrary.getUncached().createClosure(signature, executable);
         this.arrowSchemaReleaseCallback = PythonUtils.coerceToLong(arrowSchemaNFIClosure, InteropLibrary.getUncached());

…/runtime/arrow/AbstractArrowSupport.java …raal/python/runtime/arrow/ArrowUtil.javagraalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/arrow/AbstractArrowSupport.java renamed to graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/arrow/ArrowUtil.java graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/arrow/AbstractArrowSupport.java renamed to graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/arrow/ArrowUtil.java

@@ -45,15 +45,9 @@
 
 import static com.oracle.graal.python.nodes.StringLiterals.J_NFI_LANGUAGE;
 
-public class AbstractArrowSupport {
+public class ArrowUtil {
 
-    protected final PythonContext ctx;
-
-    public AbstractArrowSupport(PythonContext ctx) {
-        this.ctx = ctx;
-    }
-
-    protected Object createNfiSignature(String methodSignature) {
+    public static Object createNfiSignature(String methodSignature, PythonContext ctx) {
         Source sigSource = Source.newBuilder(J_NFI_LANGUAGE, methodSignature, "python-nfi-signature").build();
         return ctx.getEnv().parseInternal(sigSource).call();
     }

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/arrow/ArrowVectorSupport.java

@@ -50,18 +50,19 @@
 import com.oracle.truffle.api.interop.InteropLibrary;
 import com.oracle.truffle.nfi.api.SignatureLibrary;
 
-public class ArrowVectorSupport extends AbstractArrowSupport {
+public class ArrowVectorSupport {
 
     private final String FIXED_WIDTH_VECTOR_PATH = "org.apache.arrow.vector.BaseFixedWidthVector";
 
     public final boolean isJavaArrowImplOnClassPath;
     public final Class<?> baseFixedWidthVectorClass;
+    private final PythonContext ctx;
 
     private Object vectorArrowArrayNFIClosure;
     @CompilationFinal private long vectorArrowArrayReleaseCallback;
 
     public ArrowVectorSupport(PythonContext ctx) {
-        super(ctx);
+        this.ctx = ctx;
         Class<?> baseFixedWidthVectorClass;
         try {
             baseFixedWidthVectorClass = Class.forName(FIXED_WIDTH_VECTOR_PATH);
@@ -88,7 +89,7 @@ public boolean isFixedWidthVector(Object vector) {
     @TruffleBoundary
     private void initVectorArrowArrayReleaseCallback() {
         CompilerAsserts.neverPartOfCompilation();
-        var signature = createNfiSignature("(UINT64):VOID");
+        var signature = ArrowUtil.createNfiSignature("(UINT64):VOID", ctx);
         var executable = new VectorArrowArrayReleaseCallback();
         this.vectorArrowArrayNFIClosure = SignatureLibrary.getUncached().createClosure(signature, executable);
         this.vectorArrowArrayReleaseCallback = PythonUtils.coerceToLong(vectorArrowArrayNFIClosure, InteropLibrary.getUncached());

graalpython/lib-graalpython/_polyglot.py

@@ -143,6 +143,16 @@ def _struct_time_tz(st: time.struct_time):
                                    is_time_zone=lambda t: t.tm_zone is not None or t.tm_gmtoff is not None,
                                    as_time_zone=_struct_time_tz)
 
+# loading arrow structures on demand
+def __getattr__(name):
+    if name == "arrow":
+        from modules import _polyglot_arrow
+        setattr(polyglot, "arrow", _polyglot_arrow)
+        return _polyglot_arrow
+    raise AttributeError(f"module 'polyglot' has no attribute '{name}'")
+
+setattr(polyglot, "__getattr__", __getattr__)
+
 # example extending time.struct_time using the decorator wrapper
 #
 # @polyglot.interop_behavior(time.struct_time)

…lib-graalpython/modules/interop/arrow.py …b-graalpython/modules/_polyglot_arrow.pygraalpython/lib-graalpython/modules/interop/arrow.py renamed to graalpython/lib-graalpython/modules/_polyglot_arrow.py graalpython/lib-graalpython/modules/interop/arrow.py renamed to graalpython/lib-graalpython/modules/_polyglot_arrow.py

@@ -40,7 +40,6 @@
 import polyglot
 import java
 
-
 try:
     java.type("org.apache.arrow.vector.BaseFixedWidthVector")
 except KeyError: