浏览代码

HUE-5116 [search] Support basic indexing in Solr 6 non cloud

Romain Rigaux 9 年之前
父节点
当前提交
279b475

+ 1 - 0
apps/oozie/src/oozie/templates/editor2/list_editor_bundles.mako

@@ -18,6 +18,7 @@
   from desktop.views import commonheader, commonfooter, commonshare, commonimportexport, _ko
   from django.utils.translation import ugettext as _
 %>
+
 <%namespace name="actionbar" file="../actionbar.mako" />
 <%namespace name="layout" file="../navigation-bar.mako" />
 <%namespace name="utils" file="../utils.inc.mako" />

+ 1 - 0
desktop/core/src/desktop/templates/common_footer.mako

@@ -17,6 +17,7 @@
 from django.http import HttpRequest
 from django.utils.translation import ugettext as _
 from django.template.defaultfilters import escape, escapejs
+
 from desktop.lib.i18n import smart_unicode
 from desktop.views import login_modal
 %>

+ 0 - 1
desktop/core/src/desktop/views.py

@@ -76,7 +76,6 @@ def responsive(request):
     'interpreters': get_ordered_interpreters(request.user),
     'is_s3_enabled': is_s3_enabled() and has_s3_access(request.user),
     'is_ldap_setup': 'desktop.auth.backend.LdapBackend' in desktop.conf.AUTH.BACKEND.get(),
-    'messages': {},
     'leaflet': {
       'layer': desktop.conf.LEAFLET_TILE_LAYER.get(),
       'attribution': desktop.conf.LEAFLET_TILE_LAYER_ATTRIBUTION.get()

+ 4 - 1
desktop/libs/indexer/src/data/solrconfigs/nonsolrcloud/conf/schema.xml

@@ -224,8 +224,10 @@
 
     <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
 
+    <!--
     <fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType"
         geo="true" distErrPct="0.025" maxDistErr="0.000009" units="degrees" />
+    -->
 
     <fieldType name="currency" class="solr.CurrencyField" precisionStep="8" defaultCurrency="USD" currencyConfig="currency.xml" />
 
@@ -561,6 +563,7 @@
     </fieldType>
 
     <!-- Thai -->
+    <!--
     <fieldType name="text_th" class="solr.TextField" positionIncrementGap="100">
       <analyzer>
         <tokenizer class="solr.StandardTokenizerFactory"/>
@@ -569,7 +572,7 @@
         <filter class="solr.StopFilterFactory" ignoreCase="true" words="lang/stopwords_th.txt" />
       </analyzer>
     </fieldType>
-
+   -->
     <!-- Turkish -->
     <fieldType name="text_tr" class="solr.TextField" positionIncrementGap="100">
       <analyzer>

+ 2 - 0
desktop/libs/indexer/src/data/solrconfigs/nonsolrcloud/conf/solrconfig.xml

@@ -1106,8 +1106,10 @@
        Admin Handlers - This will register all the standard admin
        RequestHandlers.  
     -->
+  <!--
   <requestHandler name="/admin/"
                   class="solr.admin.AdminHandlers" />
+  -->
   <!-- This single handler is equivalent to the following... -->
   <!--
      <requestHandler name="/admin/luke"       class="solr.admin.LukeRequestHandler" />

+ 1 - 0
desktop/libs/indexer/src/indexer/controller.py

@@ -272,6 +272,7 @@ class CollectionManagerController(object):
     ROW_COUNT = 0
     FETCH_BATCH = 1000
     has_more = True
+
     api = SolrApi(SOLR_URL.get(), self.user, SECURITY_ENABLED.get())
 
     try:

+ 2 - 0
desktop/libs/libsolr/src/libsolr/api.py

@@ -47,6 +47,7 @@ def utf_quoter(what):
 def search_enabled():
   return type(SECURITY_ENABLED) == BoundConfig
 
+
 class SolrApi(object):
   """
   http://wiki.apache.org/solr/CoreAdmin#CoreAdminHandler
@@ -895,6 +896,7 @@ class SolrApi(object):
     params = self._get_params() + (
         ('wt', 'json'),
         ('overwrite', 'true'),
+        ('commit', 'true'),
     )
     if version is not None:
       params += (