Merge pull request #146 from inklesspen/api_config_speed

Boost API config handling speed

Author: inklesspen

endpoints/api_backend.py

@@ -36,7 +36,6 @@ class ApiConfigManager(object):
   """Manages loading api configs and method lookup."""
 
   def __init__(self):
-    self._rpc_method_dict = {}
     self._rest_methods = []
     self._configs = {}
     self._config_lock = threading.Lock()
@@ -75,7 +74,6 @@ def process_api_config_response(self, config_json):
 
 
         for method_name, method in sorted_methods:
-          self._save_rpc_method(method_name, api_version, method)
           self._save_rest_method(method_name, name, path_version, method)
 
   def _get_sorted_methods(self, methods):
@@ -167,23 +165,6 @@ def _get_path_params(match):
       result[actual_var_name] = urllib.unquote_plus(value)
     return result
 
-  def lookup_rpc_method(self, method_name, version):
-    """Lookup the JsonRPC method at call time.
-
-    The method is looked up in self._rpc_method_dict, the dictionary that
-    it is saved in for SaveRpcMethod().
-
-    Args:
-      method_name: A string containing the name of the method.
-      version: A string containing the version of the API.
-
-    Returns:
-      Method descriptor as specified in the API configuration.
-    """
-    with self._config_lock:
-      method = self._rpc_method_dict.get((method_name, version))
-    return method
-
   def lookup_rest_method(self, path, http_method):
     """Look up the rest method at call time.
 
@@ -319,19 +300,6 @@ def replace_variable(match):
                      replace_variable, pattern)
     return re.compile(pattern + '/?$')
 
-  def _save_rpc_method(self, method_name, version, method):
-    """Store JsonRpc api methods in a map for lookup at call time.
-
-    (rpcMethodName, apiVersion) => method.
-
-    Args:
-      method_name: A string containing the name of the API method.
-      version: A string containing the version of the API.
-      method: A dict containing the method descriptor (as in the api config
-        file).
-    """
-    self._rpc_method_dict[(method_name, version)] = method
-
   def _save_rest_method(self, method_name, api_name, version, method):
     """Store Rest api methods in a list for lookup at call time.
 

endpoints/api_backend_service.py

@@ -179,14 +179,5 @@ def reconstruct_full_url(self, port_override=None):
   def copy(self):
     return copy.deepcopy(self)
 
-  def is_rpc(self):
-    # Google's JsonRPC protocol creates a handler at /rpc for any Cloud
-    # Endpoints API, with api name, version, and method name being in the
-    # body of the request.
-    # If the request is sent to /rpc, we will treat it as JsonRPC.
-    # The client libraries for iOS's Objective C use RPC and not the REST
-    # versions of the API.
-    return self.path == 'rpc'
-
   def is_batch(self):
     return self._is_batch