Skip to content

[FSSDK-9417] refactor: improve OptimizelyConfig instantiation performance #828

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 2, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 30 additions & 19 deletions packages/optimizely-sdk/lib/core/optimizely_config/index.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/**
* Copyright 2020-2021, Optimizely
* Copyright 2020-2023, Optimizely
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
Expand Down Expand Up @@ -74,9 +74,15 @@ export class OptimizelyConfig {
return resultMap;
}, {});

const experimentsMapById = OptimizelyConfig.getExperimentsMapById(configObj, featureIdVariablesMap);
const variableIdMap = OptimizelyConfig.getVariableIdMap(configObj);

const experimentsMapById = OptimizelyConfig.getExperimentsMapById(
configObj, featureIdVariablesMap, variableIdMap
);
this.experimentsMap = OptimizelyConfig.getExperimentsKeyMap(experimentsMapById);
this.featuresMap = OptimizelyConfig.getFeaturesMap(configObj, featureIdVariablesMap, experimentsMapById);
this.featuresMap = OptimizelyConfig.getFeaturesMap(
configObj, featureIdVariablesMap, experimentsMapById, variableIdMap
);
this.datafile = datafile;
}

Expand Down Expand Up @@ -242,7 +248,7 @@ export class OptimizelyConfig {
* Gets Map of all experiment variations and variables including rollouts
* @param {Variation[]} variations
* @param {FeatureVariablesMap} featureIdVariableMap
* @param {[id: string]: FeatureVariable} variableIdMap
* @param {{[id: string]: FeatureVariable}} variableIdMap
* @param {string} featureId
* @returns {[key: string]: Variation} Variations mapped by key
*/
Expand Down Expand Up @@ -292,19 +298,20 @@ export class OptimizelyConfig {

/**
* Gets list of rollout experiments
* @param {ProjectConfig} configObj
* @param {FeatureVariablesMap} featureVariableIdMap
* @param {string} featureId
* @param {Experiment[]} experiments
* @returns {OptimizelyExperiment[]} List of Optimizely rollout experiments
* @param {ProjectConfig} configObj
* @param {FeatureVariablesMap} featureVariableIdMap
* @param {string} featureId
* @param {Experiment[]} experiments
* @param {{[id: string]: FeatureVariable}} variableIdMap
* @returns {OptimizelyExperiment[]} List of Optimizely rollout experiments
*/
static getDeliveryRules(
configObj: ProjectConfig,
featureVariableIdMap: FeatureVariablesMap,
featureId: string,
experiments: Experiment[]
experiments: Experiment[],
variableIdMap: {[id: string]: FeatureVariable}
): OptimizelyExperiment[] {
const variableIdMap = OptimizelyConfig.getVariableIdMap(configObj);
return experiments.map((experiment) => {
return {
id: experiment.id,
Expand Down Expand Up @@ -339,13 +346,14 @@ export class OptimizelyConfig {
* Get experiments mapped by their id's which are not part of a rollout
* @param {ProjectConfig} configObj
* @param {FeatureVariablesMap} featureIdVariableMap
* @param {{[id: string]: FeatureVariable}} variableIdMap
* @returns {[id: string]: OptimizelyExperiment} Experiments mapped by id
*/
static getExperimentsMapById(
configObj: ProjectConfig,
featureIdVariableMap: FeatureVariablesMap
featureIdVariableMap: FeatureVariablesMap,
variableIdMap: {[id: string]: FeatureVariable}
): { [id: string]: OptimizelyExperiment } {
const variableIdMap = OptimizelyConfig.getVariableIdMap(configObj);
const rolloutExperimentIds = this.getRolloutExperimentIds(configObj.rollouts);

const experiments = configObj.experiments;
Expand Down Expand Up @@ -391,15 +399,17 @@ export class OptimizelyConfig {

/**
* Gets Map of all FeatureFlags and associated experiment map inside it
* @param {ProjectConfig} configObj
* @param {FeatureVariablesMap} featureVariableIdMap
* @param {OptimizelyExperimentsMap} experimentsMapById
* @returns {OptimizelyFeaturesMap} OptimizelyFeature mapped by key
* @param {ProjectConfig} configObj
* @param {FeatureVariablesMap} featureVariableIdMap
* @param {OptimizelyExperimentsMap} experimentsMapById
* @param {{[id: string]: FeatureVariable}} variableIdMap
* @returns {OptimizelyFeaturesMap} OptimizelyFeature mapped by key
*/
static getFeaturesMap(
configObj: ProjectConfig,
featureVariableIdMap: FeatureVariablesMap,
experimentsMapById: OptimizelyExperimentsMap
experimentsMapById: OptimizelyExperimentsMap,
variableIdMap: {[id: string]: FeatureVariable}
): OptimizelyFeaturesMap {
const featuresMap: OptimizelyFeaturesMap = {};
configObj.featureFlags.forEach((featureFlag) => {
Expand Down Expand Up @@ -428,7 +438,8 @@ export class OptimizelyConfig {
configObj,
featureVariableIdMap,
featureFlag.id,
rollout.experiments
rollout.experiments,
variableIdMap,
);
}
featuresMap[featureFlag.key] = {
Expand Down