From cf4a466b6b2828ece1a2dbda0c6bb0397c1c5dfc Mon Sep 17 00:00:00 2001
From: Kerollmops <clement@meilisearch.com>
Date: Wed, 25 Aug 2021 10:17:33 +0200
Subject: [PATCH] Make sure that the order of the filterableAttributes is
 constant

---
 meilisearch-http/src/index/updates.rs           | 6 ++++--
 meilisearch-http/src/routes/indexes/settings.rs | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/meilisearch-http/src/index/updates.rs b/meilisearch-http/src/index/updates.rs
index b13e66efe..00684a117 100644
--- a/meilisearch-http/src/index/updates.rs
+++ b/meilisearch-http/src/index/updates.rs
@@ -55,7 +55,7 @@ pub struct Settings<T> {
     pub searchable_attributes: Setting<Vec<String>>,
 
     #[serde(default, skip_serializing_if = "Setting::is_not_set")]
-    pub filterable_attributes: Setting<HashSet<String>>,
+    pub filterable_attributes: Setting<BTreeSet<String>>,
     #[serde(default, skip_serializing_if = "Setting::is_not_set")]
     pub sortable_attributes: Setting<BTreeSet<String>>,
     #[serde(default, skip_serializing_if = "Setting::is_not_set")]
@@ -254,7 +254,9 @@ impl Index {
         }
 
         match settings.filterable_attributes {
-            Setting::Set(ref facets) => builder.set_filterable_fields(facets.clone()),
+            Setting::Set(ref facets) => {
+                builder.set_filterable_fields(facets.clone().into_iter().collect())
+            }
             Setting::Reset => builder.reset_filterable_fields(),
             Setting::NotSet => (),
         }
diff --git a/meilisearch-http/src/routes/indexes/settings.rs b/meilisearch-http/src/routes/indexes/settings.rs
index b542d3260..05a4f308f 100644
--- a/meilisearch-http/src/routes/indexes/settings.rs
+++ b/meilisearch-http/src/routes/indexes/settings.rs
@@ -75,7 +75,7 @@ macro_rules! make_setting_route {
 
 make_setting_route!(
     "/filterable-attributes",
-    std::collections::HashSet<String>,
+    std::collections::BTreeSet<String>,
     filterable_attributes,
     "filterableAttributes"
 );