bug fix in QueryBuilder in FieldExpressionResolver does not take same fieldExpression more than once

Author: sohan09

elasta-orm/src/main/java/elasta/orm/query/expression/builder/FieldExpressionResolverImpl.java

@@ -41,10 +41,11 @@ public Map<FieldExpression, FieldExpressionHolderFunc> getFuncMap() {
         return funcMap;
     }
 
+    public boolean containsKey(FieldExpression fieldExpression) {
+        return funcMap.containsKey(fieldExpression);
+    }
+
     public FieldExpressionResolverImpl addKey(FieldExpression fieldExpression) {
-        if (funcMap.containsKey(fieldExpression)) {
-            throw new FieldExpressionResolverException("Same fieldExpression '" + fieldExpression + "' more than once is not supported in selections");
-        }
         funcMap.put(fieldExpression, new NoOpsFieldExpressionHolderFuncImpl());
         return this;
     }

elasta-orm/src/main/java/elasta/orm/query/expression/builder/impl/QueryBuilderImpl.java

@@ -4,6 +4,7 @@
 import elasta.orm.query.QueryExecutor;
 import elasta.orm.query.expression.FieldExpression;
 import elasta.orm.query.expression.Query;
+import elasta.orm.query.expression.builder.ex.FieldExpressionResolverException;
 import elasta.orm.query.expression.impl.QueryImpl;
 import elasta.orm.query.expression.builder.*;
 import elasta.orm.query.expression.impl.FieldExpressionImpl;
@@ -55,7 +56,11 @@ public FieldExpressionHolderFunc field(String fieldExpression) {
     }
 
     @Override
-    public FieldExpressionHolderFunc select(FieldExpression fieldExpression) {
+    public FieldExpressionHolderFunc select(final FieldExpression fieldExpression) {
+
+        if (selectFieldExpressionResolver.containsKey(fieldExpression)) {
+            throw new FieldExpressionResolverException("Same fieldExpression '" + fieldExpression + "' more than once is not supported in selections");
+        }
 
         return new FieldExpressionHolderFuncImpl(
             fieldExpression,

tracker/src/main/java/tracker/message/handlers/impl/ReplayMessageHandlerImpl.java

@@ -85,20 +85,25 @@ private void reqReplyLoop(LoopContext context) {
                             return;
                         }
 
-                        final Message<JsonObject> replyMessage = event.result();
-                        final JsonObject req = replyMessage.body();
-                        Objects.requireNonNull(req);
-
-                        reqReplyLoop(
-                            LoopContext.builder()
-                                .endTime(context.getEndTime())
-                                .step(context.getStep())
-                                .totalSlots(context.getTotalSlots())
-                                .message(replyMessage)
-                                .startTime(context.getStartTime() + context.getStep() * reqSlots)
-                                .slotsReturned(context.getSlotsReturned() + reqSlots)
-                                .build()
-                        );
+                        try {
+
+                            final Message<JsonObject> replyMessage = event.result();
+                            final JsonObject req = replyMessage.body();
+                            Objects.requireNonNull(req);
+
+                            reqReplyLoop(
+                                LoopContext.builder()
+                                    .endTime(context.getEndTime())
+                                    .step(context.getStep())
+                                    .totalSlots(context.getTotalSlots())
+                                    .message(replyMessage)
+                                    .startTime(context.getStartTime() + context.getStep() * reqSlots)
+                                    .slotsReturned(context.getSlotsReturned() + reqSlots)
+                                    .build()
+                            );
+                        } catch (Exception ex) {
+                            messageProcessingErrorHandler.handleError(ex, event.result());
+                        }
                     }
                 );
 
@@ -107,19 +112,6 @@ private void reqReplyLoop(LoopContext context) {
 
     }
 
-    private int remainingSlots(long time, long timeStart, long timeEnd, long step) {
-        final long timeDiff = timeEnd - timeStart;
-        final int slotCount = (int) ((time - timeStart) / step) + 1;
-        final int division = (int) (timeDiff / step);
-        final int totalSlotCount = timeDiff % step == 0 ? (division) : (division) + 1;
-        return totalSlotCount - slotCount;
-    }
-
-    private boolean isInLastSlot(final long time, long timeEnd, long step) {
-
-        return (timeEnd - step) <= (time);
-    }
-
     @Value
     @Builder
     static final class LoopContext {

tracker/src/main/java/tracker/services/impl/ReplayServiceImpl.java

@@ -42,9 +42,7 @@ public Observable<JsonObject> next(int count) {
         final TimeSlot timeSlot = new TimeSlot(timeStart, step);
         UserIdToPositionMapGenerator userIdToPositionMapGenerator = new UserIdToPositionMapGenerator();
 
-        Observable<JsonObject> dataObservable = loadData(timeStart + count * step);
-
-        return dataObservable
+        return loadData(timeStart + count * step)
             .flatMap(timeSlot::buffer)
             .map(userIdToPositionMapGenerator::produce)
             ;
@@ -60,8 +58,8 @@ private Observable<JsonObject> loadData(long timeEnd) {
                         .criteria(
                             JsonOps.and(
                                 ImmutableList.of(
-                                    JsonOps.gte("r.time", appDateTimeFormatter.format(new Date(timeStart))),
-                                    JsonOps.lt("r.time", appDateTimeFormatter.format(new Date(timeEnd)))
+                                    JsonOps.gte("r." + PositionModel.time, appDateTimeFormatter.format(new Date(timeStart))),
+                                    JsonOps.lt("r." + PositionModel.time, appDateTimeFormatter.format(new Date(timeEnd)))
                                 )
                             )
                         )