Skip to content

Commit 926749f

Browse files
Merge #638
638: Remove in the next version non-exitant experimental feature r=irevoire a=CommanderStorm # Pull Request ## Related issue related to #637 ## What does this PR do? - Remove in the next version non-exitant experimental feature ## PR checklist Please check if your PR fulfills the following requirements: - [x] Does this PR fix an existing issue, or have you listed the changes applied in the PR description (and why they are needed)? - [x] Have you read the contributing guidelines? - [x] Have you made sure that the title is accurate and descriptive of the changes? Thank you so much for contributing to Meilisearch! Co-authored-by: Frank Elsinga <[email protected]>
2 parents a9fd707 + 3bc9691 commit 926749f

File tree

3 files changed

+13
-38
lines changed

3 files changed

+13
-38
lines changed

.code-samples.meilisearch.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1649,8 +1649,8 @@ get_experimental_features_1: |-
16491649
.unwrap();
16501650
update_experimental_features_1: |-
16511651
let client = Client::new("http://localhost:7700", Some("apiKey"));
1652-
let mut features = ExperimentalFeatures::new(&client);
1653-
features.set_vector_store(true);
1652+
let features = ExperimentalFeatures::new(&client);
1653+
// update the feature you want here
16541654
let res = features
16551655
.update()
16561656
.await

src/features.rs

Lines changed: 10 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,7 @@ use serde::{Deserialize, Serialize};
88
/// Struct representing the experimental features result from the API.
99
#[derive(Clone, Debug, Deserialize)]
1010
#[serde(rename_all = "camelCase")]
11-
pub struct ExperimentalFeaturesResult {
12-
pub vector_store: bool,
13-
}
11+
pub struct ExperimentalFeaturesResult {}
1412

1513
/// Struct representing the experimental features request.
1614
///
@@ -24,29 +22,18 @@ pub struct ExperimentalFeaturesResult {
2422
/// # let MEILISEARCH_API_KEY = option_env!("MEILISEARCH_API_KEY").unwrap_or("masterKey");
2523
/// # let client = Client::new(MEILISEARCH_URL, Some(MEILISEARCH_API_KEY)).unwrap();
2624
/// let mut features = ExperimentalFeatures::new(&client);
27-
/// features.set_vector_store(true);
2825
/// ```
2926
#[derive(Debug, Serialize)]
3027
#[serde(rename_all = "camelCase")]
3128
pub struct ExperimentalFeatures<'a, Http: HttpClient> {
3229
#[serde(skip_serializing)]
3330
client: &'a Client<Http>,
34-
#[serde(skip_serializing_if = "Option::is_none")]
35-
pub vector_store: Option<bool>,
3631
}
3732

3833
impl<'a, Http: HttpClient> ExperimentalFeatures<'a, Http> {
3934
#[must_use]
4035
pub fn new(client: &'a Client<Http>) -> Self {
41-
ExperimentalFeatures {
42-
client,
43-
vector_store: None,
44-
}
45-
}
46-
47-
pub fn set_vector_store(&mut self, vector_store: bool) -> &mut Self {
48-
self.vector_store = Some(vector_store);
49-
self
36+
ExperimentalFeatures { client }
5037
}
5138

5239
/// Get all the experimental features
@@ -83,11 +70,10 @@ impl<'a, Http: HttpClient> ExperimentalFeatures<'a, Http> {
8370
/// # let MEILISEARCH_URL = option_env!("MEILISEARCH_URL").unwrap_or("http://localhost:7700");
8471
/// # let MEILISEARCH_API_KEY = option_env!("MEILISEARCH_API_KEY").unwrap_or("masterKey");
8572
/// # let client = Client::new(MEILISEARCH_URL, Some(MEILISEARCH_API_KEY)).unwrap();
86-
/// tokio::runtime::Builder::new_current_thread().enable_all().build().unwrap().block_on(async {
87-
/// let mut features = ExperimentalFeatures::new(&client);
88-
/// features.set_vector_store(true);
89-
/// features.update().await.unwrap();
90-
/// });
73+
/// # tokio::runtime::Builder::new_current_thread().enable_all().build().unwrap().block_on(async {
74+
/// let features = ExperimentalFeatures::new(&client);
75+
/// features.update().await.unwrap();
76+
/// # });
9177
/// ```
9278
pub async fn update(&self) -> Result<ExperimentalFeaturesResult, Error> {
9379
self.client
@@ -111,22 +97,11 @@ mod tests {
11197

11298
#[meilisearch_test]
11399
async fn test_experimental_features_get(client: Client) {
114-
let mut features = ExperimentalFeatures::new(&client);
115-
features.set_vector_store(false);
100+
let features = ExperimentalFeatures::new(&client);
101+
// set feature here, once some exist again
116102
let _ = features.update().await.unwrap();
117103

118-
let res = features.get().await.unwrap();
119-
120-
assert!(!res.vector_store);
121-
}
122-
123-
#[meilisearch_test]
124-
async fn test_experimental_features_enable_vector_store(client: Client) {
125-
let mut features = ExperimentalFeatures::new(&client);
126-
features.set_vector_store(true);
127-
128-
let res = features.update().await.unwrap();
129-
130-
assert!(res.vector_store);
104+
let _res = features.get().await.unwrap();
105+
// assert that the feature has been set once they exist again
131106
}
132107
}

src/tenant_tokens.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pub fn generate_tenant_token(
2929
return Err(Error::InvalidUuid4Version);
3030
}
3131

32-
if expires_at.map_or(false, |expires_at| OffsetDateTime::now_utc() > expires_at) {
32+
if expires_at.is_some_and(|expires_at| OffsetDateTime::now_utc() > expires_at) {
3333
return Err(Error::TenantTokensExpiredSignature);
3434
}
3535

0 commit comments

Comments
 (0)