Projections follow up

docs/api/modules.rst

@@ -13,6 +13,7 @@ API Documentation
     lifecycle
     partition
     predicate
+    projection
     proxy/modules
     security
     serialization

docs/api/projection.rst

@@ -0,0 +1,4 @@
+Projection
+==========
+
+.. automodule:: hazelcast.projection

docs/using_python_client_with_hazelcast_imdg.rst

@@ -2166,31 +2166,30 @@ See the following example.
     import hazelcast
 
     from hazelcast.core import HazelcastJsonValue
-    from hazelcast.predicate import greater_or_equal
+    from hazelcast.predicate import greater
     from hazelcast.projection import single_attribute, multi_attribute
 
     client = hazelcast.HazelcastClient()
     employees = client.get_map("employees").blocking()
 
-    employees.put(1, HazelcastJsonValue('{"Age": 23, "Height": 180, "Weight": 60}'))
-    employees.put(2, HazelcastJsonValue('{"Age": 21, "Height": 170, "Weight": 70}'))
+    employees.put(1, HazelcastJsonValue({"age": 25, "height": 180, "weight": 60}))
+    employees.put(2, HazelcastJsonValue({"age": 21, "height": 170, "weight": 70}))
+    employees.put(3, HazelcastJsonValue({"age": 40, "height": 175, "weight": 75}))
 
-    employee_ages = employees.project(single_attribute("Age"))
-    # Prints:
-    # The ages of employees are [21, 23]
-    print("The ages of employees are %s" % employee_ages)
+    ages = employees.project(single_attribute("age"))
 
-    # Run Single Attribute With Predicate
-    employee_ages = employees.project(single_attribute("Age"), greater_or_equal("Age", 23))
-    # Prints:
-    # The employee age is 23
-    print("The employee age is: %s" % employee_ages[0])
+    # Prints: "Ages of the employees are [21, 25, 40]"
+    print("Ages of the employees are %s" % ages)
 
-    # Run Multi Attribute Projection
-    employee_multi_attribute = employees.project(multi_attribute("Age", "Height"))
-    # Prints:
-    # Employee 1 age and height: [21, 170] Employee 2 age and height: [23, 180]
-    print("Employee 1 age and height: %s Employee 2 age and height: %s" % (employee_multi_attribute[0], employee_multi_attribute[1]))
+    filtered_ages = employees.project(single_attribute("age"), greater("age", 23))
+
+    # Prints: "Ages of the filtered employees are [25, 40]"
+    print("Ages of the filtered employees are %s" % filtered_ages)
+
+    attributes = employees.project(multi_attribute("age", "height"))
+
+    # Prints: "Ages and heights of the employees are [[21, 170], [25, 180], [40, 175]]"
+    print("Ages and heights of the employees are %s" % attributes)
 
 
 Performance

examples/projections/projections_example.py

@@ -0,0 +1,29 @@
+import hazelcast
+
+from hazelcast.core import HazelcastJsonValue
+from hazelcast.predicate import less_or_equal
+from hazelcast.projection import single_attribute, multi_attribute
+
+client = hazelcast.HazelcastClient()
+
+people = client.get_map("people").blocking()
+
+people.put_all(
+    {
+        1: HazelcastJsonValue({"name": "Philip", "age": 46}),
+        2: HazelcastJsonValue({"name": "Elizabeth", "age": 44}),
+        3: HazelcastJsonValue({"name": "Henry", "age": 13}),
+        4: HazelcastJsonValue({"name": "Paige", "age": 15}),
+    }
+)
+
+names = people.project(single_attribute("name"))
+print("Names of the people are %s." % names)
+
+children_names = people.project(single_attribute("name"), less_or_equal("age", 18))
+print("Names of the children are %s." % children_names)
+
+names_and_ages = people.project(multi_attribute("name", "age"))
+print("Names and ages of the people are %s." % names_and_ages)
+
+client.shutdown()

hazelcast/core.py

@@ -388,8 +388,10 @@ def __init__(self, key=None, value=None):
 
     @property
     def key(self):
+        """Key of the entry."""
         return self._key
 
     @property
     def value(self):
+        """Value of the entry."""
         return self._value

hazelcast/projection.py

@@ -48,7 +48,7 @@ def get_class_id(self):
 
 
 class _MultiAttributeProjection(_AbstractProjection):
-    def __init__(self, *attribute_paths):
+    def __init__(self, attribute_paths):
         if not attribute_paths:
             raise ValueError("Specify at least one attribute path")
 
@@ -81,7 +81,7 @@ def single_attribute(attribute_path):
 
     Returns:
         Projection[any]: A projection that extracts the value of the given
-            attribute path.
+        attribute path.
     """
     return _SingleAttributeProjection(attribute_path)
 
@@ -95,16 +95,16 @@ def multi_attribute(*attribute_paths):
 
     Returns:
         Projection[list]: A projection that extracts the values of the given
-            attribute paths.
+        attribute paths.
     """
-    return _MultiAttributeProjection(*attribute_paths)
+    return _MultiAttributeProjection(attribute_paths)
 
 
 def identity():
     """Creates a projection that does no transformation.
 
     Returns:
         Projection[hazelcast.core.MapEntry]: A projection that does no
-            transformation.
+        transformation.
     """
     return _IdentityProjection()

hazelcast/proxy/map.py

@@ -328,6 +328,7 @@ def aggregate(self, aggregator, predicate=None):
         """
         check_not_none(aggregator, "aggregator can't be none")
         aggregator_data = self._to_data(aggregator)
+
         if predicate:
             if isinstance(predicate, PagingPredicate):
                 raise AssertionError("Paging predicate is not supported.")
@@ -347,44 +348,6 @@ def handler(message):
         request = map_aggregate_codec.encode_request(self.name, aggregator_data)
         return self._invoke(request, handler)
 
-    def project(self, projection, predicate=None):
-        """Applies the projection logic on map entries and filter the result with the
-        predicate, if given.
-
-        Args:
-            projection (hazelcast.projection.Projection): Projection to project the
-                entries with.
-            predicate (hazelcast.predicate.Predicate): Predicate to filter the entries
-                with.
-
-        Returns:
-            hazelcast.future.Future: The result of the projection.
-        """
-        check_not_none(projection, "Projection can't be none")
-        projection_data = self._to_data(projection)
-        if predicate:
-            if isinstance(predicate, PagingPredicate):
-                raise AssertionError("Paging predicate is not supported.")
-
-            def handler(message):
-                return ImmutableLazyDataList(
-                    map_project_with_predicate_codec.decode_response(message), self._to_object
-                )
-
-            predicate_data = self._to_data(predicate)
-            request = map_project_with_predicate_codec.encode_request(
-                self.name, projection_data, predicate_data
-            )
-            return self._invoke(request, handler)
-
-        def handler(message):
-            return ImmutableLazyDataList(
-                map_project_codec.decode_response(message), self._to_object
-            )
-
-        request = map_project_codec.encode_request(self.name, projection_data)
-        return self._invoke(request, handler)
-
     def clear(self):
         """Clears the map.
 
@@ -876,6 +839,45 @@ def lock(self, key, lease_time=None):
         self._invocation_service.invoke(invocation)
         return invocation.future
 
+    def project(self, projection, predicate=None):
+        """Applies the projection logic on map entries and filter the result with the
+        predicate, if given.
+
+        Args:
+            projection (hazelcast.projection.Projection): Projection to project the
+                entries with.
+            predicate (hazelcast.predicate.Predicate): Predicate to filter the entries
+                with.
+
+        Returns:
+            hazelcast.future.Future: The result of the projection.
+        """
+        check_not_none(projection, "Projection can't be none")
+        projection_data = self._to_data(projection)
+
+        if predicate:
+            if isinstance(predicate, PagingPredicate):
+                raise AssertionError("Paging predicate is not supported.")
+
+            def handler(message):
+                return ImmutableLazyDataList(
+                    map_project_with_predicate_codec.decode_response(message), self._to_object
+                )
+
+            predicate_data = self._to_data(predicate)
+            request = map_project_with_predicate_codec.encode_request(
+                self.name, projection_data, predicate_data
+            )
+            return self._invoke(request, handler)
+
+        def handler(message):
+            return ImmutableLazyDataList(
+                map_project_codec.decode_response(message), self._to_object
+            )
+
+        request = map_project_codec.encode_request(self.name, projection_data)
+        return self._invoke(request, handler)
+
     def put(self, key, value, ttl=None, max_idle=None):
         """Associates the specified value with the specified key in this map.
 

tests/integration/backward_compatible/proxy/map_test.py

@@ -41,7 +41,7 @@
 from hazelcast.core import HazelcastJsonValue
 from hazelcast.config import IndexType, IntType
 from hazelcast.errors import HazelcastError
-from hazelcast.predicate import greater_or_equal, less_or_equal, sql, between
+from hazelcast.predicate import greater_or_equal, less_or_equal, sql, paging, true
 from hazelcast.proxy.map import EntryEventType
 from hazelcast.serialization.api import IdentifiedDataSerializable
 from hazelcast.six.moves import range
@@ -796,6 +796,14 @@ def setUp(self):
     def tearDown(self):
         self.map.destroy()
 
+    def test_aggregate_with_none_aggregator(self):
+        with self.assertRaises(AssertionError):
+            self.map.aggregate(None)
+
+    def test_aggregate_with_paging_predicate(self):
+        with self.assertRaises(AssertionError):
+            self.map.aggregate(int_avg("foo"), paging(true(), 10))
+
     def test_int_average(self):
         average = self.map.aggregate(int_avg())
         self.assertEqual(24.5, average)
@@ -1034,23 +1042,32 @@ def setUp(self):
     def tearDown(self):
         self.map.destroy()
 
+    def test_project_with_none_projection(self):
+        with self.assertRaises(AssertionError):
+            self.map.project(None)
+
+    def test_project_with_paging_predicate(self):
+        with self.assertRaises(AssertionError):
+            self.map.project(single_attribute("foo"), paging(true(), 10))
+
     def test_single_attribute(self):
-        attribute = self.map.project(single_attribute("attr1"))
-        six.assertCountEqual(self, [4, 1], attribute)
+        attributes = self.map.project(single_attribute("attr1"))
+        six.assertCountEqual(self, [1, 4], attributes)
 
     def test_single_attribute_with_predicate(self):
-        attribute = self.map.project(single_attribute("attr1"), greater_or_equal("attr1", 4))
-        self.assertEqual([4], attribute)
+        attributes = self.map.project(single_attribute("attr1"), greater_or_equal("attr1", 4))
+        six.assertCountEqual(self, [4], attributes)
 
     def test_multi_attribute(self):
         attributes = self.map.project(multi_attribute("attr1", "attr2"))
-        six.assertCountEqual(self, [[4, 5], [1, 2]], attributes)
+        six.assertCountEqual(self, [[1, 2], [4, 5]], attributes)
 
     def test_multi_attribute_with_predicate(self):
         attributes = self.map.project(
-            multi_attribute("attr1", "attr2"), greater_or_equal("attr2", 3)
+            multi_attribute("attr1", "attr2"),
+            greater_or_equal("attr2", 3),
         )
-        self.assertEqual([[4, 5]], attributes)
+        six.assertCountEqual(self, [[4, 5]], attributes)
 
     def test_identity(self):
         attributes = self.map.project(identity())
@@ -1065,6 +1082,8 @@ def test_identity(self):
 
     def test_identity_with_predicate(self):
         attributes = self.map.project(identity(), greater_or_equal("attr2", 3))
-        self.assertEqual(
-            HazelcastJsonValue('{"attr1": 4, "attr2": 5, "attr3": 6}'), attributes[0].value
+        six.assertCountEqual(
+            self,
+            [HazelcastJsonValue('{"attr1": 4, "attr2": 5, "attr3": 6}')],
+            [attribute.value for attribute in attributes],
         )

tests/unit/projection_test.py

@@ -0,0 +1,25 @@
+import unittest
+
+from hazelcast.projection import single_attribute, multi_attribute
+
+
+class ProjectionsInvalidInputTest(unittest.TestCase):
+    def test_single_attribute_with_any_operator(self):
+        with self.assertRaises(ValueError):
+            single_attribute("foo[any]")
+
+    def test_single_attribute_with_empty_path(self):
+        with self.assertRaises(ValueError):
+            single_attribute("")
+
+    def test_multi_attribute_with_no_paths(self):
+        with self.assertRaises(ValueError):
+            multi_attribute()
+
+    def test_multi_attribute_with_any_operator(self):
+        with self.assertRaises(ValueError):
+            multi_attribute("valid", "invalid[any]")
+
+    def test_multi_attribute_with_empty_path(self):
+        with self.assertRaises(ValueError):
+            multi_attribute("valid", "")