Browse Source

HUE-5304 [indexer] Move Solr Controller2 to SolrClient

Romain Rigaux 8 years ago
parent
commit
0535412584

+ 4 - 4
desktop/libs/indexer/src/indexer/api2.py

@@ -26,7 +26,7 @@ from desktop.lib.exceptions_renderable import PopupException
 from libsolr.api import SolrApi
 from search.conf import SOLR_URL, SECURITY_ENABLED
 
-from indexer.controller2 import IndexController
+from indexer.solr_client import SolrClient
 from indexer.utils import get_default_fields
 
 
@@ -42,7 +42,7 @@ def create_index(request):
   name = request.POST.get('name')
 
   if name:
-    searcher = IndexController(request.user)
+    searcher = SolrClient(request.user)
 
     try:
       collection = searcher.create_index(
@@ -74,7 +74,7 @@ def delete_indexes(request):
   if not indexes:
     response['message'] = _('No indexes to remove.')
   else:
-    searcher = IndexController(request.user)
+    searcher = SolrClient(request.user)
 
     for index in indexes:
       if index['type'] == 'collection':
@@ -150,7 +150,7 @@ def design_schema(request, index):
   result = {'status': -1, 'message': ''}
 
   try:
-    searcher = IndexController(request.user)
+    searcher = SolrClient(request.user)
     unique_key, fields = searcher.get_index_schema(index)
 
     result['status'] = 0

+ 3 - 3
desktop/libs/indexer/src/indexer/controller2.py → desktop/libs/indexer/src/indexer/solr_client.py

@@ -46,11 +46,11 @@ ZK_SOLR_CONFIG_NAMESPACE = 'configs'
 IS_SOLR_CLOUD = None
 
 
-class IndexControllerException(Exception):
+class SolrClientException(Exception):
   pass
 
 
-class IndexController(object):
+class SolrClient(object):
   """
   Glue the models to the views.
   """
@@ -195,7 +195,7 @@ class IndexController(object):
       return uniquekey, fields
     except Exception, e:
       LOG.exception(e.message)
-      raise IndexControllerException(_("Error in getting schema information for index '%s'" % index_name))
+      raise SolrClientException(_("Error in getting schema information for index '%s'" % index_name))
 
 
   def delete_alias(self, name):

+ 3 - 3
desktop/libs/indexer/src/indexer/views.py

@@ -24,7 +24,7 @@ from desktop.lib.django_util import JsonResponse, render
 from desktop.lib.exceptions_renderable import PopupException
 from desktop.models import get_cluster_config
 
-from indexer.controller2 import IndexController
+from indexer.solr_client import SolrClient
 from indexer.fields import FIELD_TYPES, Field
 from indexer.file_format import get_file_indexable_format_types
 from indexer.management.commands import indexer_setup
@@ -47,7 +47,7 @@ def indexes(request):
   if not request.user.has_hue_permission(action="access", app='search'):
     raise PopupException(_('Missing permission.'), error_code=403)
 
-  searcher = IndexController(request.user)
+  searcher = SolrClient(request.user)
   indexes = searcher.get_indexes()
 
   for index in indexes:
@@ -62,7 +62,7 @@ def indexer(request):
   if not request.user.has_hue_permission(action="access", app='search'):
     raise PopupException(_('Missing permission.'), error_code=403)
 
-  searcher = IndexController(request.user)
+  searcher = SolrClient(request.user)
   indexes = searcher.get_indexes()
 
   for index in indexes: