From 75f52c1fdec6b111cb765f035baf8896e3f6df51 Mon Sep 17 00:00:00 2001 From: Bharathwaj G Date: Thu, 8 Feb 2024 17:51:45 +0530 Subject: [PATCH] testing Signed-off-by: Bharathwaj G --- .../builder/BaseSingleTreeBuilder.java | 21 ++++++++++--------- .../bucket/startree/StarTreeAggregator.java | 1 + 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/server/src/main/java/org/opensearch/index/codec/freshstartree/builder/BaseSingleTreeBuilder.java b/server/src/main/java/org/opensearch/index/codec/freshstartree/builder/BaseSingleTreeBuilder.java index 30f401cd8d669..b3a3df4009631 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/builder/BaseSingleTreeBuilder.java +++ b/server/src/main/java/org/opensearch/index/codec/freshstartree/builder/BaseSingleTreeBuilder.java @@ -59,11 +59,12 @@ /** Base class for star tree builder */ public abstract class BaseSingleTreeBuilder { public static final int STAR_IN_DOC_VALUES_INDEX = -1; - public final static long SECOND = 1000; - public final static long MINUTE = 60 * SECOND; - public final static long HOUR = 60 * 60 * SECOND; - public final static long DAY = 24 * HOUR; - public final static long YEAR = 365 * DAY; + public final static int SECOND = 1;// HTTP codec + public final static int MINUTE = 60 * SECOND; + public final static int HOUR = 60 * 60 * SECOND; + public final static int DAY = 24 * HOUR; + public final static int MONTH = 30 * DAY; + public final static int YEAR = 365 * DAY; private static final Logger logger = LogManager.getLogger(BaseSingleTreeBuilder.class); final int _numDimensions; final String[] _dimensionsSplitOrder; @@ -567,15 +568,15 @@ Record getNextSegmentRecord() throws IOException { private long getTimeStampVal(final String fieldName, final long val) { switch (fieldName) { case "minute": - return val / MINUTE * MINUTE; + return val / MINUTE;// * MINUTE; case "hour": - return val / HOUR * HOUR; + return val / HOUR;// * HOUR; case "day": - return val / DAY * DAY; + return val / DAY;// * DAY; case "month": - return DateUtils.roundMonthOfYear(val); // TODO + return val / MONTH;// * MONTH; // TODO case "year": - return DateUtils.roundYear(val); + return val / YEAR;// * YEAR; default: return val; } diff --git a/server/src/main/java/org/opensearch/search/aggregations/bucket/startree/StarTreeAggregator.java b/server/src/main/java/org/opensearch/search/aggregations/bucket/startree/StarTreeAggregator.java index 9fb0286359566..5f3dee2a29d6c 100644 --- a/server/src/main/java/org/opensearch/search/aggregations/bucket/startree/StarTreeAggregator.java +++ b/server/src/main/java/org/opensearch/search/aggregations/bucket/startree/StarTreeAggregator.java @@ -203,6 +203,7 @@ private String getKey(Map fieldColsMap, int doc) throw for (Map.Entry fieldEntry : fieldColsMap.entrySet()) { fieldEntry.getValue().advanceExact(doc); long val = fieldEntry.getValue().longValue(); + System.out.println("Key field : " + fieldEntry.getKey() + " Value : " + val); sj.add("" + val); } return sj.toString();