Removed (presently unused) "resume" token.

To be reintroduced...
pyeventsourcing · Dec 8, 2017 · da32a6b · da32a6b
1 parent 27cbb8e
commit da32a6b
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/eventsourcing/infrastructure/activerecord.py b/eventsourcing/infrastructure/activerecord.py
@@ -38,7 +38,7 @@ def all_items(self):
         """
 
     @abstractmethod
-    def all_records(self, resume=None, *arg, **kwargs):
+    def all_records(self, *arg, **kwargs):
         """
         Returns all records in the table (possibly in chronological order, depending on database).
         """

diff --git a/eventsourcing/infrastructure/cassandra/activerecords.py b/eventsourcing/infrastructure/cassandra/activerecords.py
@@ -84,9 +84,9 @@ def all_items(self):
             sequenced_item = self.from_active_record(record)
             yield sequenced_item
 
-    def all_records(self, resume=None, *args, **kwargs):
+    def all_records(self, *args, **kwargs):
         position_field_name = self.field_names.position
-        for sequence_id in self.all_sequence_ids(resume=resume):
+        for sequence_id in self.all_sequence_ids():
             kwargs = {self.field_names.sequence_id: sequence_id}
             record_query = self.filter(**kwargs).limit(100).order_by(position_field_name)
             record_page = list(record_query)
@@ -97,12 +97,15 @@ def all_records(self, resume=None, *args, **kwargs):
                 kwargs = {'{}__gt'.format(position_field_name): getattr(last_record, position_field_name)}
                 record_page = list(record_query.filter(**kwargs))
 
-    def all_sequence_ids(self, resume=None):
+    def all_sequence_ids(self):
         query = self.active_record_class.objects.all().limit(1)
-        if resume is None:
-            page = list(query)
-        else:
-            page = list(query.filter(pk__token__gt=Token(resume)))
+
+        # Todo: If there were a resume token, it could be used like this:
+        # if resume is None:
+        #     page = list(query)
+        # else:
+        #     page = list(query.filter(pk__token__gt=Token(resume)))
+        page = list(query)
 
         while page:
             for record in page:

diff --git a/eventsourcing/infrastructure/sqlalchemy/activerecords.py b/eventsourcing/infrastructure/sqlalchemy/activerecords.py
@@ -131,7 +131,7 @@ def from_active_record(self, active_record):
         kwargs = self.get_field_kwargs(active_record)
         return self.sequenced_item_class(**kwargs)
 
-    def all_records(self, resume=None, *args, **kwargs):
+    def all_records(self, *args, **kwargs):
         """
         Returns all records in the table.
         """