code cleanup and remove unused old objects

Author: elliVM

src/main/java/com/teragrep/pth10/ast/DPLParserConfig.java

@@ -45,13 +45,10 @@
  */
 package com.teragrep.pth10.ast;
 
-import com.teragrep.pth10.ast.time.DefaultFormatAbsoluteTimestamp;
-import com.teragrep.pth10.ast.time.RelativeTimeParser;
-import com.teragrep.pth10.ast.time.RelativeTimestamp;
+import com.teragrep.pth10.ast.time.DPLTimestampImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import java.sql.Timestamp;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -105,20 +102,7 @@ public String getEarliest() {
      * @param earliest string value like -1h or actual timestamp
      */
     public void setEarliest(String earliest) {
-        long earliestEpoch = 0;
-        Timestamp now = new Timestamp(System.currentTimeMillis());
-        RelativeTimeParser rtParser = new RelativeTimeParser();
-
-        // Try to check if it is relative and catch exception
-        try {
-            RelativeTimestamp rtTimestamp = rtParser.parse(earliest); // can throw error if not relative timestamp
-            earliestEpoch = rtTimestamp.calculate(now).getEpochSecond();
-        }
-        catch (NumberFormatException ne) {
-            // absolute time
-            earliestEpoch = new DefaultFormatAbsoluteTimestamp(earliest).zonedDateTime().toEpochSecond();
-        }
-
+        final long earliestEpoch = new DPLTimestampImpl(earliest).zonedDateTime().toEpochSecond();
         config.put("earliest", earliest);
         config.put("earliestEpoch", earliestEpoch);
     }
@@ -139,20 +123,7 @@ public String getLatest() {
      * @param latest string value like -1h or actual timestamp
      */
     public void setLatest(String latest) {
-        long latestEpoch = 0;
-        Timestamp now = new Timestamp(System.currentTimeMillis());
-        RelativeTimeParser rtParser = new RelativeTimeParser();
-
-        // Try to check if it is relative and catch exception
-        try {
-            RelativeTimestamp rtTimestamp = rtParser.parse(latest); // can throw exception if not relative timestamp
-            latestEpoch = rtTimestamp.calculate(now).getEpochSecond();
-        }
-        catch (NumberFormatException ne) {
-            // absolute time
-            latestEpoch = new DefaultFormatAbsoluteTimestamp(latest).zonedDateTime().toEpochSecond();
-        }
-
+        final long latestEpoch = new DPLTimestampImpl(latest).zonedDateTime().toEpochSecond();
         config.put("latest", latest);
         config.put("latestEpoch", latestEpoch);
     }

src/main/java/com/teragrep/pth10/ast/commands/evalstatement/UDFs/Mvrange.java

@@ -45,12 +45,13 @@
  */
 package com.teragrep.pth10.ast.commands.evalstatement.UDFs;
 
-import com.teragrep.pth10.ast.time.RelativeTimeParser;
 import com.teragrep.pth10.ast.time.RelativeTimestamp;
 import org.apache.spark.sql.api.java.UDF3;
 
 import java.io.Serializable;
-import java.sql.Timestamp;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -102,11 +103,11 @@ else if (stepObj instanceof String) {
             long time = start;
             rv.add(String.valueOf(time));
 
-            RelativeTimeParser rtParser = new RelativeTimeParser();
-            RelativeTimestamp rtTimestamp = rtParser.parse("+" + stepStr);
             // Go until incremented past end
             while (time < end) {
-                time = rtTimestamp.calculate(new Timestamp(time * 1000L)).getEpochSecond();
+                final ZonedDateTime startTime = ZonedDateTime.ofInstant(Instant.ofEpochSecond(time), ZoneId.of("UTC"));
+                final RelativeTimestamp relativeTimestamp = new RelativeTimestamp("+" + stepStr, startTime);
+                time = relativeTimestamp.zonedDateTime().toEpochSecond();
 
                 // If time went past end, stop incrementing and don't add to mv field
                 if (time > end) {

src/main/java/com/teragrep/pth10/ast/commands/evalstatement/UDFs/Relative_time.java

@@ -45,12 +45,13 @@
  */
 package com.teragrep.pth10.ast.commands.evalstatement.UDFs;
 
-import com.teragrep.pth10.ast.time.RelativeTimeParser;
 import com.teragrep.pth10.ast.time.RelativeTimestamp;
 import org.apache.spark.sql.api.java.UDF2;
 
 import java.io.Serializable;
-import java.sql.Timestamp;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.ZonedDateTime;
 
 /**
  * UDF for command relative_time(unixtime, modifier)<br>
@@ -63,9 +64,10 @@ public class Relative_time implements UDF2<Long, String, Long>, Serializable {
 
     @Override
     public Long call(Long unixtime, String modifier) throws Exception {
-        RelativeTimeParser rtParser = new RelativeTimeParser();
-        RelativeTimestamp rtTimestamp = rtParser.parse(modifier);
-        return rtTimestamp.calculate(new Timestamp(unixtime * 1000L)).getEpochSecond();
+        final ZonedDateTime startTime = ZonedDateTime
+                .ofInstant(Instant.ofEpochSecond(unixtime), ZoneId.systemDefault());
+        final RelativeTimestamp relativeTimestamp = new RelativeTimestamp(modifier, startTime);
+        return relativeTimestamp.zonedDateTime().toEpochSecond();
     }
 
 }

src/main/java/com/teragrep/pth10/ast/time/BetweenYearsTimestamp.java

@@ -45,6 +45,9 @@
  */
 package com.teragrep.pth10.ast.time;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.time.ZoneId;
 import java.time.ZonedDateTime;
 import java.util.Objects;
@@ -56,10 +59,15 @@
  */
 public final class DPLTimestampImpl implements DPLTimestamp {
 
+    private static final Logger LOGGER = LoggerFactory.getLogger(DPLTimestampImpl.class);
     private final String value;
     private final String timeformat;
     private final ZoneId zoneId;
 
+    public DPLTimestampImpl(final String value) {
+        this(value, "", TimeZone.getDefault().toZoneId());
+    }
+
     public DPLTimestampImpl(final String value, final String timeformat) {
         this(value, timeformat, TimeZone.getDefault().toZoneId());
     }
@@ -71,15 +79,16 @@ public DPLTimestampImpl(final String value, final String timeformat, final ZoneI
     }
 
     public ZonedDateTime zonedDateTime() {
+        LOGGER.info("Incoming value <{}> to timestamp", value);
         final DPLTimestamp timestamp;
-        final NewRelativeTimestamp relativeTimestamp = new NewRelativeTimestamp(value, zoneId);
+        final RelativeTimestamp relativeTimestamp = new RelativeTimestamp(value, zoneId);
         if (!relativeTimestamp.isStub()) {
             timestamp = relativeTimestamp;
         }
         else {
             timestamp = new AbsoluteTimestamp(value, timeformat, zoneId);
         }
-        return new BetweenYearsTimestamp(1000, 9999, timestamp).zonedDateTime();
+        return timestamp.zonedDateTime();
     }
 
     @Override

src/main/java/com/teragrep/pth10/ast/time/DPLTimestampImpl.java

@@ -93,7 +93,7 @@ public ZonedDateTime zonedDateTime() {
             try {
                 return absoluteTimestamp.zonedDateTime();
             }
-            catch (RuntimeException ex) {
+            catch (final RuntimeException ex) {
                 LOGGER.debug("Couldn't parse value, exception <{}>", ex.getMessage());
                 // passthrough
             }

src/main/java/com/teragrep/pth10/ast/time/DefaultFormatAbsoluteTimestamp.java

@@ -78,7 +78,7 @@ public OffsetTimestamp(final Text offsetText, final ZonedDateTime startTime) {
 
     @Override
     public ZonedDateTime zonedDateTime() {
-        LOGGER.info("start time <{}>", startTime);
+        LOGGER.debug("start time <{}>", startTime);
         final OffsetUnit unit = offsetUnit();
         final long amount = offsetAmount();
         final ZonedDateTime updatedTime;
@@ -112,8 +112,21 @@ public ZonedDateTime zonedDateTime() {
                 throw new RuntimeException("Unsupported unit");
         }
 
-        LOGGER.info("offset time <{}>", updatedTime);
-        return updatedTime;
+        // ensure that year is between 1000-9999
+        final long updatedYear = updatedTime.getYear();
+        final ZonedDateTime updatedTimeWithYearBetweenRange;
+        if (updatedYear > 9999) {
+            updatedTimeWithYearBetweenRange = updatedTime.withYear(9999);
+        }
+        else if (updatedYear < 1000) {
+            updatedTimeWithYearBetweenRange = updatedTime.withYear(1000);
+        }
+        else {
+            updatedTimeWithYearBetweenRange = updatedTime.plusYears(amount);
+        }
+
+        LOGGER.debug("offset time <{}>", updatedTimeWithYearBetweenRange);
+        return updatedTimeWithYearBetweenRange;
     }
 
     @Override