modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DataMigrator.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commits: commit 115fe4d274180c31b54128efb59b8b4149675fe7 Author: Stefan Negrea snegrea@redhat.com Date: Fri Mar 1 23:29:58 2013 -0600
Make test to drain statement accumulator more reliable by draining every time the number of loaded statements is equal to or exceeds the limit.
diff --git a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DataMigrator.java b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DataMigrator.java index cb72a07..8f07098 100644 --- a/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DataMigrator.java +++ b/modules/enterprise/server/server-metrics/src/main/java/org/rhq/server/metrics/DataMigrator.java @@ -328,7 +328,7 @@ public class DataMigrator { .using(ttl((int) itemTTLSeconds)); statementsAccumulator.add(statement);
- if (statementsAccumulator.size() == MAX_RECORDS_TO_BATCH_TO_CASSANDRA) { + if (statementsAccumulator.size() >= MAX_RECORDS_TO_BATCH_TO_CASSANDRA) { resultSetFutures.add(session.executeAsync(QueryBuilder.batch((Statement[]) statementsAccumulator .toArray(new Statement[statementsAccumulator.size()])))); statementsAccumulator.clear(); @@ -467,7 +467,7 @@ public class DataMigrator { statementsAccumulator.add(boundStatement); }
- if (statementsAccumulator.size() == MAX_RECORDS_TO_BATCH_TO_CASSANDRA) { + if (statementsAccumulator.size() >= MAX_RECORDS_TO_BATCH_TO_CASSANDRA) { resultSetFutures.add(session.executeAsync(QueryBuilder.batch((Statement[]) statementsAccumulator .toArray(new Statement[statementsAccumulator.size()])))); statementsAccumulator.clear();