Skip to content

Fix issue with ueh only storing one exp to var paring #31

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.

Sign up for GitHub

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 2 commits into from
Oct 19, 2016
Merged

Fix issue with ueh only storing one exp to var paring #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7760129
Fix issue with ueh only storing one exp to var paring
Oct 18, 2016
d1c3721
Remove noisy log
Oct 19, 2016
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
2 changes: 2 additions & 0 deletions ...droidTest/java/com/optimizely/user_experiment_record/AndroidUserExperimentRecordTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,9 +195,11 @@ public void startHandlesJSONException() throws IOException {
public void start() throws JSONException {
androidUserExperimentRecord.start();
androidUserExperimentRecord.save("user1", "exp1", "var1");
androidUserExperimentRecord.save("user1", "exp2", "var2");

Map<String, String> expKeyToVarKeyMap = new HashMap<>();
expKeyToVarKeyMap.put("exp1", "var1");
expKeyToVarKeyMap.put("exp2", "var2");
Map<String, Map<String, String>> recordMap = new HashMap<>();
recordMap.put("user1", expKeyToVarKeyMap);

Expand Down
2 changes: 2 additions & 0 deletions ...androidTest/java/com/optimizely/user_experiment_record/UserExperimentRecordCacheTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,11 @@ public void loadWhenNoFile() throws JSONException {
@Test
public void testSaveAndLoad() throws JSONException {
assertTrue(userExperimentRecordCache.save("foo", "exp1", "var1"));
assertTrue(userExperimentRecordCache.save("foo", "exp2", "var2"));
JSONObject expectedActivation = new JSONObject();
JSONObject expectedExpIdToVarId = new JSONObject();
expectedExpIdToVarId.put("exp1", "var1");
expectedExpIdToVarId.put("exp2", "var2");
expectedActivation.put("foo", expectedExpIdToVarId);
assertEquals(expectedActivation.toString(), userExperimentRecordCache.load().toString());
}
Expand Down
9 changes: 4 additions & 5 deletions ...cord/src/main/java/com/optimizely/user_experiment_record/AndroidUserExperimentRecord.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,10 @@ public void start() {
while (iterator2.hasNext()) {
String expId = iterator2.next();
String varId = expIdToVarIdJson.getString(expId);
Map<String, String> expIdToVarIdMap = new HashMap<>();
Map<String, String> expIdToVarIdMap = writeThroughCacheTaskFactory.getMemoryUserExperimentRecordCache().get(userId);
if (expIdToVarIdMap == null) {
expIdToVarIdMap = new HashMap<>();
}
expIdToVarIdMap.put(expId, varId);
writeThroughCacheTaskFactory.getMemoryUserExperimentRecordCache().put(userId, expIdToVarIdMap);
}
Expand Down Expand Up @@ -160,10 +163,6 @@ public String lookup(String userId, String experimentKey) {
variationKey = expIdToVarIdMap.get(experimentKey);
}

if (variationKey == null) {
logger.error("Project config did not contain matching experiment and variation ids");
}

return variationKey;
}

Expand Down
6 changes: 4 additions & 2 deletions ...record/src/main/java/com/optimizely/user_experiment_record/UserExperimentRecordCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,10 @@ boolean remove(@NonNull String userId, @NonNull String experimentId) {
boolean save(@NonNull String userId, @NonNull String experimentId, @NonNull String variationId) {
try {
JSONObject userExperimentRecord = load();
userExperimentRecord.put(userId, null);
JSONObject expIdToVarId = new JSONObject();
JSONObject expIdToVarId = userExperimentRecord.optJSONObject(userId);
if (expIdToVarId == null) {
expIdToVarId = new JSONObject();
}
expIdToVarId.put(experimentId, variationId);
userExperimentRecord.put(userId, expIdToVarId);
return cache.save(getFileName(), userExperimentRecord.toString());
Expand Down