From 70024bbf2537ae76dde8347850e786b5c15992e4 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 | 18 ++++++++++-------- .../freshstartree/query/StarTreeFilter.java | 2 ++ .../bucket/startree/StarTreeAggregator.java | 1 + 3 files changed, 13 insertions(+), 8 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..34537d7b63828 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,10 +59,11 @@ /** 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 SECOND = 1;// HTTP codec 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 MONTH = 30 * DAY; public final static long YEAR = 365 * DAY; private static final Logger logger = LogManager.getLogger(BaseSingleTreeBuilder.class); final int _numDimensions; @@ -97,8 +98,8 @@ public abstract class BaseSingleTreeBuilder { dimensionsSplitOrder = new ArrayList<>(); dimensionsSplitOrder.add("minute"); dimensionsSplitOrder.add("hour"); - dimensionsSplitOrder.add("day"); - dimensionsSplitOrder.add("month"); + //dimensionsSplitOrder.add("day"); + //dimensionsSplitOrder.add("month"); // dimensionsSplitOrder.add("year"); dimensionsSplitOrder.add("status"); _numDimensions = dimensionsSplitOrder.size(); @@ -567,15 +568,16 @@ 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; + logger.info( "val: " + val + " hour: " + (val/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/index/codec/freshstartree/query/StarTreeFilter.java b/server/src/main/java/org/opensearch/index/codec/freshstartree/query/StarTreeFilter.java index bda972d028101..90e98fae89275 100644 --- a/server/src/main/java/org/opensearch/index/codec/freshstartree/query/StarTreeFilter.java +++ b/server/src/main/java/org/opensearch/index/codec/freshstartree/query/StarTreeFilter.java @@ -85,6 +85,8 @@ public StarTreeFilter( *
  • For the remaining columns, use other indexes to match them * */ + + // 1706268600 / (60*60*1000) * (60*60*1000) public DocIdSetIterator getStarTreeResult() throws IOException { StarTreeResult starTreeResult = traverseStarTree(); List andIterators = new ArrayList<>(); 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();