Merge branch 'master' of https://gitlab.dkrz.de/freva/deployment into update_playbooks

assets/solr_service/create_core.sh

@@ -2,5 +2,5 @@
 
 if [ ! -d /var/solr/data/$1 ];then
     precreate-core $1
-    cp managed-schema /var/solr/data/$1/conf/
+    cp managed-schema.xml /var/solr/data/$1/conf/
 fi

assets/solr_service/managed-schema → assets/solr_service/managed-schema.xml

@@ -2,100 +2,42 @@
 <!-- Solr managed schema - automatically generated - DO NOT EDIT -->
 <schema name="file_system" version="1.6">
   <uniqueKey>file</uniqueKey>
-  <fieldType name="ancestor_path" class="solr.TextField">
-    <analyzer type="index">
-      <tokenizer class="solr.KeywordTokenizerFactory"/>
-    </analyzer>
-    <analyzer type="query">
-      <tokenizer class="solr.PathHierarchyTokenizerFactory" delimiter="/"/>
-    </analyzer>
-  </fieldType>
-  <fieldType name="binary" class="solr.BinaryField"/>
-  <fieldType name="boolean" class="solr.BoolField" sortMissingLast="true"/>
-  <fieldType name="booleans" class="solr.BoolField" sortMissingLast="true" multiValued="true"/>
-  <fieldType name="descendent_path" class="solr.TextField">
-    <analyzer type="index">
-      <tokenizer class="solr.PathHierarchyTokenizerFactory" delimiter="/"/>
-    </analyzer>
-    <analyzer type="query">
-      <tokenizer class="solr.KeywordTokenizerFactory"/>
-    </analyzer>
-  </fieldType>
-  <fieldType name="ignored" class="solr.StrField" indexed="false" stored="false" multiValued="true"/>
-  <fieldType name="location" class="solr.LatLonType" subFieldSuffix="_coordinate"/>
-  <fieldType name="location_rpt" class="solr.SpatialRecursivePrefixTreeFieldType" geo="true" maxDistErr="0.001" distErrPct="0.025" distanceUnits="kilometers"/>
-  <fieldType name="lowercase" class="solr.TextField" positionIncrementGap="100">
-    <analyzer>
-      <tokenizer class="solr.KeywordTokenizerFactory"/>
-      <filter class="solr.LowerCaseFilterFactory"/>
-    </analyzer>
-  </fieldType>
-  <fieldType name="phonetic_en" class="solr.TextField" indexed="true" stored="false">
-    <analyzer>
-      <tokenizer class="solr.StandardTokenizerFactory"/>
-      <filter class="solr.DoubleMetaphoneFilterFactory" inject="false"/>
-    </analyzer>
-  </fieldType>
   <fieldType name="pdate" class="solr.DatePointField" docValues="true"/>
   <fieldType name="pdates" class="solr.DatePointField" docValues="true" multiValued="true"/>
-  <fieldType name="pdouble" class="solr.DoublePointField" docValues="true"/>
   <fieldType name="pdoubles" class="solr.DoublePointField" docValues="true" multiValued="true"/>
   <fieldType name="pfloat" class="solr.FloatPointField" docValues="true"/>
-  <fieldType name="pfloats" class="solr.FloatPointField" docValues="true" multiValued="true"/>
-  <fieldType name="pint" class="solr.IntPointField" docValues="true"/>
-  <fieldType name="pints" class="solr.IntPointField" docValues="true" multiValued="true"/>
   <fieldType name="plong" class="solr.LongPointField" docValues="true"/>
   <fieldType name="plongs" class="solr.LongPointField" docValues="true" multiValued="true"/>
-  <fieldType name="point" class="solr.PointType" subFieldSuffix="_d" dimension="2"/>
-  <fieldType name="random" class="solr.RandomSortField" indexed="true"/>
   <fieldType name="string" class="solr.StrField" sortMissingLast="true"/>
-  <fieldType name="strings" class="solr.StrField" sortMissingLast="true" multiValued="true"/>
-  <!-- The StrField type is not analyzed, but indexed/stored verbatim. -->
+  <fieldType name="booleans" class="solr.BoolField" sortMissingLast="true" multiValued="true"/>
+
   <fieldType name="version" class="solr.TextField" >
     <analyzer>
         <charFilter class="solr.PatternReplaceCharFilterFactory" pattern="^v"/>
         <tokenizer class="solr.KeywordTokenizerFactory"/>
     </analyzer>
-   </fieldType>
-   <!-- A general text field that has reasonable, generic
-       cross-language defaults: it tokenizes with StandardTokenizer,
-       removes stop words from case-insensitive "stopwords.txt"
-       (empty by default), and down cases.  At query time only, it
-       also applies synonyms. -->
-   <fieldType name="text_general" class="solr.TextField" positionIncrementGap="100">
-      <analyzer type="index">
-        <tokenizer class="solr.KeywordTokenizerFactory"/>
-        <!-- in this example, we will only use synonyms at query time
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" enablePositionIncrements="true" />
-        <filter class="solr.SynonymFilterFactory" synonyms="index_synonyms.txt" ignoreCase="true" expand="false"/>
-        -->
-        <filter class="solr.LowerCaseFilterFactory"/>
-      </analyzer>
-      <analyzer type="query">
-        <tokenizer class="solr.KeywordTokenizerFactory"/>
-        <!--
-        <filter class="solr.StopFilterFactory" ignoreCase="true" words="stopwords.txt" enablePositionIncrements="true" />
-        -->
-        <filter class="solr.SynonymFilterFactory" synonyms="synonyms.txt" ignoreCase="true" expand="true"/>
-        <filter class="solr.LowerCaseFilterFactory"/>
-      </analyzer>
-    </fieldType>
+  </fieldType>
 
+  <fieldType name="text_general" class="solr.TextField" positionIncrementGap="100">
+    <analyzer type="index">
+      <tokenizer class="solr.KeywordTokenizerFactory"/>
+      <filter class="solr.LowerCaseFilterFactory"/>
+    </analyzer>
+    <analyzer type="query">
+      <tokenizer class="solr.KeywordTokenizerFactory"/>
+      <filter class="solr.LowerCaseFilterFactory"/>
+    </analyzer>
+  </fieldType>
 
   <field name="_version_" type="plong" indexed="true" stored="true"/>
-  <!-- base entries for the search (path and timestamp) -->
   <field name="file" type="string" multiValued="false" indexed="true" required="true" stored="true"/>
   <field name="timestamp" type="pfloat" indexed="false" stored="true"/>
   <field name="creation_time" type="pdate" indexed="true" stored="false" default="NOW"/>
+
   <!-- we need this to search for latest version.
   If not it won't work for entries not being versioned at all -->
   <field name="version" type="version" stored="false" indexed="true" default="-1"/>
   <field name="file_no_version" type="string" stored="false" indexed="true"/>
-
-  <!-- everything else will get indexed but not stored -->
   <field name="_root_" type="string" indexed="false" stored="false" docValues="false"/>
   <dynamicField name="*" type="text_general" stored="true" indexed="true" multiValued="true"/>
-  <!--
-  <copyField source="content" dest="text_shingles"/>
-  <copyField source="*" dest="_text_"/> -->
 </schema>

src/freva_deployment/deploy.py

@@ -299,7 +299,7 @@ class DeployFactory:
     def _get_files_copy(self, key) -> Path | None:
         return dict(
             db=self._dump_file,
-            solr=(self.aux_dir / "managed-schema").absolute(),
+            solr=(self.aux_dir / "managed-schema.xml").absolute(),
             core=self.eval_conf_file.absolute(),
             web=self.eval_conf_file.absolute(),
         ).get(key, None)