Updating Exported SDK to 0.66

Author: Bryan Mau

appengine-compat/exported_appengine_sdk/google/appengine/api/dispatchinfo.py

@@ -69,6 +69,7 @@
 DISPATCH = 'dispatch'
 URL = 'url'
 MODULE = 'module'
+SERVICE = 'service'
 
 
 class Error(Exception):
@@ -168,7 +169,8 @@ class DispatchEntry(validation.Validated):
   """A Dispatch entry describes a mapping from a URL pattern to a module."""
   ATTRIBUTES = {
       URL: DispatchEntryURLValidator(),
-      MODULE: validation.Regex(appinfo.MODULE_ID_RE_STRING),
+      MODULE: validation.Optional(appinfo.MODULE_ID_RE_STRING),
+      SERVICE: validation.Optional(appinfo.MODULE_ID_RE_STRING)
   }
 
 
@@ -195,7 +197,7 @@ def LoadSingleDispatch(dispatch_info, open_fn=None):
 
   Raises:
     MalformedDispatchConfigurationError: The yaml file contains multiple
-      dispatch sections.
+      dispatch sections or is missing a required value.
     yaml_errors.EventError: An error occured while parsing the yaml file.
   """
   builder = yaml_object.ObjectBuilder(DispatchInfoExternal)
@@ -209,4 +211,19 @@ def LoadSingleDispatch(dispatch_info, open_fn=None):
   if len(parsed_yaml) > 1:
     raise MalformedDispatchConfigurationError('Multiple dispatch: sections '
                                               'in configuration.')
-  return parsed_yaml[0]
+
+
+
+  dispatch_info_external = parsed_yaml[0]
+  for dispatch in getattr(dispatch_info_external, DISPATCH) or []:
+    if dispatch.module and dispatch.service:
+      raise MalformedDispatchConfigurationError(
+          'Both module: and service: in dispatch entry. Please use only one.')
+    if not (dispatch.module or dispatch.service):
+      raise MalformedDispatchConfigurationError(
+          "Missing required value 'service'.")
+
+
+    dispatch.module = dispatch.module or dispatch.service
+    dispatch.service = None
+  return dispatch_info_external

appengine-compat/exported_appengine_sdk/google/appengine/datastore/cloud_datastore_validator.py

@@ -825,7 +825,7 @@ def validate_query(self, query, is_strong_read_consistency):
       ValidationError: if the query is invalid
     """
     _assert_condition((not is_strong_read_consistency
-                       or self._has_ancestor(query.filter)),
+                       or self._has_ancestor_or_parent(query.filter)),
                       'Global queries do not support strong consistency.')
     if query.HasField('filter'):
       self.validate_filter(query.filter)
@@ -911,7 +911,7 @@ def __validate_property_order(self, property_order):
     """
     self.__validate_property_reference(property_order.property)
 
-  def _has_ancestor(self, filt):
+  def _has_ancestor_or_parent(self, filt):
     """Determines if a filter includes an ancestor filter.
 
     Args:
@@ -923,13 +923,16 @@ def _has_ancestor(self, filt):
     if filt.HasField('property_filter'):
       op = filt.property_filter.op
       name = filt.property_filter.property.name
-      return (op == googledatastore.PropertyFilter.HAS_ANCESTOR
+      value = filt.property_filter.value
+      return ((op == googledatastore.PropertyFilter.HAS_ANCESTOR or
+               op == googledatastore.PropertyFilter.HAS_PARENT)
+              and value.HasField('key_value')
               and name == datastore_pbs.PROPERTY_NAME_KEY)
     if filt.HasField('composite_filter'):
       if (filt.composite_filter.op
           == googledatastore.CompositeFilter.AND):
         for sub_filter in filt.composite_filter.filters:
-          if self._has_ancestor(sub_filter):
+          if self._has_ancestor_or_parent(sub_filter):
             return True
     return False
 

appengine-compat/exported_appengine_sdk/google/appengine/datastore/datastore_pbs.py

@@ -1652,12 +1652,17 @@ def _v3_query_to_v1_ancestor_filter(self, v3_query, v1_property_filter):
     """
     v1_property_filter.Clear()
     v1_property_filter.set_operator(
+        v3_query.shallow() and
+        googledatastore.PropertyFilter.HAS_PARENT or
         googledatastore.PropertyFilter.HAS_ANCESTOR)
     prop = v1_property_filter.property
     prop.set_name(PROPERTY_NAME_KEY)
-    self._entity_converter.v3_to_v1_key(
-        v3_query.ancestor(),
-        v1_property_filter.value.mutable_key_value)
+    if v3_query.has_ancestor():
+      self._entity_converter.v3_to_v1_key(
+          v3_query.ancestor(),
+          v1_property_filter.value.mutable_key_value)
+    else:
+      v1_property_filter.value.null_value = googledatastore.NULL_VALUE
 
   def v3_order_to_v1_order(self, v3_order, v1_order):
     """Converts a v3 Query order to a v1 PropertyOrder.

appengine-compat/exported_appengine_sdk/google/appengine/datastore/datastore_stub_util.py

@@ -1281,6 +1281,17 @@ def __init__(self, query, dsquery, orders, index_list, results):
           new_results.append(result)
       results = new_results
 
+    if query.shallow():
+      key_path_length = 1
+      if query.has_ancestor():
+        key_path_length += query.ancestor().path().element_size()
+
+      new_results = []
+      for result in results:
+        if result.entity.key().path().element_size() == key_path_length:
+          new_results.append(result)
+      results = new_results
+
     if (query.has_compiled_cursor()
         and query.compiled_cursor().has_postfix_position()):
       start_cursor = self._DecodeCompiledCursor(query.compiled_cursor())
@@ -3820,7 +3831,7 @@ def v3_to_v1_query(self, v3_query, v1_query):
 
 
     num_v1_filters = len(v3_query.filter_list())
-    if v3_query.has_ancestor():
+    if v3_query.has_ancestor() or v3_query.shallow():
       num_v1_filters += 1
 
     if num_v1_filters == 1:
@@ -3830,7 +3841,7 @@ def v3_to_v1_query(self, v3_query, v1_query):
           googledatastore.CompositeFilter.AND)
       get_property_filter = self.__add_property_filter_from_V1
 
-    if v3_query.has_ancestor():
+    if v3_query.has_ancestor() or v3_query.shallow():
       self._v3_query_to_v1_ancestor_filter(v3_query,
                                            get_property_filter(v1_query))
     for v3_filter in v3_query.filter_list():
@@ -3861,19 +3872,30 @@ def __populate_v3_filters_from_v1(self, v1_filter, v3_query):
     if filter_type == 'property_filter':
       v1_property_filter = v1_filter.property_filter
       v1_property_name = v1_property_filter.property.name
-      if (v1_property_filter.op
-          == googledatastore.PropertyFilter.HAS_ANCESTOR):
-        datastore_pbs.check_conversion(
-            v1_property_filter.value.HasField('key_value'),
-            'HAS_ANCESTOR requires a reference value')
+      if (v1_property_filter.op == googledatastore.PropertyFilter.HAS_PARENT or
+          v1_property_filter.op == googledatastore.PropertyFilter.HAS_ANCESTOR):
+        if v1_property_filter.op == googledatastore.PropertyFilter.HAS_PARENT:
+          datastore_pbs.check_conversion(
+              v1_property_filter.value.HasField('key_value') or
+              v1_property_filter.value.HasField('null_value'),
+              'HAS_PARENT requires a key value or null')
+        else:
+          datastore_pbs.check_conversion(
+              v1_property_filter.value.HasField('key_value'),
+              'HAS_ANCESTOR requires a key value')
         datastore_pbs.check_conversion((v1_property_name
                                         == datastore_pbs.PROPERTY_NAME_KEY),
                                        'unsupported property')
-        datastore_pbs.check_conversion(not v3_query.has_ancestor(),
-                                       'duplicate ancestor constraint')
-        self._entity_converter.v1_to_v3_reference(
-            v1_property_filter.value.key_value,
-            v3_query.mutable_ancestor())
+        datastore_pbs.check_conversion(not v3_query.has_ancestor() and
+                                       not v3_query.shallow(),
+                                       'duplicate ancestor or parent '
+                                       'constraint')
+        if v1_property_filter.value.HasField('key_value'):
+          self._entity_converter.v1_to_v3_reference(
+              v1_property_filter.value.key_value,
+              v3_query.mutable_ancestor())
+        if v1_property_filter.op == googledatastore.PropertyFilter.HAS_PARENT:
+          v3_query.set_shallow(True)
       else:
         v3_filter = v3_query.add_filter()
         property_name = v1_property_name