Mirrors/unleash.unleash
1
0
Fork 0
mirror of https://github.com/Unleash/unleash.git synced 2025-08-27 13:49:10 +02:00
Code Issues Projects Releases Wiki Activity

Revert "feat: optimize search (#7387)"

Browse Source 
This reverts commit 906940948b.
This commit is contained in:
Jaanus Sellin 2024-06-13 15:00:16 +03:00 committed by GitHub
parent 09d9676d66
commit 1d427988f4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
src/lib/features/feature-search/feature-search-store.ts
View File

@ -164,6 +164,12 @@ class FeatureSearchStore implements IFeatureSearchStore {
selectColumns = [ selectColumns = [
...selectColumns, ...selectColumns,
this.db.raw(
'has_strategies.feature_name IS NOT NULL AS has_strategies',
),
this.db.raw(
'enabled_strategies.feature_name IS NOT NULL AS has_enabled_strategies',
),
this.db.raw(`CASE this.db.raw(`CASE
WHEN dependent_features.parent = features.name THEN 'parent' WHEN dependent_features.parent = features.name THEN 'parent'
WHEN dependent_features.child = features.name THEN 'child' WHEN dependent_features.child = features.name THEN 'child'
@ -242,6 +248,8 @@ class FeatureSearchStore implements IFeatureSearchStore {
'features.created_by_user_id', 'features.created_by_user_id',
); );
this.applyStrategiesByEnvironment(query);
query.leftJoin('last_seen_at_metrics', function () { query.leftJoin('last_seen_at_metrics', function () {
this.on( this.on(
'last_seen_at_metrics.environment', 'last_seen_at_metrics.environment',
@ -321,8 +329,6 @@ class FeatureSearchStore implements IFeatureSearchStore {
.joinRaw('CROSS JOIN total_features') .joinRaw('CROSS JOIN total_features')
.whereBetween('final_rank', [offset + 1, offset + limit]) .whereBetween('final_rank', [offset + 1, offset + limit])
.orderBy('final_rank'); .orderBy('final_rank');
this.applyStrategiesByEnvironment(finalQuery);
if (featureLifecycleEnabled) { if (featureLifecycleEnabled) {
finalQuery.leftJoin( finalQuery.leftJoin(
'lifecycle', 'lifecycle',
@ -351,14 +357,6 @@ class FeatureSearchStore implements IFeatureSearchStore {
} }
private applyStrategiesByEnvironment(queryBuilder: Knex.QueryBuilder) { private applyStrategiesByEnvironment(queryBuilder: Knex.QueryBuilder) {
queryBuilder.select(
this.db.raw(
'has_strategies.feature_name IS NOT NULL AS has_strategies',
),
this.db.raw(
'enabled_strategies.feature_name IS NOT NULL AS has_enabled_strategies',
),
);
queryBuilder queryBuilder
.leftJoin( .leftJoin(
this.db this.db
@ -372,11 +370,11 @@ class FeatureSearchStore implements IFeatureSearchStore {
this.on( this.on(
'enabled_strategies.feature_name', 'enabled_strategies.feature_name',
'=', '=',
'ranked_features.feature_name', 'features.name',
).andOn( ).andOn(
'enabled_strategies.environment', 'enabled_strategies.environment',
'=', '=',
'ranked_features.environment', 'feature_environments.environment',
); );
}, },
) )
@ -390,11 +388,11 @@ class FeatureSearchStore implements IFeatureSearchStore {
this.on( this.on(
'has_strategies.feature_name', 'has_strategies.feature_name',
'=', '=',
'ranked_features.feature_name', 'features.name',
).andOn( ).andOn(
'has_strategies.environment', 'has_strategies.environment',
'=', '=',
'ranked_features.environment', 'feature_environments.environment',
); );
}, },
); );