feat!: remove deprecated DeviceSize and MemorySize expressions in favor of RecordSize. There is still a test case for RecordSize

Author: juliannguyen4

aerospike_helpers/expressions/base.py

@@ -501,61 +501,12 @@ def __init__(self):
         super().__init__()
 
 
-class DeviceSize(_BaseExpr):
-    """
-    .. deprecated:: 17.2.0 :py:class:`RecordSize` should be used instead.
-
-    Create an expression that returns record size on disk. If server storage-engine is
-    memory, then zero is returned. This expression usually evaluates quickly
-    because record meta data is cached in memory.
-
-    This expression should only be used for server versions less than 7.0. Use
-    :py:class:`RecordSize` for server version 7.0+.
-    """
-
-    _op = _ExprOp.META_DEVICE_SIZE
-    _rt = ResultType.INTEGER
-
-    def __init__(self):
-        """:return: (integer value): Uncompressed storage size of the record.
-
-        Example:
-
-        .. testcode::
-
-            # Record device size >= 100 KB.
-            expr = exp.GE(exp.DeviceSize(), 100 * 1024).compile()
-        """
-        super().__init__()
-
-
-class MemorySize(_BaseExpr):
-    """
-    .. deprecated:: 17.2.0 :py:class:`RecordSize` should be used instead.
-
-    Returns the records memory size in bytes as an integer when either the namespace
-    is configured data-in-memory true or storage-engine memory, otherwise returns 0.
-
-    Requires server version between 5.3 inclusive and 7.0 exclusive.
-    Use :py:class:`RecordSize` for server version 7.0+.
-    """
-
-    _op = _ExprOp.META_MEMORY_SIZE
-    _rt = ResultType.INTEGER
-
-    def __init__(self):
-        """:return: (integer value)
-        """
-        super().__init__()
-
-
 class RecordSize(_BaseExpr):
     """
     Create expression that returns the record size. This expression usually evaluates
     quickly because record meta data is cached in memory.
 
-    Requires server version 7.0+. This expression replaces :py:class:`DeviceSize()` and
-    :py:class:`MemorySize()`.
+    Requires server version 7.0+.
     """
     _op = _ExprOp.META_RECORD_SIZE
     _rt = ResultType.INTEGER

test/new_tests/test_expressions_base.py

@@ -11,7 +11,6 @@
     BoolBin,
     Cond,
     Def,
-    DeviceSize,
     DigestMod,
     Eq,
     Exclusive,
@@ -27,7 +26,6 @@
     LastUpdateTime,
     Let,
     ListBin,
-    MemorySize,
     NE,
     Not,
     Or,
@@ -180,12 +178,6 @@ def test_val_pos(self):
             expr = Eq(IntBin("extra"), Val(4))
             self.as_connection.get(("test", "demo", _NUM_RECORDS), policy={"expressions": expr.compile()})
 
-    @pytest.mark.xfail(reason="Will fail on storage engine device.")
-    def test_device_size_pos(self):
-        expr = Eq(DeviceSize(), 0)
-        record = self.as_connection.get(("test", "demo", _NUM_RECORDS), policy={"expressions": expr.compile()})
-        assert record[2]["extra"] == "record"
-
     def test_TTL_pos(self):
         expr = NE(TTL(), 0)
         record = self.as_connection.get(("test", "demo", _NUM_RECORDS), policy={"expressions": expr.compile()})
@@ -196,15 +188,6 @@ def test_void_time_pos(self):
         record = self.as_connection.get(("test", "demo", _NUM_RECORDS), policy={"expressions": expr.compile()})
         assert record[2]["extra"] == "record"
 
-    @pytest.mark.skip("MemorySize() value depends on whether server is configured to store data in memory or not.\
-                      QE tests #1 and #2 are failing because some of their server scenarios have this configured\
-                      where some nodes have it configured and some don't. It's also hard to figure out\
-                      which node the record belongs to.")
-    def test_memory_size_pos(self):
-        # The Docker Aerospike image uses storage-memory device by default
-        expr = Eq(MemorySize(), 0)
-        self.as_connection.get(("test", "demo", _NUM_RECORDS), policy={"expressions": expr.compile()})
-
     def test_remove_with_expressions_neg(self):
         self.as_connection.put(("test", "demo", 25), {"test": "test_data"})