refactor: move all methods to ArrayBasedSequenceStorage

horakivo · horakivo · commit aa1da480a34e · 2024-06-07T00:36:23.000+02:00
diff --git a/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/runtime/SequenceStorageTests.java b/graalpython/com.oracle.graal.python.test/src/com/oracle/graal/python/test/runtime/SequenceStorageTests.java
@@ -41,7 +41,7 @@ private static Object[] getObjectValues() {
     public void objectsGetAndSet() {
         ObjectSequenceStorage store = new ObjectSequenceStorage(getObjectValues());
         assertEquals(4, store.getObjectItemNormalized(3));
-        store.setItemNormalized(5, 10);
+        store.setObjectItemNormalized(5, 10);
         assertEquals(10, store.getObjectItemNormalized(5));
     }
 
@@ -56,7 +56,7 @@ private static int[] getIntValues() {
     public void intGetAndSet() throws SequenceStoreException {
         IntSequenceStorage store = new IntSequenceStorage(getIntValues());
         assertEquals(4, store.getIntItemNormalized(3));
-        store.setItemNormalized(5, 10);
+        store.setIntItemNormalized(5, 10);
         assertEquals(10, store.getIntItemNormalized(5));
     }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextObjectBuiltins.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/modules/cext/PythonCextObjectBuiltins.java
@@ -136,6 +136,7 @@
 import com.oracle.graal.python.runtime.exception.PException;
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.runtime.sequence.PSequence;
+import com.oracle.graal.python.runtime.sequence.storage.ArrayBasedSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.BasicSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.EmptySequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.NativeSequenceStorage;
@@ -584,7 +585,7 @@ static PNone set(PSequence obj, long size,
                         @Cached InlinedBranchProfile nativeProfile) {
             SequenceStorage storage = getSequenceStorageNode.execute(inliningTarget, obj);
             // Can't use SetLenNode as that decrefs items for native storages when shrinking
-            if (storage instanceof BasicSequenceStorage basicStorage) {
+            if (storage instanceof ArrayBasedSequenceStorage basicStorage) {
                 basicProfile.enter(inliningTarget);
                 basicStorage.setNewLength((int) size);
             } else if (storage instanceof NativeSequenceStorage nativeStorage) {
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/jni/GraalHPyJNIContext.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/cext/hpy/jni/GraalHPyJNIContext.java
@@ -1983,7 +1983,7 @@ private boolean ctxListSetItem(Object receiver, long lidx, long hValue) {
             return true;
         } else if (storage instanceof ObjectSequenceStorage) {
             Object value = context.getObjectForHPyHandle(GraalHPyBoxing.unboxHandle(hValue));
-            ((ObjectSequenceStorage) storage).setItemNormalized(idx, value);
+            ((ObjectSequenceStorage) storage).setObjectItemNormalized(idx, value);
             return true;
         }
         // TODO: other storages...
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/builtins/objects/common/SequenceStorageNodes.java
@@ -115,7 +115,6 @@
 import com.oracle.graal.python.runtime.object.PythonObjectFactory;
 import com.oracle.graal.python.runtime.sequence.PSequence;
 import com.oracle.graal.python.runtime.sequence.storage.ArrayBasedSequenceStorage;
-import com.oracle.graal.python.runtime.sequence.storage.BasicSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.BoolSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.ByteSequenceStorage;
 import com.oracle.graal.python.runtime.sequence.storage.DoubleSequenceStorage;
@@ -911,14 +910,14 @@ public final SequenceStorage execute(SequenceStorage s, int key, double value) {
         @Specialization
         protected SequenceStorage doScalarInt(IntSequenceStorage storage, int idx, int value) {
             int normalized = normalizeIndex(idx, storage);
-            storage.setItemNormalized(normalized, value);
+            storage.setIntItemNormalized(normalized, value);
             return storage;
         }
 
         @Specialization
         protected SequenceStorage doScalarInt(DoubleSequenceStorage storage, int idx, double value) {
             int normalized = normalizeIndex(idx, storage);
-            storage.setItemNormalized(normalized, value);
+            storage.setDoubleItemNormalized(normalized, value);
             return storage;
         }
 
@@ -1168,7 +1167,7 @@ protected static void doDouble(@SuppressWarnings("unused") Node inliningTarget,
 
         @Specialization
         protected static void doObject(@SuppressWarnings("unused") Node inliningTarget, ObjectSequenceStorage storage, int idx, Object value) {
-            storage.setItemNormalized(idx, value);
+            storage.setObjectItemNormalized(idx, value);
         }
 
         @Fallback
@@ -2499,7 +2498,7 @@ SequenceStorage doGeneric(SequenceStorage s, int times,
             try {
                 int len = s.length();
                 int newLen = PythonUtils.multiplyExact(len, times);
-                BasicSequenceStorage repeated = createEmptyNode.execute(inliningTarget, s, newLen, -1);
+                ArrayBasedSequenceStorage repeated = createEmptyNode.execute(inliningTarget, s, newLen, -1);
 
                 for (int i = 0; i < len; i++) {
                     setItemNode.execute(inliningTarget, repeated, i, getItemNode.execute(inliningTarget, s, i));
@@ -2738,7 +2737,7 @@ static ObjectSequenceStorage doObject(@SuppressWarnings("unused") ObjectSequence
         }
 
         @Specialization
-        static SequenceStorage doEmptyStorage(Node inliningTarget, @SuppressWarnings("unused") EmptySequenceStorage s, BasicSequenceStorage other,
+        static SequenceStorage doEmptyStorage(Node inliningTarget, @SuppressWarnings("unused") EmptySequenceStorage s, ArrayBasedSequenceStorage other,
                         @Exclusive @Cached InlinedExactClassProfile otherProfile) {
             return otherProfile.profile(inliningTarget, other).createEmpty(DEFAULT_CAPACITY);
         }
@@ -2928,14 +2927,14 @@ public static AppendNode getUncached() {
     @GenerateCached(false)
     public abstract static class CreateEmptyNode extends SequenceStorageBaseNode {
 
-        public abstract BasicSequenceStorage execute(Node inliningTarget, SequenceStorage s, int cap, int len);
+        public abstract ArrayBasedSequenceStorage execute(Node inliningTarget, SequenceStorage s, int cap, int len);
 
         @Specialization
-        static BasicSequenceStorage doIt(Node inliningTarget, SequenceStorage s, int cap, int len,
+        static ArrayBasedSequenceStorage doIt(Node inliningTarget, SequenceStorage s, int cap, int len,
                         @Cached EnsureCapacityNode ensureCapacityNode,
                         @Cached GetElementType getElementType,
                         @Cached CreateEmptyForTypeNode createEmptyForTypeNode) {
-            BasicSequenceStorage ss = createEmptyForTypeNode.execute(inliningTarget, getElementType.execute(inliningTarget, s), cap);
+            ArrayBasedSequenceStorage ss = createEmptyForTypeNode.execute(inliningTarget, getElementType.execute(inliningTarget, s), cap);
             if (len != -1) {
                 ensureCapacityNode.execute(inliningTarget, ss, len);
                 ss.setNewLength(len);
@@ -2948,7 +2947,7 @@ static BasicSequenceStorage doIt(Node inliningTarget, SequenceStorage s, int cap
     @GenerateCached(false)
     abstract static class CreateEmptyForTypeNode extends SequenceStorageBaseNode {
 
-        public abstract BasicSequenceStorage execute(Node inliningTarget, StorageType type, int cap);
+        public abstract ArrayBasedSequenceStorage execute(Node inliningTarget, StorageType type, int cap);
 
         @Specialization(guards = "isBoolean(type)")
         static BoolSequenceStorage doBoolean(@SuppressWarnings("unused") StorageType type, int cap) {
@@ -3251,7 +3250,7 @@ public abstract static class SetLenNode extends Node {
         public abstract void execute(Node inliningTarget, SequenceStorage s, int len);
 
         @Specialization
-        static void doBasic(BasicSequenceStorage s, int len) {
+        static void doBasic(ArrayBasedSequenceStorage s, int len) {
             s.setNewLength(len);
         }
 
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/ArrayBasedSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/ArrayBasedSequenceStorage.java
@@ -49,4 +49,23 @@ public abstract class ArrayBasedSequenceStorage extends BasicSequenceStorage {
     public abstract void setInternalArrayObject(Object arrayObject);
 
     public abstract ArrayBasedSequenceStorage createEmpty(int newCapacity);
+
+    public final void setNewLength(int length) {
+        this.length = length;
+    }
+
+    public final void incLength() {
+        this.length++;
+    }
+
+    /**
+     * The capacity we should allocate for a given length.
+     */
+    protected static int capacityFor(int length) throws ArithmeticException {
+        return Math.max(16, Math.multiplyExact(length, 2));
+    }
+
+    public void minimizeCapacity() {
+        capacity = length;
+    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/BasicSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/BasicSequenceStorage.java
@@ -27,26 +27,4 @@
 
 public abstract class BasicSequenceStorage extends SequenceStorage {
 
-    public abstract void setItemNormalized(int idx, Object value) throws SequenceStoreException;
-
-    public final void setNewLength(int length) {
-        this.length = length;
-    }
-
-    public final void incLength() {
-        this.length++;
-    }
-
-    public abstract BasicSequenceStorage createEmpty(int newCapacity);
-
-    /**
-     * The capacity we should allocate for a given length.
-     */
-    protected static int capacityFor(int length) throws ArithmeticException {
-        return Math.max(16, Math.multiplyExact(length, 2));
-    }
-
-    public void minimizeCapacity() {
-        capacity = length;
-    }
 }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/BoolSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/BoolSequenceStorage.java
@@ -103,15 +103,6 @@ public boolean getBoolItemNormalized(int idx) {
         return values[idx];
     }
 
-    @Override
-    public void setItemNormalized(int idx, Object value) throws SequenceStoreException {
-        if (value instanceof Boolean) {
-            setBoolItemNormalized(idx, (boolean) value);
-        } else {
-            throw new SequenceStoreException(value);
-        }
-    }
-
     public void setBoolItemNormalized(int idx, boolean value) {
         values[idx] = value;
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/ByteSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/ByteSequenceStorage.java
@@ -99,20 +99,6 @@ public int getIntItemNormalized(int idx) {
         return values[idx] & 0xFF;
     }
 
-    @Override
-    public void setItemNormalized(int idx, Object value) throws SequenceStoreException {
-        if (value instanceof Byte) {
-            setByteItemNormalized(idx, (byte) value);
-        } else if (value instanceof Integer) {
-            if ((int) value < 0 || (int) value >= 256) {
-                throw PRaiseNode.raiseUncached(null, ValueError, ErrorMessages.BYTE_MUST_BE_IN_RANGE);
-            }
-            setByteItemNormalized(idx, ((Integer) value).byteValue());
-        } else {
-            throw PRaiseNode.raiseUncached(null, TypeError, ErrorMessages.INTEGER_REQUIRED);
-        }
-    }
-
     public void setByteItemNormalized(int idx, byte value) {
         values[idx] = value;
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/DoubleSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/DoubleSequenceStorage.java
@@ -93,15 +93,6 @@ public double getDoubleItemNormalized(int idx) {
         return values[idx];
     }
 
-    @Override
-    public void setItemNormalized(int idx, Object value) throws SequenceStoreException {
-        if (value instanceof Double) {
-            setDoubleItemNormalized(idx, (double) value);
-        } else {
-            throw new SequenceStoreException(value);
-        }
-    }
-
     public void setDoubleItemNormalized(int idx, double value) {
         values[idx] = value;
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/IntSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/IntSequenceStorage.java
@@ -93,15 +93,6 @@ public int getIntItemNormalized(int idx) {
         return values[idx];
     }
 
-    @Override
-    public void setItemNormalized(int idx, Object value) throws SequenceStoreException {
-        if (value instanceof Integer) {
-            setIntItemNormalized(idx, (int) value);
-        } else {
-            throw new SequenceStoreException(value);
-        }
-    }
-
     public void setIntItemNormalized(int idx, int value) {
         values[idx] = value;
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/LongSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/LongSequenceStorage.java
@@ -94,17 +94,6 @@ public long getLongItemNormalized(int idx) {
         return values[idx];
     }
 
-    @Override
-    public void setItemNormalized(int idx, Object val) throws SequenceStoreException {
-        Object value = (val instanceof Integer) ? BigInteger.valueOf((int) val).longValue() : val;
-        value = (val instanceof BigInteger) ? ((BigInteger) val).longValue() : value;
-        if (value instanceof Long) {
-            setLongItemNormalized(idx, (long) value);
-        } else {
-            throw new SequenceStoreException(value);
-        }
-    }
-
     public void setLongItemNormalized(int idx, long value) {
         values[idx] = value;
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/MroSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/MroSequenceStorage.java
@@ -107,12 +107,6 @@ public PythonAbstractClass getPythonClassItemNormalized(int idx) {
         return values[idx];
     }
 
-    @Override
-    @SuppressWarnings("unused")
-    public void setItemNormalized(int idx, Object value) {
-        throw CompilerDirectives.shouldNotReachHere();
-    }
-
     public TruffleString getClassName() {
         return className;
     }
diff --git a/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/ObjectSequenceStorage.java b/graalpython/com.oracle.graal.python/src/com/oracle/graal/python/runtime/sequence/storage/ObjectSequenceStorage.java
@@ -75,8 +75,7 @@ public void reverse() {
         }
     }
 
-    @Override
-    public void setItemNormalized(int idx, Object value) {
+    public void setObjectItemNormalized(int idx, Object value) {
         values[idx] = assertNoJavaString(value);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ private static Object[] getObjectValues() {`
`41`	`41`	`public void objectsGetAndSet() {`
`42`	`42`	`ObjectSequenceStorage store = new ObjectSequenceStorage(getObjectValues());`
`43`	`43`	`assertEquals(4, store.getObjectItemNormalized(3));`
`44`		`- store.setItemNormalized(5, 10);`
	`44`	`+ store.setObjectItemNormalized(5, 10);`
`45`	`45`	`assertEquals(10, store.getObjectItemNormalized(5));`
`46`	`46`	`}`
`47`	`47`
`@@ -56,7 +56,7 @@ private static int[] getIntValues() {`
`56`	`56`	`public void intGetAndSet() throws SequenceStoreException {`
`57`	`57`	`IntSequenceStorage store = new IntSequenceStorage(getIntValues());`
`58`	`58`	`assertEquals(4, store.getIntItemNormalized(3));`
`59`		`- store.setItemNormalized(5, 10);`
	`59`	`+ store.setIntItemNormalized(5, 10);`
`60`	`60`	`assertEquals(10, store.getIntItemNormalized(5));`
`61`	`61`	`}`
`62`	`62`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1983,7 +1983,7 @@ private boolean ctxListSetItem(Object receiver, long lidx, long hValue) {`
`1983`	`1983`	`return true;`
`1984`	`1984`	`} else if (storage instanceof ObjectSequenceStorage) {`
`1985`	`1985`	`Object value = context.getObjectForHPyHandle(GraalHPyBoxing.unboxHandle(hValue));`
`1986`		`- ((ObjectSequenceStorage) storage).setItemNormalized(idx, value);`
	`1986`	`+ ((ObjectSequenceStorage) storage).setObjectItemNormalized(idx, value);`
`1987`	`1987`	`return true;`
`1988`	`1988`	`}`
`1989`	`1989`	`// TODO: other storages...`