return to old sort order

Author: d-w-moore

irods/data_object.py

@@ -46,14 +46,20 @@ def __repr__(self):
 _REFERENCE_DATETIME = datetime.datetime(1970, 1, 1, 0, 0, 0, tzinfo=datetime.timezone.utc)
 
 
-def _DEFAULT_SORT_KEY_FN(row):
+def _REPLICA_NUMBER_SORT_KEY_FN(row):
+    return row[DataObject.replica_number]
+
+def _REPLICA_FITNESS_SORT_KEY_FN(row):
     repl_status = int(row[DataObject.replica_status])
 
     repl_status_rank = _REPL_STATUSES.index(repl_status) if _REPL_STATUSES.count(repl_status) else sys.maxsize
 
     return (repl_status_rank, _REFERENCE_DATETIME - row[DataObject.modify_time])
 
 
+_DEFAULT_SORT_KEY_FN = _REPLICA_NUMBER_SORT_KEY_FN
+
+
 class iRODSDataObject:
     def __init__(self, manager, parent=None, results=None, replica_sort_function=None):
         self.manager = manager

irods/test/data_obj_test.py

@@ -2989,7 +2989,8 @@ def test_handling_of_termination_signals_during_multithread_put__issue_722(self)
 
         test_put__issue_722(self)
 
-    def test_default_sorting_of_replicas__issue_647(self):
+    @unittest.skipIf(irods.version.version_as_tuple() < (4,), 'too soon for this test.')
+    def test_modified_default_sorting_of_replicas__issue_647(self):
         basename = unique_name(my_function_name(), datetime.now()) + '_dataobj_647'
         with self.create_simple_resc() as newResc1, self.create_simple_resc() as newResc2:
             data = helpers.make_object(self.sess, f'{helpers.home_collection(self.sess)}/{basename}')