Changing how polyglot_arrow is resolved

Author: horakivo

graalpython/com.oracle.graal.python.frozen/freeze_modules.py

@@ -102,6 +102,7 @@
 def add_graalpython_core():
     lib_graalpython = os.path.join(os.path.dirname(__file__), "..", "lib-graalpython")
     l = []
+    l.append("polyglot.arrow : polyglot.arrow = " + os.path.join(lib_graalpython, "modules/_polyglot_arrow.py"))
     for name in [
         "modules/_sysconfigdata",
     ]:

graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/module/FrozenModules.java

@@ -216,6 +216,7 @@ private static final class Map {
         private static final PythonFrozenModule __PHELLO___HAM_EGGS = new PythonFrozenModule("__PHELLO___HAM_EGGS", "__phello__.ham.eggs", false);
         private static final PythonFrozenModule __PHELLO___SPAM = new PythonFrozenModule("__PHELLO___SPAM", "__phello__.spam", false);
         private static final PythonFrozenModule FROZEN_ONLY = new PythonFrozenModule("FROZEN_ONLY", null, false);
+        private static final PythonFrozenModule POLYGLOT_ARROW = new PythonFrozenModule("POLYGLOT_ARROW", null, false);
         private static final PythonFrozenModule _SYSCONFIGDATA = new PythonFrozenModule("_SYSCONFIGDATA", null, false);
         private static final PythonFrozenModule GRAALPY___GRAALPYTHON__ = new PythonFrozenModule("GRAALPY___GRAALPYTHON__", null, false);
         private static final PythonFrozenModule GRAALPY__POLYGLOT = new PythonFrozenModule("GRAALPY__POLYGLOT", null, false);
@@ -591,6 +592,8 @@ public static final PythonFrozenModule lookup(String name) {
                 return Map.__PHELLO___SPAM;
             case "__hello_only__":
                 return Map.FROZEN_ONLY;
+            case "polyglot.arrow":
+                return Map.POLYGLOT_ARROW;
             case "_sysconfigdata":
                 return Map._SYSCONFIGDATA;
             case "graalpy.__graalpython__":

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

@@ -73,8 +73,7 @@ static ArrowArray doIntVector(Node inliningTarget, Object vector,
             snapshot.null_count = (Integer) interopLib.invokeMember(vector, "getNullCount");
             snapshot.n_buffers = (Integer) interopLib.invokeMember(vector, "getExportedCDataBufferCount");
             if (snapshot.n_buffers != 2) {
-                // we expect only two buffers (validity and value buffer)
-                throw CompilerDirectives.shouldNotReachHere();
+                throw CompilerDirectives.shouldNotReachHere("We expect that Vector implementation to has just 2 buffers, those are validity buffer and value buffer. This should never happen unless arrow changes internally");
             }
             snapshot.buffers = unsafe.allocateMemory(2 * POINTER_SIZE);
             long validityPointer = (long) interopLib.invokeMember(vector, "getValidityBufferAddress");
@@ -85,7 +84,7 @@ static ArrowArray doIntVector(Node inliningTarget, Object vector,
 
             return ArrowArray.allocateFromSnapshot(snapshot);
         } catch (Exception e) {
-            throw CompilerDirectives.shouldNotReachHere();
+            throw CompilerDirectives.shouldNotReachHere("Unable to convert vector to arrow array. Error: " + e.getMessage());
         }
     }
 

graalpython/lib-graalpython/_polyglot.py

@@ -146,12 +146,13 @@ def _struct_time_tz(st: time.struct_time):
 # loading arrow structures on demand
 def __getattr__(name):
     if name == "arrow":
-        from modules import _polyglot_arrow
+        import _polyglot_arrow
         setattr(polyglot, "arrow", _polyglot_arrow)
         return _polyglot_arrow
     raise AttributeError(f"module 'polyglot' has no attribute '{name}'")
 
 setattr(polyglot, "__getattr__", __getattr__)
+setattr(polyglot, "__path__", ".")
 
 # example extending time.struct_time using the decorator wrapper
 #