some comments addressed

sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/aio/document_producer.py

@@ -312,18 +312,7 @@ async def compare(self, doc_producer1, doc_producer2):
                 negative integer if doc_producers1 < doc_producers2
         :rtype: int
         """
-        order1 = doc_producer1._item_result["orderByItems"][0]
-        order2 = doc_producer2._item_result["orderByItems"][0]
-        type1_ord = _OrderByHelper.getTypeOrd(order1)
-        type2_ord = _OrderByHelper.getTypeOrd(order2)
-
-        type_ord_diff = type1_ord - type2_ord
-
-        if type_ord_diff:
-            return type_ord_diff
-
-        # the same type,
-        if type1_ord == 0:
-            return 0
-
-        return _compare_helper(order1['item'], order2['item'])
+        # TODO: this is not fully safe - doesn't deal with scenario of having orderByItems of [{}]
+        rank1 = doc_producer1._item_result["orderByItems"][0]
+        rank2 = doc_producer2._item_result["orderByItems"][0]
+        return await _OrderByHelper.compare(rank1, rank2)

sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/aio/execution_dispatcher.py

@@ -107,7 +107,7 @@ async def _create_pipelined_execution_context(self, query_execution_info):
                 raise CosmosHttpResponseError(StatusCodes.BAD_REQUEST,
                                   "Cross partition query only supports 'VALUE <AggregateFunc>' for aggregates")
         # throw exception here for vector search query without limit filter
-        if query_execution_info.get_has_non_streaming_order_by():
+        if query_execution_info.has_non_streaming_order_by():
             if query_execution_info.get_top() is None and query_execution_info.get_limit() is None:
                 # TODO: missing one last if statement here to check for the system variable bypass - need name
                 raise CosmosHttpResponseError(StatusCodes.BAD_REQUEST,
@@ -149,7 +149,7 @@ def __init__(self, client, options, execution_context, query_execution_info):
         self._endpoint = endpoint_component._QueryExecutionEndpointComponent(execution_context)
 
         order_by = query_execution_info.get_order_by()
-        if query_execution_info.get_has_non_streaming_order_by():
+        if query_execution_info.has_non_streaming_order_by():
             self._endpoint = endpoint_component._QueryExecutionNonStreamingEndpointComponent(self._endpoint)
         elif order_by:
             self._endpoint = endpoint_component._QueryExecutionOrderByEndpointComponent(self._endpoint)

sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/document_producer.py

@@ -285,59 +285,12 @@ class _NonStreamingDocumentProducer(object):
     to properly sort items as they get inserted.
     """
 
-    def __init__(self, item_result, sort_order):
+    def __init__(self, item_result):
         """
         Constructor
         """
         self._item_result = item_result
-        self._doc_producer_comp = _NonStreamingOrderByComparator(sort_order)
 
     def __lt__(self, other):
-        return self._doc_producer_comp.compare(self, other) < 0
-
-
-class _NonStreamingOrderByComparator(object):
-    """Provide a Comparator for item results which respects orderby sort order.
-    """
-
-    def __init__(self, sort_order):  # pylint: disable=super-init-not-called
-        """Instantiates this class
-
-        :param list sort_order:
-            List of sort orders (i.e., Ascending, Descending)
-
-        :ivar list sort_order:
-            List of sort orders (i.e., Ascending, Descending)
-
-        """
-        self._sort_order = sort_order
-
-    def compare(self, doc_producer1, doc_producer2):
-        """Compares the given two instances of DocumentProducers.
-
-        Based on the orderby query items and whether the sort order is Ascending
-        or Descending compares the peek result of the two DocumentProducers.
-
-        :param _DocumentProducer doc_producer1: first instance to be compared
-        :param _DocumentProducer doc_producer2: second instance to be compared
-        :return:
-            Integer value of compare result.
-                positive integer if doc_producers1 > doc_producers2
-                negative integer if doc_producers1 < doc_producers2
-        :rtype: int
-        """
-        order1 = doc_producer1._item_result["orderByItems"][0]
-        order2 = doc_producer2._item_result["orderByItems"][0]
-        type1_ord = _OrderByHelper.getTypeOrd(order1)
-        type2_ord = _OrderByHelper.getTypeOrd(order2)
-
-        type_ord_diff = type1_ord - type2_ord
-
-        if type_ord_diff:
-            return type_ord_diff
-
-        # the same type,
-        if type1_ord == 0:
-            return 0
-
-        return _compare_helper(order1['item'], order2['item'])
+        return _OrderByHelper.compare(self._item_result["orderByItems"][0],
+                                               other._item_result["orderByItems"]) < 0

sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/execution_dispatcher.py

@@ -119,7 +119,7 @@ def _create_pipelined_execution_context(self, query_execution_info):
                                   "Cross partition query only supports 'VALUE <AggregateFunc>' for aggregates")
 
         # throw exception here for vector search query without limit filter
-        if query_execution_info.get_has_non_streaming_order_by():
+        if query_execution_info.has_non_streaming_order_by():
             if query_execution_info.get_top() is None and query_execution_info.get_limit() is None:
                 # TODO: missing one last if statement here to check for the system variable bypass - need name
                 raise CosmosHttpResponseError(StatusCodes.BAD_REQUEST,
@@ -161,7 +161,7 @@ def __init__(self, client, options, execution_context, query_execution_info):
         self._endpoint = endpoint_component._QueryExecutionEndpointComponent(execution_context)
 
         order_by = query_execution_info.get_order_by()
-        if query_execution_info.get_has_non_streaming_order_by():
+        if query_execution_info.has_non_streaming_order_by():
             self._endpoint = endpoint_component._QueryExecutionNonStreamingEndpointComponent(self._endpoint)
         elif order_by:
             self._endpoint = endpoint_component._QueryExecutionOrderByEndpointComponent(self._endpoint)

sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/non_streaming_order_by_aggregator.py

@@ -60,7 +60,7 @@ def __init__(self, client, resource_link, query, options, partitioned_query_ex_i
         # will be a list of (partition_min, partition_max) tuples
         targetPartitionRanges = self._get_target_partition_key_range()
 
-        self._document_producer_comparator = document_producer._NonStreamingOrderByComparator(self._sort_orders)
+        self._document_producer_comparator = document_producer._OrderByDocumentProducerComparator(self._sort_orders)
 
         targetPartitionQueryExecutionContextList = []
         for partitionTargetRange in targetPartitionRanges:
@@ -90,7 +90,7 @@ def __init__(self, client, resource_link, query, options, partitioned_query_ex_i
             while True:
                 try:
                     result = doc_producer.peek()
-                    item_result = document_producer._NonStreamingDocumentProducer(result, self._sort_orders)
+                    item_result = document_producer._NonStreamingDocumentProducer(result)
                     self._orderByPQ.push(item_result)
                     next(doc_producer)
                 except StopIteration:

sdk/cosmos/azure-cosmos/azure/cosmos/_execution_context/query_execution_info.py

@@ -108,7 +108,7 @@ def get_rewritten_query(self):
             rewrittenQuery = rewrittenQuery.replace("{documentdb-formattableorderbyquery-filter}", "true")
         return rewrittenQuery
 
-    def get_has_non_streaming_order_by(self):
+    def has_non_streaming_order_by(self):
         """Returns if the query is a non-streaming order by query.
         :returns: Query is a non-streaming order by query.
         :rtype: bool