diff --git a/src/client/java/teammates/client/scripts/sql/DataMigrationForAccountAndReadNotificationSql.java b/src/client/java/teammates/client/scripts/sql/DataMigrationForAccountAndReadNotificationSql.java index 24e0468fd5a..9c081e5ffee 100644 --- a/src/client/java/teammates/client/scripts/sql/DataMigrationForAccountAndReadNotificationSql.java +++ b/src/client/java/teammates/client/scripts/sql/DataMigrationForAccountAndReadNotificationSql.java @@ -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; } /** diff --git a/src/client/java/teammates/client/scripts/sql/DataMigrationForCourseEntitySql.java b/src/client/java/teammates/client/scripts/sql/DataMigrationForCourseEntitySql.java index c9fd31b2a81..50e3efada5f 100644 --- a/src/client/java/teammates/client/scripts/sql/DataMigrationForCourseEntitySql.java +++ b/src/client/java/teammates/client/scripts/sql/DataMigrationForCourseEntitySql.java @@ -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; diff --git a/src/client/java/teammates/client/scripts/sql/DataMigrationForCourseEntitySql50Newest.java b/src/client/java/teammates/client/scripts/sql/DataMigrationForCourseEntitySql50Newest.java index 54991a44b7b..ebed701e704 100644 --- a/src/client/java/teammates/client/scripts/sql/DataMigrationForCourseEntitySql50Newest.java +++ b/src/client/java/teammates/client/scripts/sql/DataMigrationForCourseEntitySql50Newest.java @@ -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; diff --git a/src/client/java/teammates/client/scripts/sql/DataMigrationForCourseEntitySql50Oldest.java b/src/client/java/teammates/client/scripts/sql/DataMigrationForCourseEntitySql50Oldest.java index 58fff77118f..525d754847e 100644 --- a/src/client/java/teammates/client/scripts/sql/DataMigrationForCourseEntitySql50Oldest.java +++ b/src/client/java/teammates/client/scripts/sql/DataMigrationForCourseEntitySql50Oldest.java @@ -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; @@ -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()); diff --git a/src/client/java/teammates/client/scripts/sql/VerifyCourseEntityAttributes.java b/src/client/java/teammates/client/scripts/sql/VerifyCourseEntityAttributes.java index fd9f92246db..21c8a4cb815 100644 --- a/src/client/java/teammates/client/scripts/sql/VerifyCourseEntityAttributes.java +++ b/src/client/java/teammates/client/scripts/sql/VerifyCourseEntityAttributes.java @@ -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; }