Search index: add nested filter.

Author: zhouzf05

examples/search_index.py

@@ -59,9 +59,9 @@ def term_query(table_name, index_name):
     _print_rows(rows, total_count)
 
 def range_query(table_name, index_name):
-    query = RangeQuery('k', 'key100', 'key200', include_lower=False, include_upper=False)
+    query = RangeQuery('k', 'key100', 'key500', include_lower=False, include_upper=False)
     rows, next_token, total_count, is_all_succeed = client.search(
-        table_name, index_name, SearchQuery(query, limit=100, get_total_count=True), ColumnsToGet(return_type=ColumnReturnType.ALL)
+        table_name, index_name, SearchQuery(query, offset=100, limit=100, get_total_count=True), ColumnsToGet(return_type=ColumnReturnType.ALL)
     )
 
     _print_rows(rows, total_count)
@@ -121,8 +121,11 @@ def bool_query(table_name, index_name):
 
 def geo_distance_query(table_name, index_name):
     query = GeoDistanceQuery('g', '32.5,116.5', 300000)
+    sort = Sort(sorters=[
+            GeoDistanceSort('g', ['32.5,116.5', '32.0,116.0'], sort_order=SortOrder.DESC, sort_mode=SortMode.MAX)
+        ])
     rows, next_token, total_count, is_all_succeed = client.search(
-        table_name, index_name, SearchQuery(query, limit=100, get_total_count=True), ColumnsToGet(return_type=ColumnReturnType.ALL)
+        table_name, index_name, SearchQuery(query, limit=100, get_total_count=True, sort=sort), ColumnsToGet(return_type=ColumnReturnType.ALL)
     )
 
     _print_rows(rows, total_count)
@@ -144,10 +147,13 @@ def geo_polygon_query(table_name, index_name):
     _print_rows(rows, total_count)
 
 def nested_query(table_name, index_name):
-    nested_query = RangeQuery('n.nl', range_from=100, range_to=300, include_lower=True, include_upper=True)
+    nested_query = RangeQuery('n.nl', range_from=110, range_to=200, include_lower=True, include_upper=True)
     query = NestedQuery('n', nested_query)
+    sort = Sort(
+        sorters = [FieldSort('n.nl', sort_order=SortOrder.ASC, nested_filter=NestedFilter('n', RangeQuery('n.nl', range_from=150, range_to=200)))]
+    )
     rows, next_token, total_count, is_all_succeed = client.search(
-        table_name, index_name, SearchQuery(query, limit=100, get_total_count=True), ColumnsToGet(return_type=ColumnReturnType.ALL)
+        table_name, index_name, SearchQuery(query, limit=100, get_total_count=True, sort=sort), ColumnsToGet(return_type=ColumnReturnType.ALL)
     )
 
     _print_rows(rows, total_count)
@@ -244,7 +250,7 @@ def delete_search_index(index_name):
     #describe_search_index()
 
     # perform queries
-    match_all_query(table_name, index_name)
+    #match_all_query(table_name, index_name)
     #match_query(table_name, index_name)
     #match_phrase_query(table_name, index_name)
     #term_query(table_name, index_name)
@@ -256,6 +262,6 @@ def delete_search_index(index_name):
     #geo_distance_query(table_name, index_name)
     #geo_bounding_box_query(table_name, index_name)
     #geo_polygon_query(table_name, index_name)
-    #nested_query(table_name, nested_index_name)
+    nested_query(table_name, nested_index_name)
     #function_score_query(table_name, nested_index_name)
 

tablestore/__init__.py

@@ -78,6 +78,8 @@
     'ColumnsToGet',
     'ColumnReturnType',
     'FieldValueFactor',
+    'GeoDistanceType',
+    'NestedFilter'
 ]
 
 

tablestore/encoder.py

@@ -402,10 +402,10 @@ def _make_index_sorter(self, proto, sorter):
                 proto.field_sort.mode = self._get_enum(sorter.sort_mode)
 
             if sorter.nested_filter is not None:
-                proto.field_sort.nested_filter = self._encode_nested_filter(sorter.nested_filter) 
+                self._make_nested_filter(proto.field_sort.nested_filter, sorter.nested_filter)
         elif isinstance(sorter, GeoDistanceSort):
             proto.geo_distance_sort.field_name = sorter.field_name
-            proto.geo_distance_sort.points = sorter.points
+            proto.geo_distance_sort.points.extend(sorter.points)
 
             if sorter.sort_order is not None:
                 proto.geo_distance_sort.order = self._get_enum(sorter.sort_order)
@@ -417,7 +417,7 @@ def _make_index_sorter(self, proto, sorter):
                 proto.geo_distance_sort.distance_type = self._get_enum(sorter.geo_distance_type)
 
             if sorter.nested_filter is not None:
-                proto.geo_distance_sort.nested_filter = self._encode_nested_filter(sorter.nested_filter)
+                self._make_nested_filter(proto.geo_distance_sort.nested_filter, sorter.nested_filter) 
         elif isinstance(sorter, ScoreSort):
             proto.score_sort.order = self._get_enum(sorter.sort_order)
         else:
@@ -828,12 +828,9 @@ def _encode_create_search_index(self, table_name, index_name, index_meta):
 
         return proto
 
-    def _encode_nested_filter(self, nested_filter):
-        nested_filter_proto = None
-        if nested_filter:
-            # TODO encode nested filter
-            pass
-        return nested_filter_proto
+    def _make_nested_filter(self, proto, nested_filter):
+        proto.path = nested_filter.path
+        self._make_query(proto.filter, nested_filter.query_filter)
 
     def _encode_search(self, table_name, index_name, search_query, columns_to_get, routing_keys):
         proto = search_pb2.SearchRequest()

tablestore/metadata.py

@@ -79,6 +79,8 @@
     'SyncPhase',
     'ColumnsToGet',
     'ColumnReturnType',
+    'GeoDistanceType',
+    'NestedFilter'
 ]