config: Change fields to be a list instead of map

Author: tontinton

example_config.yaml

@@ -4,16 +4,16 @@ path: /tmp/toshokan
 schema:
   time_field: timestamp
   fields:
-    timestamp:
+    - name: timestamp
       type: !datetime
         formats:
           - timestamp
         indexed: true
         stored: true
         fast: true
-    tenant_id:
+    - name: tenant_id
       type: !number
         type: u64
-    resource:
+    - name: resource
       type: !dynamic_object
         expand_dots: true

src/commands/index.rs

@@ -1,5 +1,3 @@
-use std::collections::HashMap;
-
 use color_eyre::{eyre::eyre, Result};
 use sqlx::PgPool;
 use tantivy::{
@@ -32,11 +30,12 @@ fn common_parse(value: serde_json::Value) -> Result<OwnedValue> {
 }
 
 fn get_field_parsers(
-    fields: HashMap<String, FieldsConfig>,
+    fields: Vec<FieldsConfig>,
     schema_builder: &mut SchemaBuilder,
 ) -> Result<Vec<FieldParsers>> {
     let mut field_parsers: Vec<FieldParsers> = Vec::with_capacity(fields.len());
-    for (name, schema) in fields {
+    for schema in fields {
+        let name = schema.name;
         match schema.type_ {
             FieldType::Text(options) => {
                 let field = schema_builder.add_text_field(&name, options);

src/config/mod.rs

@@ -5,7 +5,7 @@ pub mod ip;
 pub mod number;
 pub mod text;
 
-use std::{collections::HashMap, path::Path};
+use std::path::Path;
 
 use color_eyre::eyre::Result;
 use serde::{Deserialize, Serialize};
@@ -100,6 +100,8 @@ pub enum FieldType {
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
 pub struct FieldsConfig {
+    pub name: String,
+
     #[serde(rename = "type")]
     pub type_: FieldType,
 }
@@ -123,7 +125,7 @@ impl FieldsConfig {
 #[derive(Debug, Clone, Serialize, Deserialize, Default)]
 pub struct IndexSchema {
     #[serde(default)]
-    pub fields: HashMap<String, FieldsConfig>,
+    pub fields: Vec<FieldsConfig>,
 
     #[serde(default)]
     #[serde(skip_serializing_if = "Option::is_none")]
@@ -134,9 +136,8 @@ impl IndexSchema {
     pub fn get_indexed_fields(&self) -> Vec<String> {
         self.fields
             .iter()
-            .filter(|(_, v)| v.is_indexed())
-            .map(|(k, _)| k)
-            .cloned()
+            .filter(|x| x.is_indexed())
+            .map(|x| x.name.clone())
             .collect()
     }
 }