Skip to content
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

Jump to bottom

[#12048] Hot fix for migration #13092

Merged
merged 1 commit into from
Apr 24, 2024
Merged

[#12048] Hot fix for migration #13092

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 1 addition & 1 deletion ...ient/java/teammates/client/scripts/sql/DataMigrationForAccountAndReadNotificationSql.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ private boolean isPreview() {
* Returns whether the account has been migrated.
*/
protected boolean isMigrationNeeded(teammates.storage.entity.Account entity) {
return !entity.isMigrated();
return true;
}

/**
Expand Down
2 changes: 1 addition & 1 deletion src/client/java/teammates/client/scripts/sql/DataMigrationForCourseEntitySql.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ public class DataMigrationForCourseEntitySql extends DatastoreClient {
AtomicLong numberOfScannedKey;
AtomicLong numberOfUpdatedEntities;

private static final int MAX_RESPONSE_COUNT = 10000;
private static final int MAX_RESPONSE_COUNT = -1;

private VerifyCourseEntityAttributes verifier;

Expand Down
2 changes: 1 addition & 1 deletion src/client/java/teammates/client/scripts/sql/DataMigrationForCourseEntitySql50Newest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public class DataMigrationForCourseEntitySql50Newest extends DatastoreClient {
AtomicLong numberOfScannedKey;
AtomicLong numberOfUpdatedEntities;

private static final int MAX_RESPONSE_COUNT = 10000;
private static final int MAX_RESPONSE_COUNT = -1;

private VerifyCourseEntityAttributes verifier;

Expand Down
3 changes: 2 additions & 1 deletion src/client/java/teammates/client/scripts/sql/DataMigrationForCourseEntitySql50Oldest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ public class DataMigrationForCourseEntitySql50Oldest extends DatastoreClient {
AtomicLong numberOfScannedKey;
AtomicLong numberOfUpdatedEntities;

private static final int MAX_RESPONSE_COUNT = 10000;
private static final int MAX_RESPONSE_COUNT = -1;

private VerifyCourseEntityAttributes verifier;

Expand Down Expand Up @@ -323,6 +323,7 @@ private void migrateFeedbackQuestion(teammates.storage.sqlentity.FeedbackSession
oldResponses = ofy().load().type(FeedbackResponse.class)
.filter("feedbackQuestionId", oldQuestion.getId()).list();
}
log(String.format("Feedback question %d has %d responses associated with it", oldQuestion.getQuestionNumber(), oldResponses.size()));
for (FeedbackResponse oldResponse : oldResponses) {
Section newGiverSection = sectionNameToSectionMap.get(oldResponse.getGiverSection());
Section newRecipientSection = sectionNameToSectionMap.get(oldResponse.getRecipientSection());
Expand Down
3 changes: 2 additions & 1 deletion src/client/java/teammates/client/scripts/sql/VerifyCourseEntityAttributes.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,8 @@ private boolean verifyFeedbackQuestion(FeedbackQuestion oldQuestion,
.filter("feedbackQuestionId", oldQuestion.getId()).list();

if (newResponses.size() != oldResponses.size()) {
log(String.format("Mismatched response counts for question %s, session: %s, course id: %s",
log(String.format("Mismatched response counts for question. New: %d, Old: %d, %s, session: %s, course id: %s",
newResponses.size(), oldResponses.size(),
oldQuestion.getQuestionNumber(), oldQuestion.getFeedbackSessionName(), oldQuestion.getCourseId()));
return false;
}
Expand Down