solentware-base 5.2__tar.gz → 5.2.2__tar.gz

{solentware-base-5.2/solentware_base.egg-info → solentware_base-5.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: solentware-base
-Version: 5.2
+Version: 5.2.2
 Summary: Bitmapped record number databases.
 Author-email: Roger Marsh <roger.marsh@solentware.co.uk>
 License: Licence for solentware_base package
@@ -23,10 +23,10 @@ Project-URL: Homepage, http://www.solentware.co.uk
 Project-URL: Repository, https://github.com/RogerMarsh/solentware-base.git
 Project-URL: Bug Tracker, https://github.com/RogerMarsh/solentware-base/issues
 Classifier: License :: OSI Approved :: BSD License
-Classifier: Programming Language :: Python :: 3.8
 Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Classifier: Operating System :: OS Independent
 Classifier: Topic :: Database
 Classifier: Intended Audience :: Developers

{solentware-base-5.2 → solentware_base-5.2.2}/pyproject.toml

@@ -10,17 +10,17 @@ line-length = 79
 
 [project]
 name = "solentware-base"
-version = "5.2"
+version = "5.2.2"
 authors = [
   { name="Roger Marsh", email="roger.marsh@solentware.co.uk" },
 ]
 description = "Bitmapped record number databases."
 classifiers = [
     "License :: OSI Approved :: BSD License",
-    "Programming Language :: Python :: 3.8",
     "Programming Language :: Python :: 3.9",
     "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
+    "Programming Language :: Python :: 3.12",
     "Operating System :: OS Independent",
     "Topic :: Database",
     "Intended Audience :: Developers",

{solentware-base-5.2 → solentware_base-5.2.2}/solentware_base/core/_database.py

@@ -81,7 +81,7 @@ class Database:
         """
         deletekey = instance.key.pack()
         instance.set_packed_value_and_indexes()
-        high_record = self.get_high_record(dbset)
+        high_record = self.get_high_record_number(dbset)
         self.delete(dbset, deletekey, instance.srvalue)
         instance.srkey = self.encode_record_number(deletekey)
         srindex = instance.srindex

{solentware-base-5.2 → solentware_base-5.2.2}/solentware_base/core/_databasedu.py

@@ -151,9 +151,9 @@ class Database(_database.Database):
             if values[-1] != record_number:
                 values.append(record_number)
                 if len(values) > SegmentSize.db_upper_conversion_limit:
-                    vsk = value_segments[
-                        key
-                    ] = SegmentSize.empty_bitarray.copy()
+                    vsk = value_segments[key] = (
+                        SegmentSize.empty_bitarray.copy()
+                    )
                     for j in values:
                         vsk[j] = True
                     vsk[record_number] = True

{solentware-base-5.2 → solentware_base-5.2.2}/solentware_base/core/_db.py

@@ -695,10 +695,8 @@ class Database(_database.Database):
             )
         return None
 
-    # high_record will become high_record_number to fit changed
-    # get_high_record.
     def note_freed_record_number_segment(
-        self, dbset, segment, record_number_in_segment, high_record
+        self, dbset, segment, record_number_in_segment, high_record_number
     ):
         """Add existence bitmap segment to list with spare record numbers.
 
@@ -708,9 +706,9 @@ class Database(_database.Database):
         """
         del record_number_in_segment
         try:
-            high_segment = divmod(high_record[0], SegmentSize.db_segment_size)[
-                0
-            ]
+            high_segment = divmod(
+                high_record_number, SegmentSize.db_segment_size
+            )[0]
         except TypeError:
             # Implies attempt to delete record from empty database.
             # The delete method will have raised an exception if appropriate.
@@ -791,13 +789,14 @@ class Database(_database.Database):
         )
         return segment, record_number
 
-    # Change to return just the record number, and the name to fit.
-    # Only used in one place, and it is extra work to get the data in_nosql.
-    def get_high_record(self, file):
+    def get_high_record_number(self, file):
         """Return the high existing record number in table for file."""
         cursor = self.table[file].cursor(txn=self.dbtxn)
         try:
-            return cursor.last()
+            last = cursor.last()
+            if last is None:
+                return None
+            return last[0]
         finally:
             cursor.close()
 
@@ -1414,7 +1413,7 @@ class Database(_database.Database):
         recordlist = RecordList(dbhome=self, dbset=file, cache_size=cache_size)
         if keylike is None:
             return recordlist
-        pattern = b".*?" + keylike
+        matcher = re.compile(keylike)
         cursor = self.table[SUBFILE_DELIMITER.join((file, field))].cursor(
             txn=self.dbtxn
         )
@@ -1422,7 +1421,7 @@ class Database(_database.Database):
             record = cursor.first()
             while record:
                 key, value = record
-                if re.match(pattern, key, flags=re.IGNORECASE | re.DOTALL):
+                if matcher.search(key):
                     self.populate_recordset_segment(recordlist, value)
                 record = cursor.next()
         finally:
@@ -1478,9 +1477,9 @@ class Database(_database.Database):
 
         Keys are in range set by combinations of ge, gt, le, and lt.
         """
-        if ge and gt:
+        if isinstance(ge, bytes) and isinstance(gt, bytes):
             raise DatabaseError("Both 'ge' and 'gt' given in key range")
-        if le and lt:
+        if isinstance(le, bytes) and isinstance(lt, bytes):
             raise DatabaseError("Both 'le' and 'lt' given in key range")
         recordlist = RecordList(dbhome=self, dbset=file, cache_size=cache_size)
         cursor = self.table[SUBFILE_DELIMITER.join((file, field))].cursor(
@@ -1490,7 +1489,7 @@ class Database(_database.Database):
             if ge is None and gt is None:
                 record = cursor.first()
             else:
-                record = cursor.set_range(ge or gt)
+                record = cursor.set_range(ge or gt or b"")
             if gt:
                 while record:
                     if record[0] > gt:

{solentware-base-5.2 → solentware_base-5.2.2}/solentware_base/core/_db_tkinter.py

@@ -895,10 +895,8 @@ class Database(_database.Database):
             )
         return None
 
-    # high_record will become high_record_number to fit changed
-    # get_high_record.
     def note_freed_record_number_segment(
-        self, dbset, segment, record_number_in_segment, high_record
+        self, dbset, segment, record_number_in_segment, high_record_number
     ):
         """Add existence bitmap segment to list with spare record numbers.
 
@@ -908,9 +906,9 @@ class Database(_database.Database):
         """
         del record_number_in_segment
         try:
-            high_segment = divmod(high_record[0], SegmentSize.db_segment_size)[
-                0
-            ]
+            high_segment = divmod(
+                high_record_number, SegmentSize.db_segment_size
+            )[0]
         except TypeError:
             # Implies attempt to delete record from empty database.
             # The delete method will have raised an exception if appropriate.
@@ -1012,16 +1010,17 @@ class Database(_database.Database):
         tcl_tk_call(tuple(command))
         return segment, record_number
 
-    # Change to return just the record number, and the name to fit.
-    # Only used in one place, and it is extra work to get the data in_nosql.
-    def get_high_record(self, file):
+    def get_high_record_number(self, file):
         """Return the high existing record number in table for file."""
         command = [self.table[file], "cursor"]
         if self.dbtxn:
             command.extend(["-txn", self.dbtxn])
         cursor = tcl_tk_call(tuple(command))
         try:
-            return tcl_tk_call((cursor, "get", "-last")) or None
+            last = tcl_tk_call((cursor, "get", "-last")) or None
+            if last is None:
+                return None
+            return last[0]
         finally:
             tcl_tk_call((cursor, "close"))
 
@@ -1793,7 +1792,7 @@ class Database(_database.Database):
         recordlist = RecordList(dbhome=self, dbset=file, cache_size=cache_size)
         if keylike is None:
             return recordlist
-        pattern = b".*?" + keylike
+        matcher = re.compile(keylike)
         command = [
             self.table[SUBFILE_DELIMITER.join((file, field))],
             "cursor",
@@ -1805,7 +1804,7 @@ class Database(_database.Database):
             record = tcl_tk_call((cursor, "get", "-first"))
             while record:
                 key, value = record[0]
-                if re.match(pattern, key, flags=re.IGNORECASE | re.DOTALL):
+                if matcher.search(key):
                     self.populate_recordset_segment(recordlist, value)
                 record = tcl_tk_call((cursor, "get", "-next"))
         finally:
@@ -1872,9 +1871,9 @@ class Database(_database.Database):
 
         Keys are in range set by combinations of ge, gt, le, and lt.
         """
-        if ge and gt:
+        if isinstance(ge, str) and isinstance(gt, str):
             raise DatabaseError("Both 'ge' and 'gt' given in key range")
-        if le and lt:
+        if isinstance(le, str) and isinstance(lt, str):
             raise DatabaseError("Both 'le' and 'lt' given in key range")
         recordlist = RecordList(dbhome=self, dbset=file, cache_size=cache_size)
         command = [
@@ -1888,7 +1887,9 @@ class Database(_database.Database):
             if ge is None and gt is None:
                 record = tcl_tk_call((cursor, "get", "-first"))
             else:
-                record = tcl_tk_call((cursor, "get", "-set_range", ge or gt))
+                record = tcl_tk_call(
+                    (cursor, "get", "-set_range", ge or gt or "")
+                )
             if gt:
                 while record:
                     record0 = record[0]

{solentware-base-5.2 → solentware_base-5.2.2}/solentware_base/core/_dbdu.py

@@ -553,10 +553,10 @@ class Database(_databasedu.Database):
                     new_segment = make_segment_from_item(item)
                     new_segment |= existing_segment
                     new_segment.normalize()
-                    item[
-                        -2
-                    ] = self.database.encode_number_for_sequential_file_dump(
-                        new_segment.count_records(), 2
+                    item[-2] = (
+                        self.database.encode_number_for_sequential_file_dump(
+                            new_segment.count_records(), 2
+                        )
                     )
                     if int.from_bytes(high[-2], byteorder="big") == 1:
                         item[-1] = segment_table.append(

{solentware-base-5.2 → solentware_base-5.2.2}/solentware_base/core/_dbdu_tkinter.py

@@ -700,10 +700,10 @@ class Database(_databasedu.Database):
                     new_segment = make_segment_from_item(item)
                     new_segment |= existing_segment
                     new_segment.normalize()
-                    item[
-                        -2
-                    ] = self.database.encode_number_for_sequential_file_dump(
-                        new_segment.count_records(), 2
+                    item[-2] = (
+                        self.database.encode_number_for_sequential_file_dump(
+                            new_segment.count_records(), 2
+                        )
                     )
                     if int.from_bytes(high[-2], byteorder="big") == 1:
                         item[-1] = tcl_tk_call(

{solentware-base-5.2 → solentware_base-5.2.2}/solentware_base/core/_dpt.py

@@ -849,14 +849,14 @@ class Database(_database.Database):
                 dptapi.APIFieldValue(""),
             )
         )
-        matcher = re.compile(".*?" + keylike, flags=re.IGNORECASE | re.DOTALL)
+        matcher = re.compile(keylike)
         dvcursor = dptfile.table_connection.OpenDirectValueCursor(
             dptapi.APIFindValuesSpecification(dptfile.secondary[field])
         )
         dvcursor.GotoFirst()
         while dvcursor.Accessible():
             value = dvcursor.GetCurrentValue()
-            if matcher.match(value.ExtractString()):
+            if matcher.search(value.ExtractString()):
                 vfs = _DPTFoundSet(
                     dptfile,
                     dptfile.table_connection.FindRecords(
@@ -961,9 +961,9 @@ class Database(_database.Database):
 
         cache_size is not relevant to DPT.
         """
-        if ge and gt:
+        if isinstance(ge, str) and isinstance(gt, str):
             raise DatabaseError("Both 'ge' and 'gt' given in key range")
-        if le and lt:
+        if isinstance(le, str) and isinstance(lt, str):
             raise DatabaseError("Both 'le' and 'lt' given in key range")
         if ge is None and gt is None and le is None and lt is None:
             return self.recordlist_all(file, field, cache_size=cache_size)
@@ -975,8 +975,8 @@ class Database(_database.Database):
                 dptfile.table_connection.FindRecords(
                     dptapi.APIFindSpecification(
                         dptfile.secondary[field],
-                        dptapi.FD_GE if ge else dptapi.FD_GT,
-                        dptapi.APIFieldValue(ge or gt),
+                        dptapi.FD_GE if ge is not None else dptapi.FD_GT,
+                        dptapi.APIFieldValue(ge or gt or ""),
                     )
                 ),
             )
@@ -986,24 +986,32 @@ class Database(_database.Database):
                 dptfile.table_connection.FindRecords(
                     dptapi.APIFindSpecification(
                         dptfile.secondary[field],
-                        dptapi.FD_LE if le else dptapi.FD_LT,
-                        dptapi.APIFieldValue(le or lt),
+                        dptapi.FD_LE if le is not None else dptapi.FD_LT,
+                        dptapi.APIFieldValue(le or lt or ""),
                     )
                 ),
             )
         else:
             if ge:
-                range_ = dptapi.FD_RANGE_GE_LE if le else dptapi.FD_RANGE_GE_LT
+                range_ = (
+                    dptapi.FD_RANGE_GE_LE
+                    if le is not None
+                    else dptapi.FD_RANGE_GE_LT
+                )
             else:
-                range_ = dptapi.FD_RANGE_GT_LE if le else dptapi.FD_RANGE_GT_LT
+                range_ = (
+                    dptapi.FD_RANGE_GT_LE
+                    if le is not None
+                    else dptapi.FD_RANGE_GT_LT
+                )
             foundset = _DPTFoundSet(
                 dptfile,
                 dptfile.table_connection.FindRecords(
                     dptapi.APIFindSpecification(
                         dptfile.secondary[field],
                         range_,
-                        dptapi.APIFieldValue(ge or gt),
-                        dptapi.APIFieldValue(le or lt),
+                        dptapi.APIFieldValue(ge or gt or ""),
+                        dptapi.APIFieldValue(le or lt or ""),
                     )
                 ),
             )

{solentware-base-5.2 → solentware_base-5.2.2}/solentware_base/core/_lmdb.py

@@ -743,10 +743,8 @@ class Database(_database.Database):
             )
         return None
 
-    # high_record will become high_record_number to fit changed
-    # get_high_record.
     def note_freed_record_number_segment(
-        self, dbset, segment, record_number_in_segment, high_record
+        self, dbset, segment, record_number_in_segment, high_record_number
     ):
         """Add existence bitmap segment to list with spare record numbers.
 
@@ -756,7 +754,9 @@ class Database(_database.Database):
         """
         del record_number_in_segment
         try:
-            high_segment = divmod(high_record, SegmentSize.db_segment_size)[0]
+            high_segment = divmod(
+                high_record_number, SegmentSize.db_segment_size
+            )[0]
         except TypeError:
             # Implies attempt to delete record from empty database.
             # The delete method will have raised an exception if appropriate.
@@ -844,9 +844,7 @@ class Database(_database.Database):
         )
         return segment, record_number
 
-    # Change to return just the record number, and the name to fit.
-    # Only used in one place, and it is extra work to get the data in_nosql.
-    def get_high_record(self, file):
+    def get_high_record_number(self, file):
         """Return the high existing record number in table for file."""
         with self.dbtxn.transaction.cursor(
             self.table[file].datastore
@@ -1482,14 +1480,14 @@ class Database(_database.Database):
         recordlist = RecordList(dbhome=self, dbset=file, cache_size=cache_size)
         if keylike is None:
             return recordlist
-        pattern = b".*?" + keylike
+        matcher = re.compile(keylike)
         with self.dbtxn.transaction.cursor(
             self.table[SUBFILE_DELIMITER.join((file, field))].datastore
         ) as cursor:
             record = cursor.first()
             while record:
                 key, value = cursor.item()
-                if re.match(pattern, key, flags=re.IGNORECASE | re.DOTALL):
+                if matcher.search(key):
                     self.populate_recordset_segment(recordlist, value)
                 record = cursor.next()
         return recordlist
@@ -1540,9 +1538,9 @@ class Database(_database.Database):
 
         Keys are in range set by combinations of ge, gt, le, and lt.
         """
-        if ge and gt:
+        if isinstance(ge, bytes) and isinstance(gt, bytes):
             raise DatabaseError("Both 'ge' and 'gt' given in key range")
-        if le and lt:
+        if isinstance(le, bytes) and isinstance(lt, bytes):
             raise DatabaseError("Both 'le' and 'lt' given in key range")
         recordlist = RecordList(dbhome=self, dbset=file, cache_size=cache_size)
         with self.dbtxn.transaction.cursor(
@@ -1551,7 +1549,7 @@ class Database(_database.Database):
             if ge is None and gt is None:
                 record = cursor.first()
             else:
-                record = cursor.set_range(ge or gt)
+                record = cursor.set_range(ge or gt or b"")
             if gt:
                 while record:
                     record = cursor.item()

{solentware-base-5.2 → solentware_base-5.2.2}/solentware_base/core/_lmdbdu.py

@@ -611,10 +611,10 @@ class Database(_databasedu.Database):
                     new_segment = make_segment_from_item(item)
                     new_segment |= existing_segment
                     new_segment.normalize()
-                    item[
-                        -2
-                    ] = self.database.encode_number_for_sequential_file_dump(
-                        new_segment.count_records(), 2
+                    item[-2] = (
+                        self.database.encode_number_for_sequential_file_dump(
+                            new_segment.count_records(), 2
+                        )
                     )
                     if int.from_bytes(item[-2], byteorder="big") == 1:
                         item[-1] = write_segment_value(

{solentware-base-5.2 → solentware_base-5.2.2}/solentware_base/core/_nosql.py

@@ -108,9 +108,9 @@ class Database(_database.Database):
                     continue
                 for fieldattr in NOSQL_FIELDATTS:
                     if fieldattr not in filedesc[FIELDS][fieldname]:
-                        filedesc[FIELDS][fieldname][
-                            fieldattr
-                        ] = SECONDARY_FIELDATTS[fieldattr]
+                        filedesc[FIELDS][fieldname][fieldattr] = (
+                            SECONDARY_FIELDATTS[fieldattr]
+                        )
         self.specification = specification
         self.segment_size_bytes = segment_size_bytes
         self.dbenv = None
@@ -648,15 +648,15 @@ class Database(_database.Database):
 
     def next_record_number(self, dbset):
         """Return high record number plus 1."""
-        high_record = self.get_high_record(dbset)
-        if high_record is None:
+        high_record_number = self.get_high_record_number(dbset)
+        if high_record_number is None:
             return 0
-        return high_record[0] + 1
+        return high_record_number + 1
 
     # high_record will become high_record_number to fit changed
-    # get_high_record method.
+    # get_high_record_number method.
     def note_freed_record_number_segment(
-        self, dbset, segment, record_number_in_segment, high_record
+        self, dbset, segment, record_number_in_segment, high_record_number
     ):
         """Add existence bitmap segment to list with spare record numbers.
 
@@ -666,9 +666,9 @@ class Database(_database.Database):
         """
         del record_number_in_segment
         try:
-            high_segment = divmod(high_record[0], SegmentSize.db_segment_size)[
-                0
-            ]
+            high_segment = divmod(
+                high_record_number, SegmentSize.db_segment_size
+            )[0]
         except TypeError:
             # Implies attempt to delete record from empty database.
             # The delete method will have raised an exception if appropriate.
@@ -738,24 +738,12 @@ class Database(_database.Database):
         ebmcf.high_record_number = max(ebmcf.high_record_number, putkey)
         return segment, record_number
 
-    # Change to return just the record number, and the name to fit.
-    # Only used in one place, and it is extra work to get the data in_nosql.
-    # Also actually getting the record does not prove it is the high record; in
-    # _sqlite and _db asking for high record returns (key, data) where key will
-    # be the high record number.
-    def get_high_record(self, file):
+    def get_high_record_number(self, file):
         """Return the high existing record number in table for file."""
         high_record_number = self.ebm_control[file].high_record_number
         if high_record_number == -1:
             return None
-        return (
-            high_record_number,
-            self.dbenv[
-                SUBFILE_DELIMITER.join(
-                    (self.table_data[file], str(high_record_number))
-                )
-            ],
-        )
+        return high_record_number
 
     def add_record_to_field_value(
         self, file, field, key, segment, record_number
@@ -1229,7 +1217,7 @@ class Database(_database.Database):
         recordlist = RecordList(dbhome=self, dbset=file, cache_size=cache_size)
         if keylike is None:
             return recordlist
-        matcher = re.compile(".*?" + keylike, flags=re.IGNORECASE | re.DOTALL)
+        matcher = re.compile(keylike)
         db = self.dbenv
         fieldtree = self.trees[SUBFILE_DELIMITER.join((file, field))]
         cursor = tree.Cursor(fieldtree)
@@ -1238,7 +1226,7 @@ class Database(_database.Database):
                 k = cursor.next()
                 if k is None:
                     break
-                if not matcher.match(k):
+                if not matcher.search(k):
                     continue
                 self.populate_recordset(
                     recordlist,
@@ -1322,9 +1310,9 @@ class Database(_database.Database):
                     ("'", field, "' field in '", file, "' file is not ordered")
                 )
             )
-        if ge and gt:
+        if isinstance(ge, str) and isinstance(gt, str):
             raise DatabaseError("Both 'ge' and 'gt' given in key range")
-        if le and lt:
+        if isinstance(le, str) and isinstance(lt, str):
             raise DatabaseError("Both 'le' and 'lt' given in key range")
         recordlist = RecordList(dbhome=self, dbset=file, cache_size=cache_size)
         db = self.dbenv
@@ -1334,7 +1322,7 @@ class Database(_database.Database):
             if ge is None and gt is None:
                 k = cursor.first()
             else:
-                k = cursor.nearest(ge or gt)
+                k = cursor.nearest(ge or gt or "")
             if gt:
                 while k is not None:
                     if k > gt:

{solentware-base-5.2 → solentware_base-5.2.2}/solentware_base/core/_nosqldu.py

@@ -121,9 +121,9 @@ class Database(_databasedu.Database):
         ebmc = self.ebm_control[file]
         tes = ebmc.table_ebm_segments
         insertion_point = bisect_right(tes, segment)
-        self.dbenv[
-            SUBFILE_DELIMITER.join((ebmc.ebm_table, str(segment)))
-        ] = repr(self.existence_bit_maps[file][segment].tobytes())
+        self.dbenv[SUBFILE_DELIMITER.join((ebmc.ebm_table, str(segment)))] = (
+            repr(self.existence_bit_maps[file][segment].tobytes())
+        )
         if not (tes and tes[insertion_point - 1] == segment):
             tes.insert(insertion_point, segment)
             self.dbenv[ebmc.ebm_table] = repr(tes)